James Moger
2011-05-24 56c549e384b1a648c77bbd09a2cc77976e8a64de
src/com/gitblit/wicket/pages/EditUserPage.java
@@ -1,5 +1,6 @@
package com.gitblit.wicket.pages;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -66,13 +67,31 @@
            repos.add(repo);
         }
      }
      final String oldName = userModel.getUsername();
      final Palette<String> repositories = new Palette<String>("repositories", new ListModel<String>(userModel.getRepositories()), new CollectionModel<String>(repos), new ChoiceRenderer<String>("", ""), 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
         protected void onSubmit() {
            String username = userModel.getUsername();
            if (StringUtils.isEmpty(username)) {
               error("Please enter a username!");
               return;
            }
            if (isCreate) {
               UserModel model = GitBlit.self().getUserModel(username);
               if (model != null) {
                  error(MessageFormat.format("Username ''{0}'' is unavailable.", username));
                  return;
               }
            }
            if (!userModel.getPassword().equals(confirmPassword.getObject())) {
               error("Passwords do not match!");
               return;
@@ -80,14 +99,21 @@
            String password = userModel.getPassword();
            if (!password.toUpperCase().startsWith(Crypt.__TYPE) && !password.toUpperCase().startsWith(MD5.__TYPE)) {
               // This is a plain text password.
               // Optionally encrypt/obfuscate the password.
               // Check length.
               int minLength = GitBlit.self().settings().getInteger(Keys.realm.minPasswordLength, 5);
               if (minLength < 4) {
                  minLength = 4;
               }
               if (password.trim().length() < minLength) {
                  error(MessageFormat.format("Password is too short. Minimum length is {0} characters.", minLength));
                  return;
               }
               // Optionally store the password MD5 digest.
               String type = GitBlit.self().settings().getString(Keys.realm.passwordStorage, "md5");
               if (type.equalsIgnoreCase("md5")) {
                  // store MD5 checksum of password
                  // store MD5 digest of password
                  userModel.setPassword(MD5.digest(userModel.getPassword()));
               } else if (type.equalsIgnoreCase("crypt")) {
                  // simple unix encryption
                  userModel.setPassword(Crypt.crypt(userModel.getUsername(), userModel.getPassword()));
               }
            }
@@ -98,14 +124,15 @@
            }
            userModel.setRepositories(repos);
            try {
               GitBlit.self().editUserModel(userModel, isCreate);
               GitBlit.self().editUserModel(oldName, userModel, isCreate);
            } catch (GitBlitException e) {
               error(e.getMessage());
               return;
            }
            setRedirect(true);
            setRedirect(false);
            if (isCreate) {
               // create another user
               info(MessageFormat.format("New user ''{0}'' successfully created.", userModel.getUsername()));
               setResponsePage(EditUserPage.class);
            } else {
               // back to home
@@ -115,7 +142,7 @@
      };
      // field names reflective match UserModel fields
      form.add(new TextField<String>("username").setEnabled(isCreate));
      form.add(new TextField<String>("username"));
      PasswordTextField passwordField = new PasswordTextField("password");
      passwordField.setResetPassword(false);
      form.add(passwordField);