From 3928544560cb7f6cd1bff4bf975eea5f5d10fda2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 09 Aug 2013 10:16:16 -0400
Subject: [PATCH] Update to Moxie 0.8.1 and include gbapi in Maven repository on RELEASE build
---
src/main/java/com/gitblit/AuthenticationFilter.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/AuthenticationFilter.java b/src/main/java/com/gitblit/AuthenticationFilter.java
index eb6e95b..388452e 100644
--- a/src/main/java/com/gitblit/AuthenticationFilter.java
+++ b/src/main/java/com/gitblit/AuthenticationFilter.java
@@ -28,6 +28,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -35,6 +36,7 @@
import org.slf4j.LoggerFactory;
import com.gitblit.models.UserModel;
+import com.gitblit.utils.DeepCopier;
import com.gitblit.utils.StringUtils;
/**
@@ -105,7 +107,6 @@
/**
* Taken from Jetty's LoginAuthenticator.renewSessionOnAuthentication()
*/
- @SuppressWarnings("unchecked")
protected void newSession(HttpServletRequest request, HttpServletResponse response) {
HttpSession oldSession = request.getSession(false);
if (oldSession != null && oldSession.getAttribute(SESSION_SECURED) == null) {
@@ -145,14 +146,13 @@
/**
* Wraps a standard HttpServletRequest and overrides user principal methods.
*/
- public static class AuthenticatedRequest extends ServletRequestWrapper {
+ public static class AuthenticatedRequest extends HttpServletRequestWrapper {
private UserModel user;
public AuthenticatedRequest(HttpServletRequest req) {
super(req);
- user = new UserModel("anonymous");
- user.isAuthenticated = false;
+ user = DeepCopier.copy(UserModel.ANONYMOUS);
}
UserModel getUser() {
--
Gitblit v1.9.1