diff --git a/src/main/java/dbProcs/Getter.java b/src/main/java/dbProcs/Getter.java index 33f88ef18..f6b094199 100644 --- a/src/main/java/dbProcs/Getter.java +++ b/src/main/java/dbProcs/Getter.java @@ -21,6 +21,7 @@ import org.json.JSONObject; import org.owasp.encoder.Encode; import servlets.Register; +import utils.DbTime; import utils.ModulePlan; import utils.ScoreboardStatus; @@ -112,7 +113,7 @@ public static String[] authUser(String ApplicationRoot, String userName, String badLoginCount = userResult.getInt(5); tempPassword = userResult.getBoolean(6); classId = userResult.getString(7); - suspendedUntil = userResult.getTimestamp(8); + suspendedUntil = userResult.getTimestamp(8, DbTime.UTC.get()); loginType = userResult.getString(9); tempUsername = userResult.getBoolean(10); } else { @@ -237,7 +238,7 @@ public static String[] authUserSSO( // User found if a row is in the database userFound = true; log.debug("User Found"); - suspendedUntil = userResult.getTimestamp(1); + suspendedUntil = userResult.getTimestamp(1, DbTime.UTC.get()); } else { userFound = false; } diff --git a/src/main/java/utils/DbTime.java b/src/main/java/utils/DbTime.java new file mode 100644 index 000000000..3f9b36349 --- /dev/null +++ b/src/main/java/utils/DbTime.java @@ -0,0 +1,12 @@ +package utils; + +import java.util.Calendar; +import java.util.TimeZone; + +public class DbTime { + + private DbTime() {} + + public static final ThreadLocal UTC = + ThreadLocal.withInitial(() -> Calendar.getInstance(TimeZone.getTimeZone("UTC"))); +}