Update to Jetty 7.6.8

James Moger

2012-12-03 2e8c48c0048e386431d5c41cea733b6d95760d52

 src/com/gitblit/GitServlet.java

@@ -28,6 +28,7 @@
import java.util.Collection;

import java.util.Enumeration;

import java.util.LinkedHashSet;

import java.util.List;

import java.util.Set;



import javax.servlet.ServletConfig;

@@ -38,6 +39,7 @@
import org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory;

import org.eclipse.jgit.lib.PersonIdent;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;

import org.eclipse.jgit.transport.PostReceiveHook;

import org.eclipse.jgit.transport.PreReceiveHook;

import org.eclipse.jgit.transport.ReceiveCommand;

@@ -48,9 +50,12 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ClientLogger;

import com.gitblit.utils.HttpUtils;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;



/**

@@ -77,7 +82,12 @@
   public void init(ServletConfig config) throws ServletException {

      groovyDir = GitBlit.getGroovyScriptsFolder();

      try {

         gse = new GroovyScriptEngine(groovyDir.getAbsolutePath());

         // set Grape root

         File grapeRoot = new File(GitBlit.getString(Keys.groovy.grapeFolder, "groovy/grape")).getAbsoluteFile();

         grapeRoot.mkdirs();

         System.setProperty("grape.root", grapeRoot.getAbsolutePath());

			
         gse = new GroovyScriptEngine(groovyDir.getAbsolutePath());			
      } catch (IOException e) {

         throw new ServletException("Failed to instantiate Groovy Script Engine!", e);

      }

@@ -87,11 +97,33 @@
         @Override

         public ReceivePack create(HttpServletRequest req, Repository db)

               throws ServiceNotEnabledException, ServiceNotAuthorizedException {

            ReceivePack rp = super.create(req, db);

				
            // determine repository name from request

            String repositoryName = req.getPathInfo().substring(1);

            repositoryName = GitFilter.getRepositoryName(repositoryName);

				
            GitblitReceiveHook hook = new GitblitReceiveHook();

            hook.repositoryName = repositoryName;

            hook.gitblitUrl = HttpUtils.getGitblitURL(req);



            ReceivePack rp = super.create(req, db);

            rp.setPreReceiveHook(hook);

            rp.setPostReceiveHook(hook);



            // determine pushing user

            PersonIdent person = rp.getRefLogIdent();

            UserModel user = GitBlit.self().getUserModel(person.getName());

            if (user == null) {

               // anonymous push, create a temporary usermodel

               user = new UserModel(person.getName());

            }

				
            // enforce advanced ref permissions

            RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName);

            rp.setAllowCreates(user.canCreateRef(repository));

            rp.setAllowDeletes(user.canDeleteRef(repository));

            rp.setAllowNonFastForwards(user.canRewindRef(repository));

				
            return rp;

         }

      });

@@ -151,6 +183,8 @@


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



      protected String repositoryName;

		
      protected String gitblitUrl;



      /**

@@ -160,12 +194,50 @@
       */

      @Override

      public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {

         RepositoryModel repository = getRepositoryModel(rp);

         RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName);

         UserModel user = getUserModel(rp);

			
         if (repository.accessRestriction.atLeast(AccessRestrictionType.PUSH) && repository.verifyCommitter) {

            if (StringUtils.isEmpty(user.emailAddress)) {

               // emit warning if user does not have an email address 
               logger.warn(MessageFormat.format("Consider setting an email address for {0} ({1}) to improve committer verification.", user.getDisplayName(), user.username));

            }

				
            // Optionally enforce that the committer of the left parent chain

            // match the account being used to push the commits.

            // 
            // This requires all merge commits are executed with the "--no-ff"

            // option to force a merge commit even if fast-forward is possible.

            // This ensures that the chain of left parents has the commit

            // identity of the merging user.

            for (ReceiveCommand cmd : commands) {

               try {

                  List<RevCommit> commits = JGitUtils.getRevLog(rp.getRepository(), cmd.getOldId().name(), cmd.getNewId().name());

                  for (RevCommit commit : commits) {

                     PersonIdent committer = commit.getCommitterIdent();

                     if (!user.is(committer.getName(), committer.getEmailAddress())) {

                        String reason;

                        if (StringUtils.isEmpty(user.emailAddress)) {

                           // account does not have en email address

                           reason = MessageFormat.format("{0} by {1} <{2}> was not committed by {3} ({4})", commit.getId().name(), committer.getName(), StringUtils.isEmpty(committer.getEmailAddress()) ? "?":committer.getEmailAddress(), user.getDisplayName(), user.username);

                        } else {

                           // account has an email address

                           reason = MessageFormat.format("{0} by {1} <{2}> was not committed by {3} ({4}) <{5}>", commit.getId().name(), committer.getName(), StringUtils.isEmpty(committer.getEmailAddress()) ? "?":committer.getEmailAddress(), user.getDisplayName(), user.username, user.emailAddress);

                        }

                        cmd.setResult(Result.REJECTED_OTHER_REASON, reason);

                        break;

                     }

                  }

               } catch (Exception e) {

                  logger.error("Failed to verify commits were made by pushing user", e);

               }

            }

         }

			
         Set<String> scripts = new LinkedHashSet<String>();

         scripts.addAll(GitBlit.self().getPreReceiveScriptsInherited(repository));

         scripts.addAll(repository.preReceiveScripts);

         UserModel user = getUserModel(rp);

         runGroovy(repository, user, commands, scripts);

         runGroovy(repository, user, commands, rp, scripts);

         for (ReceiveCommand cmd : commands) {

            if (!Result.NOT_ATTEMPTED.equals(cmd.getResult())) {

               logger.warn(MessageFormat.format("{0} {1} because \"{2}\"", cmd.getNewId()

@@ -188,30 +260,33 @@
            logger.info("skipping post-receive hooks, no refs created, updated, or removed");

            return;

         }

         RepositoryModel repository = getRepositoryModel(rp);

         RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName);

         Set<String> scripts = new LinkedHashSet<String>();

         scripts.addAll(GitBlit.self().getPostReceiveScriptsInherited(repository));

         scripts.addAll(repository.postReceiveScripts);

         UserModel user = getUserModel(rp);

         runGroovy(repository, user, commands, scripts);



         runGroovy(repository, user, commands, rp, scripts);

         for (ReceiveCommand cmd : commands) {

            if (Result.OK.equals(cmd.getResult())) {

               // add some logging for important ref changes

               switch (cmd.getType()) {

               case DELETE:

                  logger.info(MessageFormat.format("{0} DELETED {1} in {2} ({3})", user.username, cmd.getRefName(), repository.name, cmd.getOldId().name()));

                  break;

               case CREATE:

                  logger.info(MessageFormat.format("{0} CREATED {1} in {2}", user.username, cmd.getRefName(), repository.name));

                  break;

               case UPDATE_NONFASTFORWARD:

                  logger.info(MessageFormat.format("{0} UPDATED NON-FAST-FORWARD {1} in {2} (from {3} to {4})", user.username, cmd.getRefName(), repository.name, cmd.getOldId().name(), cmd.getNewId().name()));

                  break;

               default:

                  break;

               }

            }

         }

			
         // Experimental

         // runNativeScript(rp, "hooks/post-receive", commands);

      }



      /**

       * Returns the RepositoryModel for the repository we are pushing into.

       * 
       * @param rp

       * @return a RepositoryModel

       */

      protected RepositoryModel getRepositoryModel(ReceivePack rp) {

         Repository repository = rp.getRepository();

         String rootPath = GitBlit.getRepositoriesFolder().getAbsolutePath();

         String repositoryName = StringUtils.getRelativePath(rootPath, repository.getDirectory()

               .getAbsolutePath());

         RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);

         return model;

      }



      /**

@@ -226,6 +301,7 @@
         if (user == null) {

            // anonymous push, create a temporary usermodel

            user = new UserModel(person.getName());

            user.isAuthenticated = false;

         }

         return user;

      }

@@ -239,7 +315,7 @@
       * @param scripts

       */

      protected void runGroovy(RepositoryModel repository, UserModel user,

            Collection<ReceiveCommand> commands, Set<String> scripts) {

            Collection<ReceiveCommand> commands, ReceivePack rp, Set<String> scripts) {

         if (scripts == null || scripts.size() == 0) {

            // no Groovy scripts to execute

            return;

@@ -248,10 +324,12 @@
         Binding binding = new Binding();

         binding.setVariable("gitblit", GitBlit.self());

         binding.setVariable("repository", repository);

         binding.setVariable("receivePack", rp);

         binding.setVariable("user", user);

         binding.setVariable("commands", commands);

         binding.setVariable("url", gitblitUrl);

         binding.setVariable("logger", logger);

         binding.setVariable("clientLogger", new ClientLogger(rp));

         for (String script : scripts) {

            if (StringUtils.isEmpty(script)) {

               continue;