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

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Sep 25 18:58:50 2014
New Revision: 4074

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4074&view=rev
Log:
Ensure have result debug logging for all security -Parameters resolvers.
Add some missing @Nonnull annotations and final modifiers. 

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolver.java?rev=4074&r1=4073&r2=4074&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolver.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolver.java Thu Sep 25 18:58:50 2014
@@ -32,6 +32,8 @@
 import org.opensaml.xmlsec.criterion.DecryptionConfigurationCriterion;
 import org.opensaml.xmlsec.encryption.support.EncryptedKeyResolver;
 import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Basic implementation of {@link DecryptionParametersResolver}.
@@ -45,6 +47,9 @@
  */
 public class BasicDecryptionParametersResolver extends AbstractSecurityParametersResolver<DecryptionParameters> 
         implements DecryptionParametersResolver {
+    
+    /** Logger. */
+    private Logger log = LoggerFactory.getLogger(BasicDecryptionParametersResolver.class);
 
     /** {@inheritDoc} */
     @Nonnull public Iterable<DecryptionParameters> resolve(@Nonnull final CriteriaSet criteria) 
@@ -73,7 +78,31 @@
         params.setKEKKeyInfoCredentialResolver(resolveKEKKeyInfoCredentialResolver(criteria));
         params.setEncryptedKeyResolver(resolveEncryptedKeyResolver(criteria));
         
+        logResult(params);
+        
         return params;
+    }
+    
+    /**
+     * Log the resolved parameters.
+     * 
+     * @param params the resolved param
+     */
+    protected void logResult(@Nonnull final DecryptionParameters params) {
+        if (log.isDebugEnabled()) {
+            log.debug("Resolved DecryptionParameters:");
+            
+            log.debug("\tAlgorithm whitelist: {}", params.getWhitelistedAlgorithms());
+            log.debug("\tAlgorithm blacklist: {}", params.getBlacklistedAlgorithms());
+            
+            log.debug("\tData KeyInfoCredentialResolver: {}", 
+                    params.getDataKeyInfoCredentialResolver() != null ? "present" : "null");
+            log.debug("\tKEK KeyInfoCredentialResolver: {}", 
+                    params.getKEKKeyInfoCredentialResolver() != null ? "present" : "null");
+            log.debug("\tEncryptedKeyResolver: {}", 
+                    params.getEncryptedKeyResolver() != null ? "present" : "null");
+            
+        }
     }
 
     /**

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java?rev=4074&r1=4073&r2=4074&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java Thu Sep 25 18:58:50 2014
@@ -169,7 +169,7 @@
      * 
      * @param params the resolved param
      */
-    protected void logResult(EncryptionParameters params) {
+    protected void logResult(@Nonnull final EncryptionParameters params) {
         if (log.isDebugEnabled()) {
             log.debug("Resolved EncryptionParameters:");
             

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=4074&r1=4073&r2=4074&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 Sep 25 18:58:50 2014
@@ -144,7 +144,7 @@
      * 
      * @param params the resolved param

[... 59 lines stripped ...]