From c636e2195a95bbe11574f7bc229e2a8008651669 Mon Sep 17 00:00:00 2001 From: lajoie Date: Thu, 20 May 2010 00:34:45 +0000 Subject: [PATCH] decrease verbosity and logging messge of error message logged when a name ID can not be resolved in to a principal - SIDP-382 git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2928 ab3bd59b-922f-494d-bb5f-6f0a3c29deca --- doc/RELEASE-NOTES.txt | 1 + .../idp/profile/saml1/AbstractSAML1ProfileHandler.java | 14 ++++++++------ .../idp/profile/saml2/AbstractSAML2ProfileHandler.java | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt index 6e8c9ce..aa4dda3 100644 --- a/doc/RELEASE-NOTES.txt +++ b/doc/RELEASE-NOTES.txt @@ -2,6 +2,7 @@ Changes in Release 2.2.0 ============================================= [SIDP-388] - Add eduPersonAssurance attribute to attribute-resolver.xml config example [SIDP-384] - Incorrect error message set for expired request in Shibboleth SSO Profile Handler +[SIDP-382] - Less verbose logging for failed attribute queries due to missing name-id [SIDP-379] - Usage of general AuthenticationException in UsernamePasswordLoginHandler [SIDP-373] - The SLF4J MDC state is not being properly cleared when request processing is done. [SIDP-368] - Provide more acurate login error to servlet when Username/Password login authentication has failed. diff --git a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java index c536a3c..38fb531 100644 --- a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java +++ b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java @@ -362,7 +362,7 @@ public abstract class AbstractSAML1ProfileHandler extends AbstractSAMLProfileHan throws ProfileException { log.debug("Attemping to build NameIdentifier for principal '{}' in response to request from relying party '{}", requestContext.getPrincipalName(), requestContext.getInboundMessageIssuer()); - + Pair nameIdAttributeAndEncoder = null; try { nameIdAttributeAndEncoder = selectNameIDAttributeAndEncoder(SAML1NameIdentifierEncoder.class, @@ -377,7 +377,9 @@ public abstract class AbstractSAML1ProfileHandler extends AbstractSAMLProfileHan SAML1NameIdentifierEncoder nameIdEncoder = nameIdAttributeAndEncoder.getSecond(); try { - log.debug("Using attribute '{}' supporting name format '{}' to create the NameIdentifier for relying party '{}'", + log + .debug( + "Using attribute '{}' supporting name format '{}' to create the NameIdentifier for relying party '{}'", new Object[] { nameIdAttribute.getId(), nameIdEncoder.getNameFormat(), requestContext.getInboundMessageIssuer(), }); NameIdentifier nameId = nameIdEncoder.encode(nameIdAttribute); @@ -550,10 +552,10 @@ public abstract class AbstractSAML1ProfileHandler extends AbstractSAMLProfileHan } catch (AttributeRequestException e) { requestContext.setFailureStatus(buildStatus(StatusCode.RESPONDER, StatusCode.REQUEST_DENIED, "Error resolving principal")); - String msg = MessageFormatter.format( - "Error resolving principal name for SAML request from relying party '{}'", requestContext - .getInboundMessageIssuer()); - log.warn(msg, e); + String msg = MessageFormatter.arrayFormat( + "Error resolving principal name for SAML request from relying party '{}'. Cause: {}", new Object[] { + requestContext.getInboundMessageIssuer(), e.getMessage() }); + log.warn(msg); throw new ProfileException(msg, e); } } diff --git a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java index ecd9e9b..f024be8 100644 --- a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java +++ b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java @@ -533,10 +533,10 @@ public abstract class AbstractSAML2ProfileHandler extends AbstractSAMLProfileHan } catch (AttributeRequestException e) { requestContext.setFailureStatus(buildStatus(StatusCode.RESPONDER_URI, StatusCode.UNKNOWN_PRINCIPAL_URI, "Error resolving principal")); - String msg = MessageFormatter.format( - "Error resolving principal name for SAML request '{}' from relying party '{}'", requestContext - .getInboundSAMLMessageId(), requestContext.getInboundMessageIssuer()); - log.error(msg, e); + String msg = MessageFormatter.arrayFormat( + "Error resolving principal name for SAML request '{}' from relying party '{}'. Cause: {}", new Object[]{requestContext + .getInboundSAMLMessageId(), requestContext.getInboundMessageIssuer(),e.getMessage()}); + log.warn(msg); throw new ProfileException(msg, e); } } -- 1.7.10.4