Add review SSH command

David Ostrovsky

2014-03-11 b799d545f37f7123aaa1ee1d0ff3b61f1f3cc8c2

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

@@ -26,14 +26,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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.manager.IGitblit;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.transport.git.GitDaemonClient;
import com.gitblit.transport.ssh.SshSession;
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.StringUtils;

@@ -48,33 +47,37 @@

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

   private final IStoredSettings settings;

   private final IGitblit gitblit;

   public GitblitReceivePackFactory(IGitblit 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 = "";
      String origin = "";
      String gitblitUrl = "";
      String repositoryUrl = "";
      int timeout = 0;

      if (req instanceof HttpServletRequest) {
         // http/https request may or may not be authenticated
         HttpServletRequest request = (HttpServletRequest) req;
         repositoryName = request.getAttribute("gitblitRepositoryName").toString();
         origin = request.getRemoteHost();
         gitblitUrl = HttpUtils.getGitblitURL(request);
         repositoryUrl = request.getRequestURI();
         HttpServletRequest client = (HttpServletRequest) req;
         repositoryName = client.getAttribute("gitblitRepositoryName").toString();
         origin = client.getRemoteHost();
         gitblitUrl = HttpUtils.getGitblitURL(client);

         // determine pushing user
         String username = request.getRemoteUser();
         String username = client.getRemoteUser();
         if (!StringUtils.isEmpty(username)) {
            UserModel u = userManager.getUserModel(username);
            UserModel u = gitblit.getUserModel(username);
            if (u != null) {
               user = u;
            }
@@ -87,6 +90,13 @@

         // set timeout from Git daemon
         timeout = client.getDaemon().getTimeout();
      } else if (req instanceof SshSession) {
         // SSH request is always authenticated
         SshSession client = (SshSession) req;
         repositoryName = client.getRepositoryName();
         origin = client.getRemoteAddress().toString();
         String username = client.getRemoteUser();
         user = gitblit.getUserModel(username);
      }

      boolean allowAnonymousPushes = settings.getBoolean(Keys.git.allowAnonymousPushes, false);
@@ -95,11 +105,22 @@
         throw new ServiceNotEnabledException();
      }

      final RepositoryModel repository = repositoryManager.getRepositoryModel(repositoryName);
      String url = settings.getString(Keys.web.canonicalUrl, null);
      if (StringUtils.isEmpty(url)) {
         url = gitblitUrl;
      }

      final GitblitReceivePack rp = new GitblitReceivePack(db, repository, user);
      rp.setGitblitUrl(gitblitUrl);
      rp.setRepositoryUrl(repositoryUrl);
      final RepositoryModel repository = gitblit.getRepositoryModel(repositoryName);

      // Determine which receive pack to use for pushes
      final GitblitReceivePack rp;
      if (gitblit.getTicketService().isAcceptingNewPatchsets(repository)) {
         rp = new PatchsetReceivePack(gitblit, db, repository, user);
      } else {
         rp = new GitblitReceivePack(gitblit, db, repository, user);
      }

      rp.setGitblitUrl(url);
      rp.setRefLogIdent(new PersonIdent(user.username, user.username + "@" + origin));
      rp.setTimeout(timeout);