Refactor user services and separate authentication (issue-281)

James Moger

2013-11-24 04a98505a4ab8f48aee22800fcac193d9367d0ae

 src/main/java/com/gitblit/git/GitblitReceivePackFactory.java

@@ -29,9 +29,6 @@
import com.gitblit.GitBlit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
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.HttpUtils;
@@ -48,13 +45,19 @@

   protected final Logger logger = LoggerFactory.getLogger(GitblitReceivePackFactory.class);

   private final IStoredSettings settings;

   private final GitBlit gitblit;

   public GitblitReceivePackFactory(GitBlit gitblit) {
      super();
      this.settings = gitblit.getSettings();
      this.gitblit = gitblit;
   }

   @Override
   public ReceivePack create(X req, Repository db)
         throws ServiceNotEnabledException, ServiceNotAuthorizedException {

      IStoredSettings settings = GitBlit.getManager(IRuntimeManager.class).getSettings();
      IUserManager userManager = GitBlit.getManager(IUserManager.class);
      IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

      UserModel user = UserModel.ANONYMOUS;
      String repositoryName = "";
@@ -74,7 +77,7 @@
         // determine pushing user
         String username = request.getRemoteUser();
         if (!StringUtils.isEmpty(username)) {
            UserModel u = userManager.getUserModel(username);
            UserModel u = gitblit.getUserModel(username);
            if (u != null) {
               user = u;
            }
@@ -95,9 +98,9 @@
         throw new ServiceNotEnabledException();
      }

      final RepositoryModel repository = repositoryManager.getRepositoryModel(repositoryName);
      final RepositoryModel repository = gitblit.getRepositoryModel(repositoryName);

      final GitblitReceivePack rp = new GitblitReceivePack(db, repository, user);
      final GitblitReceivePack rp = new GitblitReceivePack(gitblit, db, repository, user);
      rp.setGitblitUrl(gitblitUrl);
      rp.setRepositoryUrl(repositoryUrl);
      rp.setRefLogIdent(new PersonIdent(user.username, user.username + "@" + origin));