Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/servlet/RpcFilter.java

@@ -18,8 +18,9 @@
import java.io.IOException;

import java.text.MessageFormat;



import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.FilterChain;

import javax.servlet.FilterConfig;

import javax.servlet.ServletException;

import javax.servlet.ServletRequest;

import javax.servlet.ServletResponse;

@@ -29,10 +30,9 @@
import com.gitblit.Constants.RpcRequest;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.manager.IAuthenticationManager;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.models.UserModel;



import dagger.ObjectGraph;



/**

 * The RpcFilter is a servlet filter that secures the RpcServlet.

@@ -47,17 +47,23 @@
 * @author James Moger

 *

 */

@Singleton

public class RpcFilter extends AuthenticationFilter {



   private IStoredSettings settings;



   private IRuntimeManager runtimeManager;



   @Override

   protected void inject(ObjectGraph dagger, FilterConfig filterConfig) {

      super.inject(dagger, filterConfig);

      this.settings = dagger.get(IStoredSettings.class);

      this.runtimeManager = dagger.get(IRuntimeManager.class);

   @Inject

   public RpcFilter(

         IStoredSettings settings,

         IRuntimeManager runtimeManager,

         IAuthenticationManager authenticationManager) {



      super(authenticationManager);



      this.settings = settings;

      this.runtimeManager = runtimeManager;

   }



   /**