Added user name for login audit

skavanagh · skavanagh · commit 4ccc19a7f3e7 · 2015-12-01T06:36:17.000-05:00
Added user name for login audit logging
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.keybox</groupId>
     <artifactId>keybox</artifactId>
-    <version>2.85.00-SNAPSHOT</version>
+    <version>2.85.00</version>
     <packaging>war</packaging>
     <name>KeyBox</name>
     <properties>
diff --git a/src/main/java/com/keybox/manage/action/LoginAction.java b/src/main/java/com/keybox/manage/action/LoginAction.java
@@ -98,14 +98,14 @@ public String loginSubmit() {
                 if (otpEnabled) {
                     sharedSecret = AuthDB.getSharedSecret(user.getId());
                     if (StringUtils.isNotEmpty(sharedSecret) && (auth.getOtpToken() == null || !OTPUtil.verifyToken(sharedSecret, auth.getOtpToken()))) {
-                        loginAuditLogger.info(clientIP + " " + AUTH_ERROR);
+                        loginAuditLogger.info(auth.getUsername() + " (" + clientIP + ") - "  + AUTH_ERROR);
                         addActionError(AUTH_ERROR);
                         return INPUT;
                     }
                 }
                 //check to see if admin has any assigned profiles
                 if(!User.MANAGER.equals(user.getUserType()) && (user.getProfileList()==null || user.getProfileList().size()<=0)){
-                    loginAuditLogger.info(clientIP + " " + AUTH_ERROR_NO_PROFILE);
+                    loginAuditLogger.info(auth.getUsername() + " (" + clientIP + ") - " + AUTH_ERROR_NO_PROFILE);
                     addActionError(AUTH_ERROR_NO_PROFILE);
                     return INPUT;
                 }
@@ -121,11 +121,11 @@ public String loginSubmit() {
                 } else if ("changeme".equals(auth.getPassword())  && Auth.AUTH_BASIC.equals(user.getAuthType())) {
                     retVal = "change_password";
                 }
-                loginAuditLogger.info(clientIP + " Authentication Success");
+                loginAuditLogger.info(auth.getUsername() + " (" + clientIP + ") - Authentication Success");
             }
 
         } else {
-            loginAuditLogger.info(clientIP + " " + AUTH_ERROR);
+            loginAuditLogger.info(auth.getUsername() + " (" + clientIP + ") - " + AUTH_ERROR);
             addActionError(AUTH_ERROR);
             retVal = INPUT;
         }

Original file line number	Diff line number	Diff line change
`@@ -98,14 +98,14 @@ public String loginSubmit() {`
`98`	`98`	`if (otpEnabled) {`
`99`	`99`	`sharedSecret = AuthDB.getSharedSecret(user.getId());`
`100`	`100`	`if (StringUtils.isNotEmpty(sharedSecret) && (auth.getOtpToken() == null \|\| !OTPUtil.verifyToken(sharedSecret, auth.getOtpToken()))) {`
`101`		`- loginAuditLogger.info(clientIP + " " + AUTH_ERROR);`
	`101`	`+ loginAuditLogger.info(auth.getUsername() + " (" + clientIP + ") - " + AUTH_ERROR);`
`102`	`102`	`addActionError(AUTH_ERROR);`
`103`	`103`	`return INPUT;`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`//check to see if admin has any assigned profiles`
`107`	`107`	`if(!User.MANAGER.equals(user.getUserType()) && (user.getProfileList()==null \|\| user.getProfileList().size()<=0)){`
`108`		`- loginAuditLogger.info(clientIP + " " + AUTH_ERROR_NO_PROFILE);`
	`108`	`+ loginAuditLogger.info(auth.getUsername() + " (" + clientIP + ") - " + AUTH_ERROR_NO_PROFILE);`
`109`	`109`	`addActionError(AUTH_ERROR_NO_PROFILE);`
`110`	`110`	`return INPUT;`
`111`	`111`	`}`
`@@ -121,11 +121,11 @@ public String loginSubmit() {`
`121`	`121`	`} else if ("changeme".equals(auth.getPassword()) && Auth.AUTH_BASIC.equals(user.getAuthType())) {`
`122`	`122`	`retVal = "change_password";`
`123`	`123`	`}`
`124`		`- loginAuditLogger.info(clientIP + " Authentication Success");`
	`124`	`+ loginAuditLogger.info(auth.getUsername() + " (" + clientIP + ") - Authentication Success");`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`} else {`
`128`		`- loginAuditLogger.info(clientIP + " " + AUTH_ERROR);`
	`128`	`+ loginAuditLogger.info(auth.getUsername() + " (" + clientIP + ") - " + AUTH_ERROR);`
`129`	`129`	`addActionError(AUTH_ERROR);`
`130`	`130`	`retVal = INPUT;`
`131`	`131`	`}`