[java-opensaml COMMIT] in /trunk/opensaml-xmlsec-impl/src: main/java/org/opensaml/xmlsec/impl/AbstractSecurityParamet...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu May  8 19:58:49 2014
New Revision: 3848

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3848&view=rev
Log:
Add additional signing params resolver tests.
Add some additional trace logging for debugging.

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java?rev=3848&r1=3847&r2=3848&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java Thu May  8 19:58:49 2014
@@ -17,6 +17,7 @@
 
 package org.opensaml.xmlsec.impl;
 
+import java.security.Key;
 import java.util.Collection;
 import java.util.List;
 
@@ -31,6 +32,7 @@
 import net.shibboleth.utilities.java.support.resolver.Resolver;
 
 import org.opensaml.security.credential.Credential;
+import org.opensaml.security.credential.CredentialSupport;
 import org.opensaml.xmlsec.WhitelistBlacklistConfiguration;
 import org.opensaml.xmlsec.WhitelistBlacklistConfiguration.Precedence;
 import org.opensaml.xmlsec.WhitelistBlacklistParameters;
@@ -69,20 +71,34 @@
         Constraint.isNotNull(credential, "Credential may not be null");
         
         if (manager == null) {
+            log.trace("NamedKeyInfoGeneratorManger was null, can not resolve");
             return null;
+        }
+        
+        if (log.isTraceEnabled()) {
+            Key key = CredentialSupport.extractSigningKey(credential);
+            if (key == null) {
+                key = CredentialSupport.extractEncryptionKey(credential);
+            }
+            log.trace("Attempting to resolve KeyInfoGenerator for credential with key algo '{}' of impl: {}", 
+                    key != null ? key.getAlgorithm() : "n/a", credential.getClass().getName());
         }
         
         KeyInfoGeneratorFactory factory = null;
         if (keyInfoProfileName != null) {
+            log.trace("Resolving KeyInfoGeneratorFactory using profile name: {}", keyInfoProfileName);
             factory = manager.getFactory(keyInfoProfileName, credential);
         } else {
+            log.trace("Resolving KeyInfoGeneratorFactory using default manager: {}", keyInfoProfileName);
             factory = manager.getDefaultManager().getFactory(credential);
         }
         
         if (factory != null) {
+            log.trace("Found KeyInfoGeneratorFactory: {}", factory.getClass().getName());
             return factory.newInstance();
         }
         
+        log.trace("Unable to resolve KeyInfoGeneratorFactory for credential");
         return null;
     }
     

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java?rev=3848&r1=3847&r2=3848&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java Thu May  8 19:58:49 2014
@@ -17,6 +17,7 @@
 
 package org.opensaml.xmlsec.impl;
 
+import java.security.Key;
 import java.security.interfaces.DSAParams;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -188,8 +189,8 @@
         
         for (Credential credential : credentials) {
             if (log.isTraceEnabled()) {
-                log.trace("Evaluating credential of type: {}", 
-                        CredentialSupport.extractSigningKey(credential).getAlgorithm());
+                Key key = CredentialSupport.extractSigningKey(credential);
+                log.trace("Evaluating credential of type: {}", key != null ? key.getAlgorithm() : "n/a");
             }
             for (String algorithm : algorithms) {
                 log.trace("Evaluating credential against algorithm: {}", algorithm);

Modified: trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java?rev=3848&r1=3847&r2=3848&view=diff

[... 321 lines stripped ...]