From 2365822625a0a46b2d25f83b698801cd18e811c0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 12:01:56 -0400
Subject: [PATCH] Merged #201 "Remove git.streamFileThreshold setting"
---
src/main/java/com/gitblit/wicket/pages/SessionPage.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/SessionPage.java b/src/main/java/com/gitblit/wicket/pages/SessionPage.java
index 909342a..7717854 100644
--- a/src/main/java/com/gitblit/wicket/pages/SessionPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/SessionPage.java
@@ -56,11 +56,13 @@
// any changes to permissions or roles (issue-186)
UserModel user = app().users().getUserModel(session.getUser().username);
- if (user.disabled) {
- // user was disabled during session
+ if (user == null || user.disabled) {
+ // user was deleted/disabled during session
+ HttpServletRequest request = ((WebRequest) getRequestCycle().getRequest())
+ .getHttpServletRequest();
HttpServletResponse response = ((WebResponse) getRequestCycle().getResponse())
.getHttpServletResponse();
- app().authentication().logout(response, user);
+ app().authentication().logout(request, response, user);
session.setUser(null);
session.invalidateNow();
return;
@@ -76,7 +78,7 @@
// cookie was changed during our session
HttpServletResponse response = ((WebResponse) getRequestCycle().getResponse())
.getHttpServletResponse();
- app().authentication().logout(response, user);
+ app().authentication().logout(request, response, user);
session.setUser(null);
session.invalidateNow();
return;
@@ -99,8 +101,10 @@
session.setUser(user);
// Set Cookie
+ WebRequest request = (WebRequest) getRequestCycle().getRequest();
WebResponse response = (WebResponse) getRequestCycle().getResponse();
- app().authentication().setCookie(response.getHttpServletResponse(), user);
+ app().authentication().setCookie(request.getHttpServletRequest(),
+ response.getHttpServletResponse(), user);
session.continueRequest();
}
--
Gitblit v1.9.1