Workaround Confluence 6 behaviour change

Refs #41
chauth · Nov 30, 2016 · db8ce69 · db8ce69
1 parent 297439a
commit db8ce69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>remoteUserAuth</artifactId>
     <version>2.7.2-SNAPSHOT</version>
     <properties>
-        <confluence.version>5.9.4</confluence.version>
+        <confluence.version>6.0.2</confluence.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <issueManagement>
@@ -211,7 +211,7 @@
         </dependency>
     </dependencies>
     <build>
-        <plugins>            
+        <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

diff --git a/src/main/java/shibauth/confluence/authentication/shibboleth/RemoteUserAuthenticator.java b/src/main/java/shibauth/confluence/authentication/shibboleth/RemoteUserAuthenticator.java
@@ -833,6 +833,10 @@ private void loginSuccessful(HttpServletRequest request,
     }
 
     private void loginFailed(HttpServletRequest request, String username, String remoteHost, String remoteIP, String reason) {
+        // Fix based on https://github.com/chauth/confluence_http_authenticator/issues/41#issuecomment-263465311
+        if (username == null) {
+            username = "(none)";
+        }
         if (log.isDebugEnabled()) {
             log.debug("Login failed for user " + username + ". request=" + request + ", username=" + username + ", remoteHost=" + remoteHost + ", remoteIP=" + remoteIP + ", reason=" + reason);
         }