From ef2baa8983234be0d4b8ea4ea4c710e1a9f01d12 Mon Sep 17 00:00:00 2001 From: Misagh Moayyed Date: Tue, 20 Jun 2017 09:21:04 -0700 Subject: [PATCH] Fixed logging issue; returning null in case principal cannot be determined --- .../atlassian/ConfluenceCasAuthenticator.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/ConfluenceCasAuthenticator.java b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/ConfluenceCasAuthenticator.java index 23212c3..e8abef8 100644 --- a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/ConfluenceCasAuthenticator.java +++ b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/ConfluenceCasAuthenticator.java @@ -20,15 +20,16 @@ package org.jasig.cas.client.integration.atlassian; import com.atlassian.confluence.user.ConfluenceAuthenticator; import com.atlassian.seraph.auth.AuthenticatorException; -import java.security.Principal; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.jasig.cas.client.util.AbstractCasFilter; import org.jasig.cas.client.validation.Assertion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.security.Principal; + /** * Extension of ConfluenceAuthenticator to allow people to configure Confluence to authenticate * via CAS. @@ -40,7 +41,9 @@ import org.slf4j.LoggerFactory; */ public final class ConfluenceCasAuthenticator extends ConfluenceAuthenticator { - /** ConfluenceCasAuthenticator.java */ + /** + * ConfluenceCasAuthenticator.java + */ private static final long serialVersionUID = -6097438206488390677L; private static final Logger LOGGER = LoggerFactory.getLogger(ConfluenceCasAuthenticator.class); @@ -61,7 +64,8 @@ public final class ConfluenceCasAuthenticator extends ConfluenceAuthenticator { // user doesn't exist if (p == null) { - LOGGER.error("Principal is null for ", assertion.getPrincipal().getName()); + LOGGER.error("Could not determine principal for [{}]", assertion.getPrincipal().getName()); + return null; } LOGGER.debug("Logging in [{}] from CAS.", p.getName());