[extensions COMMIT] in /java-idp-security-config/trunk: doc/INSTALL.txt src/main/java/edu/internet2/middleware/shibbo...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jul 19 14:48:08 2013
New Revision: 356

URL: http://svn.shibboleth.net/view/extensions?rev=356&view=rev
Log:
Fix up Checkstyle issues.
Add some config details to INSTALL.txt.

Modified:
    java-idp-security-config/trunk/doc/INSTALL.txt
    java-idp-security-config/trunk/src/main/java/edu/internet2/middleware/shibboleth/idp/ext/securityconfig/OpensamlCustomSecurityConfigBean.java

Modified: java-idp-security-config/trunk/doc/INSTALL.txt
URL: http://svn.shibboleth.net/view/extensions/java-idp-security-config/trunk/doc/INSTALL.txt?rev=356&r1=355&r2=356&view=diff
==============================================================================
--- java-idp-security-config/trunk/doc/INSTALL.txt (original)
+++ java-idp-security-config/trunk/doc/INSTALL.txt Fri Jul 19 14:48:08 2013
@@ -9,6 +9,16 @@
 
 2) To activate the extension: In the IdP's conf/internal.xml, add the following new bean declaration:
 
-    <bean id="shibboleth.idp.ext.OpensamlCustomSecurityConfig" class="edu.internet2.middleware.shibboleth.idp.ext.securityconfig.OpensamlCustomSecurityConfigBean" depends-on="shibboleth.OpensamlConfig" />
+    <bean id="shibboleth.idp.ext.OpensamlCustomSecurityConfig" 
+          class="edu.internet2.middleware.shibboleth.idp.ext.securityconfig.OpensamlCustomSecurityConfigBean" 
+          depends-on="shibboleth.OpensamlConfig">
+          
+         <!-- Specify the desired custom security config properties here.
+              For allowed properties, see the class Javadoc. --> 
+         
+         <!-- Example: Configure XML Signature usage with SHA-256 signature (for RSA) and digest algorithms -->
+        <property name="signatureAlgorithmRSA" value="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
+        <property name="signatureReferenceDigestMethod" value="http://www.w3.org/2001/04/xmlenc#sha256" />
+          
+    </bean>
                 
-                

Modified: java-idp-security-config/trunk/src/main/java/edu/internet2/middleware/shibboleth/idp/ext/securityconfig/OpensamlCustomSecurityConfigBean.java
URL: http://svn.shibboleth.net/view/extensions/java-idp-security-config/trunk/src/main/java/edu/internet2/middleware/shibboleth/idp/ext/securityconfig/OpensamlCustomSecurityConfigBean.java?rev=356&r1=355&r2=356&view=diff
==============================================================================
--- java-idp-security-config/trunk/src/main/java/edu/internet2/middleware/shibboleth/idp/ext/securityconfig/OpensamlCustomSecurityConfigBean.java (original)
+++ java-idp-security-config/trunk/src/main/java/edu/internet2/middleware/shibboleth/idp/ext/securityconfig/OpensamlCustomSecurityConfigBean.java Fri Jul 19 14:48:08 2013
@@ -42,33 +42,48 @@
     private final Logger log = LoggerFactory.getLogger(OpensamlCustomSecurityConfigBean.class);
 
     // Signature-related properties.
+    
+    /** Signing algorithm to use with an RSA private key. */
     private String signatureAlgorithmRSA;
 
+    /** Signing algorithm to use with a DSA private key. */
     private String signatureAlgorithmDSA;
 
+    /** Signing algorithm to use with an EC private key. */
     private String signatureAlgorithmEC;
 
+    /** Signing algorithm to use with an AES secret key. */
     private String signatureAlgorithmAES;
 
+    /** Signing algorithm to use with an DESede secret key. */
     private String signatureAlgorithmDESede;
 
+    /** Signature digest method. */
     private String signatureReferenceDigestMethod;
 
+    /** Signature canonicalization method. */
     private String signatureCanonicalizationAlgorithm;
 
+    /** Signature HMAC output length. */
     private Integer signatureHMACOutputLength;
 
     // Encryption-related properties.
+    
+    /** Encryption bulk data encryption algorithm. */
     private String autoGeneratedDataEncryptionKeyAlgorithm;
 
+    /** Encryption RSA key transport algorithm for AES keys. */
     private String keyTransportEncryptionAlgorithmRSAofAES;
 
+    /** Encryption RSA key transport algorithm for DESede keys. */
     private String keyTransportEncryptionAlgorithmRSAofDESede;
-
-    // KeyInfo credential resolver
+    
+    // KeyInfo-related properties
+
+    /** The default KeyInfo credential resolver instance. */
     private KeyInfoCredentialResolver defaultKeyInfoCredentialResolver;
 
-    // KeyInfo generator factories
+    /** The KeyInfo generator factory instances. */
     private List<KeyInfoGeneratorFactory> keyInfoGeneratorFactories;
 
     /** {@inheritDoc} */
@@ -85,9 +100,8 @@
             handleKeyInfoGeneratorParams(basicConfig);
 
         } else {
-            log.warn(
-                    "Configuration.getGlobalSecurityConfiguration did not produce an instance of BasicSecurityConfiguration, "
-                            + "could not apply custom security configuration settings: {}", 
+            log.warn("Configuration.getGlobalSecurityConfiguration did not produce an instance of " +
+                    "BasicSecurityConfiguration, could not apply custom security configuration settings: {}", 

[... 199 lines stripped ...]