From 4e8d63d5a6200ce7958125593f269eeef5a4ff9b Mon Sep 17 00:00:00 2001
From: Alfred Schmid <A.Schmid@ff-muenchen.de>
Date: Fri, 21 Feb 2014 04:47:34 -0500
Subject: [PATCH] Fixed and introduced tests for synching ldap users and groups.
---
src/main/java/com/gitblit/wicket/pages/EditUserPage.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
index 4e91b45..15c35fa 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
@@ -154,6 +154,9 @@
return;
}
+ // change the cookie
+ userModel.cookie = StringUtils.getSHA1(userModel.username + password);
+
// Optionally store the password MD5 digest.
String type = app().settings().getString(Keys.realm.passwordStorage, "md5");
if (type.equalsIgnoreCase("md5")) {
@@ -188,7 +191,11 @@
}
try {
- app().gitblit().updateUserModel(oldName, userModel, isCreate);
+ if (isCreate) {
+ app().gitblit().addUser(userModel);
+ } else {
+ app().gitblit().reviseUser(oldName, userModel);
+ }
} catch (GitBlitException e) {
error(e.getMessage());
return;
--
Gitblit v1.9.1