diff options
Diffstat (limited to 'src/com/gitblit/wicket/pages/ChangePasswordPage.java')
| -rw-r--r-- | src/com/gitblit/wicket/pages/ChangePasswordPage.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java index fec24144..2738a5fc 100644 --- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java +++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.java @@ -77,14 +77,19 @@ public class ChangePasswordPage extends RootSubPage { return;
}
+ UserModel user = GitBlitWebSession.get().getUser();
+
// convert to MD5 digest, if appropriate
String type = GitBlit.getString(Keys.realm.passwordStorage, "md5");
if (type.equalsIgnoreCase("md5")) {
// store MD5 digest of password
password = StringUtils.MD5_TYPE + StringUtils.getMD5(password);
+ } else if (type.equalsIgnoreCase("combined-md5")) {
+ // store MD5 digest of username+password
+ password = StringUtils.COMBINED_MD5_TYPE
+ + StringUtils.getMD5(user.username.toLowerCase() + password);
}
- UserModel user = GitBlitWebSession.get().getUser();
user.password = password;
try {
GitBlit.self().updateUserModel(user.username, user, false);
|