From 2dfa21c4e10e33ef2b736353ae6c2b31fc0a4fd7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Jan 2012 13:02:01 -0500
Subject: [PATCH] Merge pull request #5 from plm/admin_default_head
---
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 fec2414..2738a5f 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java
+++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
@@ -77,14 +77,19 @@
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);
--
Gitblit v1.9.1