From fc948cacef9c9b8c0a1e84cbc082ca67cd5f68d9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 14 Apr 2011 18:29:10 -0400
Subject: [PATCH] Authenticate the webapp against the same realm as the git servlet.
---
src/com/gitblit/wicket/LoginPage.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/wicket/LoginPage.java b/src/com/gitblit/wicket/LoginPage.java
index 39b4285..e27adc3 100644
--- a/src/com/gitblit/wicket/LoginPage.java
+++ b/src/com/gitblit/wicket/LoginPage.java
@@ -18,6 +18,7 @@
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import com.gitblit.Constants;
+import com.gitblit.GitBlit;
public class LoginPage extends WebPage {
@@ -58,7 +59,7 @@
String username = LoginPage.this.username.getObject();
char [] password = LoginPage.this.password.getObject().toCharArray();
- User user = GitBlitWebApp.get().authenticate(username, password);
+ User user = GitBlit.self().authenticate(username, password);
if (user == null)
error("Invalid username or password!");
else
@@ -72,7 +73,7 @@
// Grab cookie from Browser Session
Cookie[] cookies = ((WebRequest) getRequestCycle().getRequest()).getCookies();
if (cookies != null && cookies.length > 0) {
- user = GitBlitWebApp.get().authenticate(cookies);
+ user = GitBlit.self().authenticate(cookies);
}
// Login the user
@@ -85,7 +86,7 @@
// Set Cookie
WebResponse response = (WebResponse) getRequestCycle().getResponse();
- GitBlitWebApp.get().setCookie(response, user);
+ GitBlit.self().setCookie(response, user);
// track user object so that we do not have to continue
// re-authenticating on each request.
--
Gitblit v1.9.1