Fixed bug in receive hook for repositories in subfolders

James Moger

2012-01-05 cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef

 src/com/gitblit/wicket/pages/EditRepositoryPage.java

@@ -19,13 +19,15 @@
import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.Date;

import java.util.HashSet;

import java.util.Iterator;

import java.util.List;

import java.util.Map;

import java.util.Set;



import org.apache.wicket.PageParameters;

import org.apache.wicket.extensions.markup.html.form.palette.Palette;

import org.apache.wicket.markup.html.form.Button;

import org.apache.wicket.markup.html.form.CheckBox;

import org.apache.wicket.markup.html.form.ChoiceRenderer;

import org.apache.wicket.markup.html.form.DropDownChoice;

@@ -33,24 +35,31 @@
import org.apache.wicket.markup.html.form.IChoiceRenderer;

import org.apache.wicket.markup.html.form.TextField;

import org.apache.wicket.model.CompoundPropertyModel;

import org.apache.wicket.model.IModel;

import org.apache.wicket.model.Model;

import org.apache.wicket.model.util.CollectionModel;

import org.apache.wicket.model.util.ListModel;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.BulletListPanel;



public class EditRepositoryPage extends BasePage {

public class EditRepositoryPage extends RootSubPage {



   private final boolean isCreate;



   private boolean isAdmin;



   private IModel<String> mailingLists;



   public EditRepositoryPage() {

      // create constructor

@@ -72,21 +81,59 @@
      // ensure this user can create or edit this repository

      checkPermissions(repositoryModel);



      List<String> federationSets = new ArrayList<String>();

      List<String> repositoryUsers = new ArrayList<String>();

      List<String> repositoryTeams = new ArrayList<String>();

      List<String> preReceiveScripts = new ArrayList<String>();

      List<String> postReceiveScripts = new ArrayList<String>();



      if (isCreate) {

         super.setupPage("", getString("gb.newRepository"));

         super.setupPage(getString("gb.newRepository"), "");

      } else {

         super.setupPage("", getString("gb.edit"));

         super.setupPage(getString("gb.edit"), repositoryModel.name);

         if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {

            repositoryUsers.addAll(GitBlit.self().getRepositoryUsers(repositoryModel));

            repositoryTeams.addAll(GitBlit.self().getRepositoryTeams(repositoryModel));

            Collections.sort(repositoryUsers);

         }

         federationSets.addAll(repositoryModel.federationSets);

      }



      final String oldName = repositoryModel.name;

      // users palette

      final Palette<String> usersPalette = new Palette<String>("users", new ListModel<String>(

            repositoryUsers), new CollectionModel<String>(GitBlit.self().getAllUsernames()),

            new ChoiceRenderer<String>("", ""), 10, false);



      // teams palette

      final Palette<String> teamsPalette = new Palette<String>("teams", new ListModel<String>(

            repositoryTeams), new CollectionModel<String>(GitBlit.self().getAllTeamnames()),

            new ChoiceRenderer<String>("", ""), 5, false);



      // federation sets palette

      List<String> sets = GitBlit.getStrings(Keys.federation.sets);

      final Palette<String> federationSetsPalette = new Palette<String>("federationSets",

            new ListModel<String>(federationSets), new CollectionModel<String>(sets),

            new ChoiceRenderer<String>("", ""), 5, false);



      // pre-receive palette

      if (!ArrayUtils.isEmpty(repositoryModel.preReceiveScripts)) {

         preReceiveScripts.addAll(repositoryModel.preReceiveScripts);

      }

      final Palette<String> preReceivePalette = new Palette<String>("preReceiveScripts",

            new ListModel<String>(preReceiveScripts), new CollectionModel<String>(GitBlit

                  .self().getPreReceiveScriptsUnused(repositoryModel)),

            new ChoiceRenderer<String>("", ""), 12, true);



      // post-receive palette

      if (!ArrayUtils.isEmpty(repositoryModel.postReceiveScripts)) {

         postReceiveScripts.addAll(repositoryModel.postReceiveScripts);

      }

      final Palette<String> postReceivePalette = new Palette<String>("postReceiveScripts",

            new ListModel<String>(postReceiveScripts), new CollectionModel<String>(GitBlit

                  .self().getPostReceiveScriptsUnused(repositoryModel)),

            new ChoiceRenderer<String>("", ""), 12, true);



      CompoundPropertyModel<RepositoryModel> model = new CompoundPropertyModel<RepositoryModel>(

            repositoryModel);

      Form<RepositoryModel> form = new Form<RepositoryModel>("editForm", model) {

@@ -104,21 +151,29 @@


               // automatically convert backslashes to forward slashes

               repositoryModel.name = repositoryModel.name.replace('\\', '/');

               // Automatically replace // with /

               repositoryModel.name = repositoryModel.name.replace("//", "/");



               // prohibit folder paths

               if (repositoryModel.name.startsWith("/")) {

                  error("Leading root folder references (/) are prohibited.");

                  return;

               }

               if (repositoryModel.name.startsWith("../")) {

                  error("Relative folder references (../) are prohibited.");

                  return;

               }

               if (repositoryModel.name.contains("/../")) {

                  error("Relative folder references (../) are prohibited.");

                  return;

               }



               // confirm valid characters in repository name

               char[] validChars = { '/', '.', '_', '-' };

               for (char c : repositoryModel.name.toCharArray()) {

                  if (!Character.isLetterOrDigit(c)) {

                     boolean ok = false;

                     for (char vc : validChars) {

                        ok |= c == vc;

                     }

                     if (!ok) {

                        error(MessageFormat.format(

                              "Illegal character ''{0}'' in repository name!", c));

                        return;

                     }

                  }

               Character c = StringUtils.findInvalidCharacter(repositoryModel.name);

               if (c != null) {

                  error(MessageFormat.format("Illegal character ''{0}'' in repository name!",

                        c));

                  return;

               }



               // confirm access restriction selection

@@ -127,11 +182,56 @@
                  return;

               }



               // save the repository

               GitBlit.self().editRepositoryModel(oldName, repositoryModel, isCreate);

               // confirm federation strategy selection

               if (repositoryModel.federationStrategy == null) {

                  error("Please select federation strategy!");

                  return;

               }



               // save the repository access list

               // save federation set preferences

               if (repositoryModel.federationStrategy.exceeds(FederationStrategy.EXCLUDE)) {

                  repositoryModel.federationSets.clear();

                  Iterator<String> sets = federationSetsPalette.getSelectedChoices();

                  while (sets.hasNext()) {

                     repositoryModel.federationSets.add(sets.next());

                  }

               }



               // set mailing lists

               String ml = mailingLists.getObject();

               if (!StringUtils.isEmpty(ml)) {

                  Set<String> list = new HashSet<String>();

                  for (String address : ml.split("(,|\\s)")) {

                     if (StringUtils.isEmpty(address)) {

                        continue;

                     }

                     list.add(address.toLowerCase());

                  }

                  repositoryModel.mailingLists = new ArrayList<String>(list);

               }



               // pre-receive scripts

               List<String> preReceiveScripts = new ArrayList<String>();

               Iterator<String> pres = preReceivePalette.getSelectedChoices();

               while (pres.hasNext()) {

                  preReceiveScripts.add(pres.next());

               }

               repositoryModel.preReceiveScripts = preReceiveScripts;



               // post-receive scripts

               List<String> postReceiveScripts = new ArrayList<String>();

               Iterator<String> post = postReceivePalette.getSelectedChoices();

               while (post.hasNext()) {

                  postReceiveScripts.add(post.next());

               }

               repositoryModel.postReceiveScripts = postReceiveScripts;



               // save the repository

               GitBlit.self().updateRepositoryModel(oldName, repositoryModel, isCreate);



               // repository access

               if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {

                  // save the user access list

                  Iterator<String> users = usersPalette.getSelectedChoices();

                  List<String> repositoryUsers = new ArrayList<String>();

                  while (users.hasNext()) {

@@ -143,6 +243,14 @@
                     repositoryUsers.add(repositoryModel.owner);

                  }

                  GitBlit.self().setRepositoryUsers(repositoryModel, repositoryUsers);



                  // save the team access list

                  Iterator<String> teams = teamsPalette.getSelectedChoices();

                  List<String> repositoryTeams = new ArrayList<String>();

                  while (teams.hasNext()) {

                     repositoryTeams.add(teams.next());

                  }

                  GitBlit.self().setRepositoryTeams(repositoryModel, repositoryTeams);

               }

            } catch (GitBlitException e) {

               error(e.getMessage());

@@ -161,10 +269,48 @@
      form.add(new DropDownChoice<AccessRestrictionType>("accessRestriction", Arrays

            .asList(AccessRestrictionType.values()), new AccessRestrictionRenderer()));

      form.add(new CheckBox("isFrozen"));

      // TODO enable origin definition

      form.add(new TextField<String>("origin").setEnabled(false/* isCreate */));



      // federation strategies - remove ORIGIN choice if this repository has

      // no origin.

      List<FederationStrategy> federationStrategies = new ArrayList<FederationStrategy>(

            Arrays.asList(FederationStrategy.values()));

      if (StringUtils.isEmpty(repositoryModel.origin)) {

         federationStrategies.remove(FederationStrategy.FEDERATE_ORIGIN);

      }

      form.add(new DropDownChoice<FederationStrategy>("federationStrategy", federationStrategies,

            new FederationTypeRenderer()));

      form.add(new CheckBox("useTickets"));

      form.add(new CheckBox("useDocs"));

      form.add(new CheckBox("showRemoteBranches"));

      form.add(new CheckBox("showReadme"));

      form.add(new CheckBox("skipSizeCalculation"));

      form.add(new CheckBox("skipSummaryMetrics"));

      mailingLists = new Model<String>(ArrayUtils.isEmpty(repositoryModel.mailingLists) ? ""

            : StringUtils.flattenStrings(repositoryModel.mailingLists, " "));

      form.add(new TextField<String>("mailingLists", mailingLists));

      form.add(usersPalette);

      form.add(teamsPalette);

      form.add(federationSetsPalette);

      form.add(preReceivePalette);

      form.add(new BulletListPanel("inheritedPreReceive", "inherited", GitBlit.self()

            .getPreReceiveScriptsInherited(repositoryModel)));

      form.add(postReceivePalette);

      form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()

            .getPostReceiveScriptsInherited(repositoryModel)));



      form.add(new Button("save"));

      Button cancel = new Button("cancel") {

         private static final long serialVersionUID = 1L;



         @Override

         public void onSubmit() {

            setResponsePage(RepositoriesPage.class);

         }

      };

      cancel.setDefaultFormProcessing(false);

      form.add(cancel);



      add(form);

   }

@@ -235,4 +381,25 @@
         return Integer.toString(index);

      }

   }



   private class FederationTypeRenderer implements IChoiceRenderer<FederationStrategy> {



      private static final long serialVersionUID = 1L;



      private final Map<FederationStrategy, String> map;



      public FederationTypeRenderer() {

         map = getFederationTypes();

      }



      @Override

      public String getDisplayValue(FederationStrategy type) {

         return map.get(type);

      }



      @Override

      public String getIdValue(FederationStrategy type, int index) {

         return Integer.toString(index);

      }

   }

}