From 5b3ef922eff92a528f8b90125194736323ce90c4 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Tue, 20 Sep 2016 10:23:02 -0500
Subject: [PATCH] Improved fix for XNAT-4522.
---
src/main/java/org/nrg/xnat/security/DisableInactiveUsers.java | 2 +-
.../security/provider/XnatDatabaseAuthenticationProvider.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/nrg/xnat/security/DisableInactiveUsers.java b/src/main/java/org/nrg/xnat/security/DisableInactiveUsers.java
index 6db3c221..7d7e19f2 100644
--- a/src/main/java/org/nrg/xnat/security/DisableInactiveUsers.java
+++ b/src/main/java/org/nrg/xnat/security/DisableInactiveUsers.java
@@ -68,7 +68,7 @@ public class DisableInactiveUsers implements Runnable {
if (!hasUserBeenModified(u, _inactivityBeforeLockout) && !username.equals("guest")) {
u.setEnabled("0");
u.setVerified("0");
- Users.save(u, adminUser, false, EventUtils.newEventInstance(EventUtils.CATEGORY.SIDE_ADMIN, EventUtils.TYPE.PROCESS, "Disabled due to inactivity"));
+ Users.save(u, u, false, EventUtils.newEventInstance(EventUtils.CATEGORY.SIDE_ADMIN, EventUtils.TYPE.PROCESS, "Disabled due to inactivity"));
String expiration = TurbineUtils.getDateTimeFormatter().format(DateUtils.addMilliseconds(GregorianCalendar.getInstance().getTime(), _lockoutDuration));
System.out.println("Locked out " + u.getLogin() + " user account until " + expiration);
diff --git a/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java b/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
index b1bccb8d..3ad7b36a 100644
--- a/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
+++ b/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
@@ -135,7 +135,7 @@ public class XnatDatabaseAuthenticationProvider extends DaoAuthenticationProvide
String query = "SELECT COUNT(*) AS count " +
"FROM xdat_user_history " +
"WHERE xdat_user_id=" + xdatUserDetails.getID() + " " +
- //"AND change_user=" + xdatUserDetails.getID() + " " +
+ "AND change_user=" + xdatUserDetails.getID() + " " +
"AND change_date = (SELECT MAX(change_date) " +
"FROM xdat_user_history " +
"WHERE xdat_user_id=" + xdatUserDetails.getID() + " " +
--
GitLab