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/GitBlit.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/GitBlit.java')
| -rw-r--r-- | src/com/gitblit/GitBlit.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index eab265ab..27d43c8e 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -512,9 +512,15 @@ public class GitBlit implements ServletContextListener { userCookie = new Cookie(Constants.NAME, "");
} else {
// set cookie for login
- char[] cookie = userService.getCookie(user);
- userCookie = new Cookie(Constants.NAME, new String(cookie));
- userCookie.setMaxAge(Integer.MAX_VALUE);
+ String cookie = userService.getCookie(user);
+ if (StringUtils.isEmpty(cookie)) {
+ // create empty cookie
+ userCookie = new Cookie(Constants.NAME, "");
+ } else {
+ // create real cookie
+ userCookie = new Cookie(Constants.NAME, cookie);
+ userCookie.setMaxAge(Integer.MAX_VALUE);
+ }
}
userCookie.setPath("/");
response.addCookie(userCookie);
|