Merged #217 "Exclude SSLv3 from Gitblit GO https protocols"

James Moger

2014-11-04 4e84166db5c5538e3984d9d2d6bb1f9902e65ee0

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

@@ -17,7 +17,8 @@


import java.text.MessageFormat;



import javax.inject.Inject;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.http.HttpServletRequest;



import com.gitblit.Constants.AccessRestrictionType;

@@ -29,7 +30,6 @@
import com.gitblit.manager.IFederationManager;

import com.gitblit.manager.IRepositoryManager;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.manager.IUserManager;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

@@ -42,6 +42,7 @@
 * @author James Moger

 *

 */

@Singleton

public class GitFilter extends AccessRestrictionFilter {



   protected static final String gitReceivePack = "/git-receive-pack";

@@ -51,23 +52,21 @@
   protected static final String[] suffixes = { gitReceivePack, gitUploadPack, "/info/refs", "/HEAD",

         "/objects" };



   private final IStoredSettings settings;

   private IStoredSettings settings;



   private final IUserManager userManager;



   private final IFederationManager federationManager;

   private IFederationManager federationManager;



   @Inject

   public GitFilter(

         IStoredSettings settings,

         IRuntimeManager runtimeManager,

         IUserManager userManager,

         IAuthenticationManager authenticationManager,

         IRepositoryManager repositoryManager,

         IFederationManager federationManager) {



      super(runtimeManager, authenticationManager, repositoryManager);

      this.settings = runtimeManager.getSettings();

      this.userManager = userManager;



      this.settings = settings;

      this.federationManager = federationManager;

   }



@@ -203,15 +202,8 @@
         return false;

      }

      if (action.equals(gitReceivePack)) {

         // Push request

         if (user.canPush(repository)) {

            return true;

         } else {

            // user is unauthorized to push to this repository

            logger.warn(MessageFormat.format("user {0} is not authorized to push to {1}",

                  user.username, repository));

            return false;

         }

         // push permissions are enforced in the receive pack

         return true;

      } else if (action.equals(gitUploadPack)) {

         // Clone request

         if (user.canClone(repository)) {