Skip to content

Commit 141750b

Browse files
committed
Fix usernames being case sensitive
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
1 parent db8615f commit 141750b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

server/dbconf/derby/derby-user.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
FROM PERSON
3434
<where>
3535
<if test='id != null'>ID = #{id}</if>
36-
<if test='username != null'>AND USERNAME = #{username}</if>
36+
<if test='username != null'>AND LOWER(USERNAME) = LOWER(#{username})</if>
3737
</where>
3838
</select>
3939

server/dbconf/oracle/oracle-user.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
FROM PERSON
3434
<where>
3535
<if test="id != null">ID = #{id}</if>
36-
<if test="username != null">AND USERNAME = #{username}</if>
36+
<if test="username != null">AND LOWER(USERNAME) = LOWER(#{username})</if>
3737
</where>
3838
</select>
3939

server/dbconf/postgres/postgres-user.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
FROM PERSON
3030
<where>
3131
<if test='id != null'>AND ID = #{id}</if>
32-
<if test='username != null'>AND USERNAME = #{username}</if>
32+
<if test='username != null'>AND LOWER(USERNAME) = LOWER(#{username})</if>
3333
</where>
3434
</select>
3535
<select id='getUserCredentials'

server/src/com/mirth/connect/server/controllers/DefaultUserController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ public LoginStatus authorizeUser(String username, String plainPassword, String s
333333
if (loginRequirementsChecker.isPasswordExpired(passwordTime, currentTime)) {
334334
// Let 0 be infinite grace period, -1 be no grace period
335335
if (passwordRequirements.getGracePeriod() == 0) {
336-
loginStatus = new LoginStatus(LoginStatus.Status.SUCCESS_GRACE_PERIOD, "Your password has expired. Please change your password now.");
336+
loginStatus = new LoginStatus(LoginStatus.Status.SUCCESS_GRACE_PERIOD, "Your password has expired. Please change your password now.", validUser.getUsername());
337337
} else if (passwordRequirements.getGracePeriod() > 0) {
338338
// If there has never been a grace time, start it now
339339
long gracePeriodStartTime;
@@ -351,7 +351,7 @@ public LoginStatus authorizeUser(String username, String plainPassword, String s
351351

352352
long graceTimeRemaining = loginRequirementsChecker.getGraceTimeRemaining(gracePeriodStartTime, currentTime);
353353
if (graceTimeRemaining > 0) {
354-
loginStatus = new LoginStatus(LoginStatus.Status.SUCCESS_GRACE_PERIOD, "Your password has expired. You are required to change your password in the next " + loginRequirementsChecker.getPrintableGraceTimeRemaining(graceTimeRemaining) + ".");
354+
loginStatus = new LoginStatus(LoginStatus.Status.SUCCESS_GRACE_PERIOD, "Your password has expired. You are required to change your password in the next " + loginRequirementsChecker.getPrintableGraceTimeRemaining(graceTimeRemaining) + ".", validUser.getUsername());
355355
}
356356
}
357357

@@ -374,7 +374,7 @@ public LoginStatus authorizeUser(String username, String plainPassword, String s
374374

375375
// If nothing failed (loginStatus != null), set SUCCESS now
376376
if (loginStatus == null) {
377-
loginStatus = new LoginStatus(LoginStatus.Status.SUCCESS, "");
377+
loginStatus = new LoginStatus(LoginStatus.Status.SUCCESS, "", validUser.getUsername());
378378

379379
// Clear the user's grace period if one exists
380380
if (validUser.getGracePeriodStart() != null) {

0 commit comments

Comments
 (0)