Refactor user services and separate authentication (issue-281)

James Moger

2013-11-24 04a98505a4ab8f48aee22800fcac193d9367d0ae

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

@@ -23,8 +23,7 @@
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.transport.resolver.UploadPackFactory;

import com.gitblit.GitBlit;
import com.gitblit.manager.ISessionManager;
import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.models.UserModel;

/**
@@ -37,17 +36,22 @@
 */
public class GitblitUploadPackFactory<X> implements UploadPackFactory<X> {

   private final IAuthenticationManager authenticationManager;

   public GitblitUploadPackFactory(IAuthenticationManager authenticationManager) {
      this.authenticationManager = authenticationManager;
   }

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

      ISessionManager sessionManager = GitBlit.getManager(ISessionManager.class);
      UserModel user = UserModel.ANONYMOUS;
      int timeout = 0;

      if (req instanceof HttpServletRequest) {
         // http/https request may or may not be authenticated
         user = sessionManager.authenticate((HttpServletRequest) req);
         user = authenticationManager.authenticate((HttpServletRequest) req);
         if (user == null) {
            user = UserModel.ANONYMOUS;
         }