From 2ae54e8d98fac17bca08b43575134e26fe5656aa Mon Sep 17 00:00:00 2001 From: eghm Date: Thu, 15 Sep 2016 13:57:11 -1000 Subject: [PATCH 1/2] Log an error message if CAS principle has no corresponding Confluence principle. --- .../integration/atlassian/ConfluenceCasAuthenticator.java | 5 +++++ 1 file changed, 5 insertions(+) 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 a705ede..1e06f7a 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 @@ -59,6 +59,11 @@ public final class ConfluenceCasAuthenticator extends ConfluenceAuthenticator { if (assertion != null) { final Principal p = getUser(assertion.getPrincipal().getName()); + // user doesn't exist + if (p == null) { + LOGGER.error("Principal is null for " + assertion.getPrincipal().getName()); + } + LOGGER.debug("Logging in [{}] from CAS.", p.getName()); session.setAttribute(LOGGED_IN_KEY, p); From bad68332a6b87208c7c840f89eadfb242c4b9d25 Mon Sep 17 00:00:00 2001 From: eghm Date: Mon, 19 Sep 2016 10:14:22 -1000 Subject: [PATCH 2/2] Use parameterized log statement when logging CAS only principle. --- .../integration/atlassian/ConfluenceCasAuthenticator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1e06f7a..23212c3 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 @@ -61,7 +61,7 @@ public final class ConfluenceCasAuthenticator extends ConfluenceAuthenticator { // user doesn't exist if (p == null) { - LOGGER.error("Principal is null for " + assertion.getPrincipal().getName()); + LOGGER.error("Principal is null for ", assertion.getPrincipal().getName()); } LOGGER.debug("Logging in [{}] from CAS.", p.getName());