Fixed bug in receive hook for repositories in subfolders

James Moger

2012-01-05 cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef

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

@@ -17,11 +17,13 @@


import java.text.MessageFormat;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Iterator;

import java.util.List;



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.Form;

@@ -37,13 +39,14 @@
import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.WicketUtils;



@RequiresAdminRole

public class EditUserPage extends BasePage {

public class EditUserPage extends RootSubPage {



   private final boolean isCreate;



@@ -65,10 +68,11 @@


   protected void setupPage(final UserModel userModel) {

      if (isCreate) {

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

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

      } else {

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

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

      }



      final Model<String> confirmPassword = new Model<String>(

            StringUtils.isEmpty(userModel.password) ? "" : userModel.password);

      CompoundPropertyModel<UserModel> model = new CompoundPropertyModel<UserModel>(userModel);

@@ -80,10 +84,19 @@
            repos.add(repo);

         }

      }

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

      for (TeamModel team : userModel.teams) {

         userTeams.add(team.name);

      }

      Collections.sort(userTeams);

		
      final String oldName = userModel.username;

      final Palette<String> repositories = new Palette<String>("repositories",

            new ListModel<String>(userModel.repositories), new CollectionModel<String>(repos),

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

            new ListModel<String>(new ArrayList<String>(userModel.repositories)),

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

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

            new ArrayList<String>(userTeams)), new CollectionModel<String>(GitBlit.self()

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

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



         private static final long serialVersionUID = 1L;

@@ -107,12 +120,15 @@
                  return;

               }

            }

            boolean rename = !StringUtils.isEmpty(oldName)

                  && !oldName.equalsIgnoreCase(username);

            if (!userModel.password.equals(confirmPassword.getObject())) {

               error("Passwords do not match!");

               return;

            }

            String password = userModel.password;

            if (!password.toUpperCase().startsWith(StringUtils.MD5_TYPE)) {

            if (!password.toUpperCase().startsWith(StringUtils.MD5_TYPE)

                  && !password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {

               // This is a plain text password.

               // Check length.

               int minLength = GitBlit.getInteger(Keys.realm.minPasswordLength, 5);

@@ -130,8 +146,17 @@
               String type = GitBlit.getString(Keys.realm.passwordStorage, "md5");

               if (type.equalsIgnoreCase("md5")) {

                  // store MD5 digest of password

                  userModel.password = StringUtils.MD5_TYPE + StringUtils.getMD5(userModel.password);

                  userModel.password = StringUtils.MD5_TYPE

                        + StringUtils.getMD5(userModel.password);

               } else if (type.equalsIgnoreCase("combined-md5")) {

                  // store MD5 digest of username+password

                  userModel.password = StringUtils.COMBINED_MD5_TYPE

                        + StringUtils.getMD5(username.toLowerCase() + userModel.password);

               }

            } else if (rename

                  && password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {

               error("Gitblit is configured for combined-md5 password hashing. You must enter a new password on account rename.");

               return;

            }



            Iterator<String> selectedRepositories = repositories.getSelectedChoices();

@@ -141,8 +166,19 @@
            }

            userModel.repositories.clear();

            userModel.repositories.addAll(repos);



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

            userModel.teams.clear();

            while (selectedTeams.hasNext()) {

               TeamModel team = GitBlit.self().getTeamModel(selectedTeams.next());

               if (team == null) {

                  continue;

               }

               userModel.teams.add(team);

            }



            try {

               GitBlit.self().editUserModel(oldName, userModel, isCreate);

               GitBlit.self().updateUserModel(oldName, userModel, isCreate);

            } catch (GitBlitException e) {

               error(e.getMessage());

               return;

@@ -154,8 +190,8 @@
                     userModel.username));

               setResponsePage(EditUserPage.class);

            } else {

               // back to home

               setResponsePage(RepositoriesPage.class);

               // back to users page

               setResponsePage(UsersPage.class);

            }

         }

      };

@@ -170,7 +206,22 @@
      confirmPasswordField.setResetPassword(false);

      form.add(confirmPasswordField);

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

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

      form.add(repositories);

      form.add(teams);



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

      Button cancel = new Button("cancel") {

         private static final long serialVersionUID = 1L;



         @Override

         public void onSubmit() {

            setResponsePage(UsersPage.class);

         }

      };

      cancel.setDefaultFormProcessing(false);

      form.add(cancel);



      add(form);

   }

}