James Moger
2012-10-18 13417cf9c6eec555b51da49742e47939d2f5715b
src/com/gitblit/wicket/pages/ChangePasswordPage.java
@@ -50,7 +50,13 @@
         // no authentication enabled
         throw new RestartResponseException(getApplication().getHomePage());
      }
      setupPage(getString("gb.changePassword"), GitBlitWebSession.get().getUser().username);
      if (!GitBlit.self().supportsCredentialChanges()) {
         error(MessageFormat.format(getString("gb.userServiceDoesNotPermitPasswordChanges"),
               GitBlit.getString(Keys.realm.userService, "users.conf")), true);
      }
      setupPage(getString("gb.changePassword"), GitBlitWebSession.get().getUsername());
      StatelessForm<Void> form = new StatelessForm<Void>("passwordForm") {
@@ -62,7 +68,7 @@
            String confirmPassword = ChangePasswordPage.this.confirmPassword.getObject();
            // ensure passwords match
            if (!password.equals(confirmPassword)) {
               error("Passwords do not match!");
               error(getString("gb.passwordsDoNotMatch"));
               return;
            }
@@ -72,19 +78,23 @@
               minLength = 4;
            }
            if (password.length() < minLength) {
               error(MessageFormat.format(
                     "Password is too short. Minimum length is {0} characters.", minLength));
               error(MessageFormat.format(getString("gb.passwordTooShort"), minLength));
               return;
            }
            UserModel user = GitBlitWebSession.get().getUser();
            // convert to MD5 digest, if appropriate
            String type = GitBlit.getString(Keys.realm.passwordStorage, "md5");
            if (type.equalsIgnoreCase("md5")) {
               // store MD5 digest of password
               password = StringUtils.MD5_TYPE + StringUtils.getMD5(password);
            } else if (type.equalsIgnoreCase("combined-md5")) {
               // store MD5 digest of username+password
               password = StringUtils.COMBINED_MD5_TYPE
                     + StringUtils.getMD5(user.username.toLowerCase() + password);
            }
            UserModel user = GitBlitWebSession.get().getUser();
            user.password = password;
            try {
               GitBlit.self().updateUserModel(user.username, user, false);
@@ -97,7 +107,7 @@
               return;
            }
            setRedirect(false);
            info("Password successfully changed.");
            info(getString("gb.passwordChanged"));
            setResponsePage(RepositoriesPage.class);
         }
      };
@@ -115,6 +125,8 @@
         @Override
         public void onSubmit() {
            setRedirect(false);
            error(getString("gb.passwordChangeAborted"));
            setResponsePage(RepositoriesPage.class);
         }
      };