Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

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

@@ -27,7 +27,6 @@
import org.apache.wicket.markup.html.form.Button;

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

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

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

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

import org.apache.wicket.model.CompoundPropertyModel;

import org.apache.wicket.model.Model;

@@ -35,13 +34,14 @@
import org.apache.wicket.model.util.ListModel;



import com.gitblit.Constants.RegistrantType;

import com.gitblit.GitBlit;

import com.gitblit.Constants.Role;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.NonTrimmedPasswordTextField;

import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

@@ -51,14 +51,10 @@
public class EditUserPage extends RootSubPage {



   private final boolean isCreate;

	


   public EditUserPage() {

      // create constructor

      super();

      if (!GitBlit.self().supportsAddUser()) {

         error(MessageFormat.format(getString("gb.userServiceDoesNotPermitAddUser"),

               GitBlit.getString(Keys.realm.userService, "${baseFolder}/users.conf")), true);

      }

      isCreate = true;

      setupPage(new UserModel(""));

      setStatelessHint(false);

@@ -70,17 +66,17 @@
      super(params);

      isCreate = false;

      String name = WicketUtils.getUsername(params);

      UserModel model = GitBlit.self().getUserModel(name);

      UserModel model = app().users().getUserModel(name);

      setupPage(model);

      setStatelessHint(false);

      setOutputMarkupId(true);

   }

	


   @Override

   protected boolean requiresPageMap() {

      return true;

   }

	


   @Override

   protected Class<? extends BasePage> getRootNavPageClass() {

      return UsersPage.class;

@@ -99,26 +95,26 @@


      // build list of projects including all repositories wildcards

      List<String> repos = getAccessRestrictedRepositoryList(true, userModel);

		


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

      for (TeamModel team : userModel.teams) {

         userTeams.add(team.name);

      }

      Collections.sort(userTeams);

		


      final String oldName = userModel.username;

      final List<RegistrantAccessPermission> permissions = GitBlit.self().getUserAccessPermissions(userModel);

      final List<RegistrantAccessPermission> permissions = app().repositories().getUserAccessPermissions(userModel);



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

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

            .getAllTeamnames()), new StringChoiceRenderer(), 10, false);

            new ArrayList<String>(userTeams)), new CollectionModel<String>(app().users()

            .getAllTeamNames()), new StringChoiceRenderer(), 10, false);

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



         private static final long serialVersionUID = 1L;

			


         /*

          * (non-Javadoc)

          * 
          *

          * @see org.apache.wicket.markup.html.form.Form#onSubmit()

          */

         @Override

@@ -131,7 +127,7 @@
            userModel.username = userModel.username.toLowerCase();

            String username = userModel.username;

            if (isCreate) {

               UserModel model = GitBlit.self().getUserModel(username);

               UserModel model = app().users().getUserModel(username);

               if (model != null) {

                  error(MessageFormat.format(getString("gb.usernameUnavailable"), username));

                  return;

@@ -139,7 +135,7 @@
            }

            boolean rename = !StringUtils.isEmpty(oldName)

                  && !oldName.equalsIgnoreCase(username);

            if (GitBlit.self().supportsCredentialChanges(userModel)) {

            if (app().authentication().supportsCredentialChanges(userModel)) {

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

                  error(getString("gb.passwordsDoNotMatch"));

                  return;

@@ -149,7 +145,7 @@
                     && !password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {

                  // This is a plain text password.

                  // Check length.

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

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

                  if (minLength < 4) {

                     minLength = 4;

                  }

@@ -158,9 +154,12 @@
                           minLength));

                     return;

                  }

	


                  // change the cookie

                  userModel.cookie = StringUtils.getSHA1(userModel.username + password);



                  // Optionally store the password MD5 digest.

                  String type = GitBlit.getString(Keys.realm.passwordStorage, "md5");

                  String type = app().settings().getString(Keys.realm.passwordStorage, "md5");

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

                     // store MD5 digest of password

                     userModel.password = StringUtils.MD5_TYPE

@@ -179,21 +178,27 @@


            // update user permissions

            for (RegistrantAccessPermission repositoryPermission : permissions) {

               userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);

               if (repositoryPermission.mutable) {

                  userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);

               }

            }



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

            userModel.teams.clear();

            while (selectedTeams.hasNext()) {

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

               TeamModel team = app().users().getTeamModel(selectedTeams.next());

               if (team == null) {

                  continue;

               }

               userModel.teams.add(team);

            }



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

            try {

               if (isCreate) {

                  app().gitblit().addUser(userModel);

               } else {

                  app().gitblit().reviseUser(oldName, userModel);

               }

            } catch (GitBlitException e) {

               error(e.getMessage());

               return;

@@ -210,37 +215,71 @@
            }

         }

      };

		


      // do not let the browser pre-populate these fields

      form.add(new SimpleAttributeModifier("autocomplete", "off"));

		
      // not all user services support manipulating username and password

      boolean editCredentials = GitBlit.self().supportsCredentialChanges(userModel);

		
      // not all user services support manipulating display name

      boolean editDisplayName = GitBlit.self().supportsDisplayNameChanges(userModel);



      // not all user services support manipulating email address

      boolean editEmailAddress = GitBlit.self().supportsEmailAddressChanges(userModel);

      // not all user providers support manipulating username and password

      boolean editCredentials = app().authentication().supportsCredentialChanges(userModel);



      // not all user services support manipulating team memberships

      boolean editTeams = GitBlit.self().supportsTeamMembershipChanges(userModel);

      // not all user providers support manipulating display name

      boolean editDisplayName = app().authentication().supportsDisplayNameChanges(userModel);



      // not all user providers support manipulating email address

      boolean editEmailAddress = app().authentication().supportsEmailAddressChanges(userModel);



      // not all user providers support manipulating team memberships

      boolean editTeams = app().authentication().supportsTeamMembershipChanges(userModel);



      // not all user providers support manipulating the admin role

      boolean changeAdminRole = app().authentication().supportsRoleChanges(userModel, Role.ADMIN);



      // not all user providers support manipulating the create role

      boolean changeCreateRole = app().authentication().supportsRoleChanges(userModel, Role.CREATE);



      // not all user providers support manipulating the fork role

      boolean changeForkRole = app().authentication().supportsRoleChanges(userModel, Role.FORK);



      // field names reflective match UserModel fields

      form.add(new TextField<String>("username").setEnabled(editCredentials));

      PasswordTextField passwordField = new PasswordTextField("password");

      NonTrimmedPasswordTextField passwordField = new NonTrimmedPasswordTextField("password");

      passwordField.setResetPassword(false);

      form.add(passwordField.setEnabled(editCredentials));

      PasswordTextField confirmPasswordField = new PasswordTextField("confirmPassword",

      NonTrimmedPasswordTextField confirmPasswordField = new NonTrimmedPasswordTextField("confirmPassword",

            confirmPassword);

      confirmPasswordField.setResetPassword(false);

      form.add(confirmPasswordField.setEnabled(editCredentials));

      form.add(new TextField<String>("displayName").setEnabled(editDisplayName));

      form.add(new TextField<String>("emailAddress").setEnabled(editEmailAddress));

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

      form.add(new CheckBox("canFork").setEnabled(GitBlit.getBoolean(Keys.web.allowForking, true)));

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



      if (userModel.canAdmin() && !userModel.canAdmin) {

         // user inherits Admin permission

         // display a disabled-yet-checked checkbox

         form.add(new CheckBox("canAdmin", Model.of(true)).setEnabled(false));

      } else {

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

      }



      if (userModel.canFork() && !userModel.canFork) {

         // user inherits Fork permission

         // display a disabled-yet-checked checkbox

         form.add(new CheckBox("canFork", Model.of(true)).setEnabled(false));

      } else {

         final boolean forkingAllowed = app().settings().getBoolean(Keys.web.allowForking, true);

         form.add(new CheckBox("canFork").setEnabled(forkingAllowed && changeForkRole));

      }



      if (userModel.canCreate() && !userModel.canCreate) {

         // user inherits Create permission

         // display a disabled-yet-checked checkbox

         form.add(new CheckBox("canCreate", Model.of(true)).setEnabled(false));

      } else {

         form.add(new CheckBox("canCreate").setEnabled(changeCreateRole));

      }



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

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



      form.add(new RegistrantPermissionsPanel("repositories",   RegistrantType.REPOSITORY, repos, permissions, getAccessPermissions()));

      form.add(teams.setEnabled(editTeams));