From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java | 36 +++++++++++-------------------------
1 files changed, 11 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..c015021 100644
--- a/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
+++ b/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
@@ -18,9 +18,6 @@
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;
@@ -34,10 +31,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 +45,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, FilterConfig filterConfig) {
+ this.settings = dagger.get(IStoredSettings.class);
+ this.authenticationManager = dagger.get(IAuthenticationManager.class);
}
/*
@@ -86,7 +72,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