diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactory.java b/server/src/main/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactory.java index 509d7482f9c..054f818fe2b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactory.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactory.java @@ -55,6 +55,12 @@ public void debug(String message) { } } + public void debug(String message, Object... params) { + if (fallback.isDebugEnabled()) { + fallback.debug(LogSanitizerUtil.sanitize(message), params); + } + } + public void debug(String message, Throwable t) { if (fallback.isDebugEnabled()) { fallback.debug(LogSanitizerUtil.sanitize(message), t); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java index 21ebc8ada1f..212380547d9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java @@ -5,6 +5,7 @@ import org.cloudfoundry.identity.uaa.client.UaaClientDetails; import org.cloudfoundry.identity.uaa.constants.OriginKeys; import org.cloudfoundry.identity.uaa.error.UaaException; +import org.cloudfoundry.identity.uaa.logging.SanitizedLogFactory; import org.cloudfoundry.identity.uaa.provider.ClientAlreadyExistsException; import org.cloudfoundry.identity.uaa.provider.IdentityProvider; import org.cloudfoundry.identity.uaa.provider.IdentityProviderProvisioning; @@ -14,8 +15,6 @@ import org.cloudfoundry.identity.uaa.scim.ScimGroup; import org.cloudfoundry.identity.uaa.scim.ScimGroupProvisioning; import org.cloudfoundry.identity.uaa.util.UaaStringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; @@ -64,7 +63,7 @@ @RequestMapping("/identity-zones") public class IdentityZoneEndpoints implements ApplicationEventPublisherAware { - private static final Logger logger = LoggerFactory.getLogger(IdentityZoneEndpoints.class); + private static final SanitizedLogFactory.SanitizedLog logger = SanitizedLogFactory.getLog(IdentityZoneEndpoints.class); private static final String ID_SUBDOMAIN_LOGGING = "[{}] subdomain [{}]"; private final IdentityZoneProvisioning zoneDao; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactoryTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactoryTest.java index f464c56f936..f1729c03559 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactoryTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactoryTest.java @@ -57,6 +57,8 @@ public void testSanitizeDebug() { when(mockLog.isDebugEnabled()).thenReturn(true); log.debug(dirtyMessage); verify(mockLog).debug(sanitizedMsg); + log.debug(dirtyMessage, true); + verify(mockLog).debug(sanitizedMsg); log.debug(dirtyMessage, ex); verify(mockLog).debug(sanitizedMsg, ex); }