diff options
| author | James Moger <james.moger@gitblit.com> | 2012-07-11 17:05:32 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-07-11 17:06:38 -0400 |
| commit | 62aeb92c04024a90d9ed392bb79de03a246a45d8 (patch) | |
| tree | 32914dc5fdab4fef024d5d72d3ba4cbaf8cf3286 /src/com/gitblit/FileUserService.java | |
| parent | 2b67ec0e4a42ad1069a477040a549c3e19be9e36 (diff) | |
| download | gitblit-62aeb92c04024a90d9ed392bb79de03a246a45d8.tar.gz gitblit-62aeb92c04024a90d9ed392bb79de03a246a45d8.zip | |
Persist cookies in ConfigUserService. Update LDAPUserService to generate cookies.
Diffstat (limited to 'src/com/gitblit/FileUserService.java')
| -rw-r--r-- | src/com/gitblit/FileUserService.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/gitblit/FileUserService.java b/src/com/gitblit/FileUserService.java index fcb8eaeb..7705dfd8 100644 --- a/src/com/gitblit/FileUserService.java +++ b/src/com/gitblit/FileUserService.java @@ -133,13 +133,16 @@ public class FileUserService extends FileSettings implements IUserService { * @return cookie value
*/
@Override
- public char[] getCookie(UserModel model) {
+ public String getCookie(UserModel model) {
+ if (!StringUtils.isEmpty(model.cookie)) {
+ return model.cookie;
+ }
Properties allUsers = super.read();
String value = allUsers.getProperty(model.username);
String[] roles = value.split(",");
String password = roles[0];
String cookie = StringUtils.getSHA1(model.username + password);
- return cookie.toCharArray();
+ return cookie;
}
/**
|