diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-25 07:27:04 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-25 07:27:04 -0600 |
| commit | 54cc7d7c2483d7ca100a5db47f4e1e98bd97c7fe (patch) | |
| tree | 78e91e82aaf19bde6eadf3dc15fc84bba823752e /src/main/java/com/gitblit/wicket/pages/RootPage.java | |
| parent | a8cac83f310be77c1acb6ef39fc0245787a79834 (diff) | |
| parent | ec7ed84b04cd3981ae01b104bd52fc010f31e6a7 (diff) | |
| download | gitblit-54cc7d7c2483d7ca100a5db47f4e1e98bd97c7fe.tar.gz gitblit-54cc7d7c2483d7ca100a5db47f4e1e98bd97c7fe.zip | |
Merged #187 "Restrict Gitblit cookie to the context path"
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/RootPage.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/RootPage.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index b1c3639d..6a933b76 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -46,6 +46,7 @@ import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; +import org.apache.wicket.protocol.http.WebRequest; import org.apache.wicket.protocol.http.WebResponse; import com.gitblit.Constants; @@ -269,8 +270,10 @@ public abstract class RootPage extends BasePage { // Set Cookie if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) { + WebRequest request = (WebRequest) getRequestCycle().getRequest(); WebResponse response = (WebResponse) getRequestCycle().getResponse(); - app().authentication().setCookie(response.getHttpServletResponse(), user); + app().authentication().setCookie(request.getHttpServletRequest(), + response.getHttpServletResponse(), user); } if (!session.continueRequest()) { |