[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 13:53:13 2014
New Revision: 3847

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3847&view=rev
Log:
Checkpoint some security config/resolver work.
Add some trace logging to resolver impls.

Added:
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolverTest.java   (with props)
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java   (with props)
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolverTest.java   (with props)
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

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=3847&r1=3846&r2=3847&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 13:53:13 2014
@@ -37,6 +37,8 @@
 import org.opensaml.xmlsec.keyinfo.KeyInfoGenerator;
 import org.opensaml.xmlsec.keyinfo.KeyInfoGeneratorFactory;
 import org.opensaml.xmlsec.keyinfo.NamedKeyInfoGeneratorManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -49,6 +51,9 @@
 public abstract class AbstractSecurityParametersResolver<ProductType> 
         implements Resolver<ProductType, CriteriaSet>{
     
+    /** Logger. */
+    private Logger log = LoggerFactory.getLogger(AbstractSecurityParametersResolver.class);
+    
     /**
      * Resolve a {@link KeyInfoGenerator} instance based on a {@link NamedKeyInfoGeneratorManager}, 
      * {@link Credential} and optional KeyInfo generation profile name.
@@ -94,28 +99,37 @@
             @Nonnull @NonnullElements @NotEmpty final List<? extends WhitelistBlacklistConfiguration> configs) {
         
         Collection<String> whitelist = resolveEffectiveWhitelist(criteria, configs);
+        log.trace("Resolved effective whitelist: {}", whitelist);
+        
         Collection<String> blacklist = resolveEffectiveBlacklist(criteria, configs);
+        log.trace("Resolved effective blacklist: {}", blacklist);
         
         if (whitelist.isEmpty() && blacklist.isEmpty()) {
+            log.trace("Both empty, nothing to populate");
             return;
         }
         
         if (whitelist.isEmpty()) {
+            log.trace("Whitelist empty, populating blacklist");
             params.setBlacklistedAlgorithmURIs(blacklist);
             return;
         }
         
         if (blacklist.isEmpty()) {
+            log.trace("Blacklist empty, populating whitelist");
             params.setWhitelistedAlgorithmURIs(whitelist);
             return;
         }
         
         WhitelistBlacklistConfiguration.Precedence precedence = resolveWhitelistBlacklistPrecedence(criteria, configs);
+        log.trace("Resolved effective precedence: {}", precedence);
         switch(precedence) {
             case WHITELIST:
+                log.trace("Based on precedence, populating whitelist");
                 params.setWhitelistedAlgorithmURIs(whitelist);
                 break;
             case BLACKLIST:
+                log.trace("Based on precedence, populating blacklist");
                 params.setBlacklistedAlgorithmURIs(blacklist);
                 break;
             default:
@@ -137,25 +151,34 @@
             @Nonnull @NonnullElements @NotEmpty final List<? extends WhitelistBlacklistConfiguration> configs) {
         
         Collection<String> whitelist = resolveEffectiveWhitelist(criteria, configs);
+        log.trace("Resolved effective whitelist: {}", whitelist);
+        
         Collection<String> blacklist = resolveEffectiveBlacklist(criteria, configs);
+        log.trace("Resolved effective blacklist: {}", blacklist);
         
         if (whitelist.isEmpty() && blacklist.isEmpty()) {
+            log.trace("Both empty, returning alwaysTrue predicate");
             return Predicates.alwaysTrue();
         }
         
         if (whitelist.isEmpty()) {
+            log.trace("Whitelist empty, returning BlacklistPredicate");
             return new BlacklistPredicate(blacklist);
         }
         
         if (blacklist.isEmpty()) {
+            log.trace("Blacklist empty, returning WhitelistPredicate");
             return new WhitelistPredicate(whitelist);
         }
         

[... 49 lines stripped ...]