From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java b/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
index d690fd2..8a3f782 100644
--- a/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
+++ b/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.text.MessageFormat;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -34,9 +34,7 @@
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.Keys.web;
-import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.ISessionManager;
+import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.models.UserModel;
/**
@@ -52,25 +50,25 @@
protected transient Logger logger = LoggerFactory.getLogger(getClass());
- private final IStoredSettings settings;
+ private IStoredSettings settings;
- private final ISessionManager sessionManager;
+ private IAuthenticationManager authenticationManager;
@Inject
public EnforceAuthenticationFilter(
- IRuntimeManager runtimeManager,
- ISessionManager sessionManager) {
+ IStoredSettings settings,
+ IAuthenticationManager authenticationManager) {
- super();
- this.settings = runtimeManager.getSettings();
- this.sessionManager = sessionManager;
+ this.settings = settings;
+ this.authenticationManager = authenticationManager;
}
- /*
- * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
- */
@Override
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(FilterConfig config) {
+ }
+
+ @Override
+ public void destroy() {
}
/*
@@ -86,7 +84,7 @@
HttpServletRequest httpRequest = (HttpServletRequest) request;
HttpServletResponse httpResponse = (HttpServletResponse) response;
- UserModel user = sessionManager.authenticate(httpRequest);
+ UserModel user = authenticationManager.authenticate(httpRequest);
if (mustForceAuth && (user == null)) {
// not authenticated, enforce now:
@@ -100,13 +98,5 @@
// user is authenticated, or don't care, continue handling
chain.doFilter(request, response);
}
- }
-
-
- /*
- * @see javax.servlet.Filter#destroy()
- */
- @Override
- public void destroy() {
}
}
--
Gitblit v1.9.1