From ae0b135ecdbc0e85ba2d612356f4493f2f97bd7a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jan 2012 08:28:37 -0500
Subject: [PATCH] Fixed username case-sensitivity bugs (issue 43)
---
src/com/gitblit/wicket/pages/EditUserPage.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java
index 799cf01..142a542 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/com/gitblit/wicket/pages/EditUserPage.java
@@ -108,11 +108,13 @@
*/
@Override
protected void onSubmit() {
- String username = userModel.username;
- if (StringUtils.isEmpty(username)) {
+ if (StringUtils.isEmpty(userModel.username)) {
error("Please enter a username!");
return;
}
+ // force username to lower-case
+ userModel.username = userModel.username.toLowerCase();
+ String username = userModel.username;
if (isCreate) {
UserModel model = GitBlit.self().getUserModel(username);
if (model != null) {
@@ -151,7 +153,7 @@
} else if (type.equalsIgnoreCase("combined-md5")) {
// store MD5 digest of username+password
userModel.password = StringUtils.COMBINED_MD5_TYPE
- + StringUtils.getMD5(username.toLowerCase() + userModel.password);
+ + StringUtils.getMD5(username + userModel.password);
}
} else if (rename
&& password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {
@@ -177,7 +179,7 @@
userModel.teams.add(team);
}
- try {
+ try {
GitBlit.self().updateUserModel(oldName, userModel, isCreate);
} catch (GitBlitException e) {
error(e.getMessage());
--
Gitblit v1.9.1