[java-identity-provider COMMIT] /branches/3.3/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar  6 10:08:27 2017
New Revision: 8649

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8649&view=rev
Log:
IDP-1138 Suppress logging of salt at all but TRACE

https://issues.shibboleth.net/jira/browse/IDP-1138

Modified:
    branches/3.3/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/ComputedIDDataConnector.java

Modified: branches/3.3/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/ComputedIDDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/ComputedIDDataConnector.java?rev=8649&r1=8648&r2=8649&view=diff
==============================================================================
--- branches/3.3/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/ComputedIDDataConnector.java	(original)
+++ branches/3.3/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/ComputedIDDataConnector.java	Mon Mar  6 10:08:27 2017
@@ -93,7 +93,8 @@
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         if (null != salt) {
-            log.debug("{} Salt set as bytes to {}", getLogPrefix(), Arrays.toString(salt));
+            log.debug("{} Salt set (secret is logged at TRACE)");
+            log.trace("{} Salt set as bytes to {}", getLogPrefix(), Arrays.toString(salt));
             idStrategy.setSalt(salt);
         } else {
             log.debug("{} Null salt passed, nothing set", getLogPrefix());
@@ -109,8 +110,7 @@
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         if (null != salt) {
-            log.debug("{} Salt set as bytes to {}", getLogPrefix(), Arrays.toString(salt.getBytes()));
-            idStrategy.setSalt(salt.getBytes());
+            setSalt(salt.getBytes());
         } else {
             log.debug("{} Null salt passed, nothing set", getLogPrefix());
         }