Use Dagger to inject managers into all filters and servlets

James Moger

2013-11-18 cacf8bff097fbb66a7be1bfe267b5da2605145f8

 src/main/java/com/gitblit/AuthenticationFilter.java

@@ -35,6 +35,7 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.gitblit.manager.ISessionManager;

import com.gitblit.models.UserModel;

import com.gitblit.utils.DeepCopier;

import com.gitblit.utils.StringUtils;

@@ -55,6 +56,12 @@
   protected static final String SESSION_SECURED = "com.gitblit.secured";



   protected transient Logger logger = LoggerFactory.getLogger(getClass());



   protected final ISessionManager sessionManager;



   protected AuthenticationFilter(ISessionManager sessionManager) {

      this.sessionManager = sessionManager;

   }



   /**

    * doFilter does the actual work of preprocessing the request to ensure that

@@ -100,7 +107,7 @@
    * @return user

    */

   protected UserModel getUser(HttpServletRequest httpRequest) {

      UserModel user = GitBlit.self().authenticate(httpRequest, requiresClientCertificate());

      UserModel user = sessionManager.authenticate(httpRequest, requiresClientCertificate());

      return user;

   }