From 3f5b8f5d9203aa7ffb7fbe9cdbaf9dba3da6cae6 Mon Sep 17 00:00:00 2001
From: Hybris95 <hybris_95@hotmail.com>
Date: Thu, 01 May 2014 16:14:15 -0400
Subject: [PATCH] Fixes sort, page building and search functions on "my tickets" page.
---
src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java b/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
index d690fd2..5fdccb7 100644
--- a/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
+++ b/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
@@ -18,11 +18,7 @@
import java.io.IOException;
import java.text.MessageFormat;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.Filter;
import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -34,10 +30,11 @@
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.dagger.DaggerFilter;
+import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.models.UserModel;
+
+import dagger.ObjectGraph;
/**
* This filter enforces authentication via HTTP Basic Authentication, if the settings indicate so.
@@ -47,30 +44,18 @@
* @author Laurens Vrijnsen
*
*/
-@Singleton
-public class EnforceAuthenticationFilter implements Filter {
+public class EnforceAuthenticationFilter extends DaggerFilter {
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) {
-
- super();
- this.settings = runtimeManager.getSettings();
- this.sessionManager = sessionManager;
- }
-
- /*
- * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
- */
@Override
- public void init(FilterConfig filterConfig) throws ServletException {
+ protected void inject(ObjectGraph dagger) {
+ this.settings = dagger.get(IStoredSettings.class);
+ this.authenticationManager = dagger.get(IAuthenticationManager.class);
}
/*
@@ -86,7 +71,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:
--
Gitblit v1.9.1