[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryp...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu May 15 18:06:38 2014
New Revision: 3875

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3875&view=rev
Log:
More tests for SAMLMetadataEncryptionParametersResolver.
Change params validation to result in a null result, rather than throwing ResolverException.
Add final debug logging of resolved EncryptionParameters.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolverTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java?rev=3875&r1=3874&r2=3875&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java Thu May 15 18:06:38 2014
@@ -97,6 +97,13 @@
         // it ought to be used for symmetric key wrap, not direct data encryption.
         try {
             for (Credential keyTransportCredential : getMetadataCredentialResolver().resolve(mdCredResolverCriteria)) {
+                
+                if (log.isTraceEnabled()) {
+                    Key key = CredentialSupport.extractEncryptionKey(keyTransportCredential);
+                    log.trace("Evaluating key transport encryption credential from SAML metadata of type: {}", 
+                            key != null ? key.getAlgorithm() : "n/a");
+                }
+                
                 SAMLMDCredentialContext metadataCredContext = 
                         keyTransportCredential.getCredentialContextSet().get(SAMLMDCredentialContext.class);
                 
@@ -112,10 +119,6 @@
                     continue;
                 }
                 
-                if (dataEncryptionAlgorithm == null) {
-                    log.debug("Unable to resolve data encryption algorithm URI, encryption will use internal defaults");
-                }
-                
                 params.setKeyTransportEncryptionCredential(keyTransportCredential);
                 params.setKeyTransportEncryptionAlgorithmURI(keyTransportAlgorithm);
                 params.setDataEncryptionAlgorithmURI(dataEncryptionAlgorithm);
@@ -156,8 +159,11 @@
         if (metadataCredContext != null) {
             for (EncryptionMethod encryptionMethod : metadataCredContext.getEncryptionMethods()) {
                 String algorithm = encryptionMethod.getAlgorithm();
+                log.trace("Evaluating SAML metadata EncryptionMethod algorithm for key transport: {}", algorithm);
                 if (isKeyTransportAlgorithm(algorithm) && whitelistBlacklistPredicate.apply(algorithm) 
                         && credentialSupportsEncryptionMethod(keyTransportCredential, encryptionMethod)) {
+                    log.debug("Resolved key transport algorithm URI from SAML metadata EncryptionMethod: {}",
+                            algorithm);
                     return algorithm;
                 }
             }
@@ -188,7 +194,10 @@
         if (metadataCredContext != null) {
             for (EncryptionMethod encryptionMethod : metadataCredContext.getEncryptionMethods()) {
                 String algorithm = encryptionMethod.getAlgorithm();
+                log.trace("Evaluating SAML metadata EncryptionMethod algorithm for data encryption: {}", algorithm);
                 if (isDataEncryptionAlgorithm(algorithm) && whitelistBlacklistPredicate.apply(algorithm)) {
+                    log.debug("Resolved data encryption algorithm URI from SAML metadata EncryptionMethod: {}",
+                            algorithm);
                     return algorithm;
                 }
             }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java?rev=3875&r1=3874&r2=3875&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java Thu May 15 18:06:38 2014
@@ -34,6 +34,7 @@

[... 397 lines stripped ...]