The Unified and Autonomous Development Platform
Fix the issue that newly created user can not login
robin shined993c8d24eca
diff --git a/commons.shiro/src/main/java/com/gitplex/commons/shiro/AbstractUser.java b/commons.shiro/src/main/java/com/gitplex/commons/shiro/AbstractUser.javaindex 59f2db275f..ede98f6b9e 100644--- a/commons.shiro/src/main/java/com/gitplex/commons/shiro/AbstractUser.java+++ b/commons.shiro/src/main/java/com/gitplex/commons/shiro/AbstractUser.java@@ -5,7 +5,6 @@ import javax.persistence.MappedSuperclass;import org.apache.shiro.SecurityUtils;import org.apache.shiro.authc.AuthenticationInfo;-import org.apache.shiro.authc.credential.PasswordService;import org.apache.shiro.subject.PrincipalCollection;import org.apache.shiro.subject.SimplePrincipalCollection;import org.apache.shiro.subject.Subject;@@ -44,17 +43,14 @@ public abstract class AbstractUser extends AbstractEntity implements Authenticat}/**- * Set plain text password of this user.- * <p>- * The plain text password will be hashed via {@link PasswordService} before stored. Bind PasswordService to- * your own implementation via Guice if you'd like to change the default hash algorithm.+ * Set password of this user.** @param password- * plain text password to set+ * password to set*/public void setPassword(String password) {if (password != null) {- this.password = AppLoader.getInstance(PasswordService.class).encryptPassword(password);+ this.password = password;} else {this.password = null;}diff --git a/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java b/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.javaindex fb8bf8b09e..ac1ab28c86 100644--- a/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java+++ b/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java@@ -5,6 +5,7 @@ import java.util.Set;import javax.inject.Inject;import javax.inject.Singleton;+import org.apache.shiro.authc.credential.PasswordService;import org.hibernate.Interceptor;import org.hibernate.boot.Metadata;import org.hibernate.boot.model.naming.PhysicalNamingStrategy;@@ -29,14 +30,17 @@ public class ResetAdminPasswordCommand extends DefaultPersistManager {private final AccountManager accountManager;+ private final PasswordService passwordService;+@Injectpublic ResetAdminPasswordCommand(Set<ModelProvider> modelProviders,PhysicalNamingStrategy physicalNamingStrategy, HibernateProperties properties,Migrator migrator, Interceptor interceptor, IdManager idManager, Dao dao,- EntityValidator validator, AccountManager accountManager) {+ EntityValidator validator, AccountManager accountManager, PasswordService passwordService) {super(modelProviders, physicalNamingStrategy, properties, migrator, interceptor,idManager, dao, validator);this.accountManager = accountManager;+ this.passwordService = passwordService;}@Override@@ -61,7 +65,7 @@ public class ResetAdminPasswordCommand extends DefaultPersistManager {System.exit(1);}String password = Bootstrap.command.getArgs()[0];- root.setPassword(password);+ root.setPassword(passwordService.encryptPassword(password));accountManager.save(root);// wait for a short period to have embedded db flushing datadiff --git a/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.javaindex 5d77244ea7..d50e0f0ff0 100644--- a/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.java@@ -10,14 +10,12 @@ import javax.inject.Inject;import javax.inject.Singleton;import javax.validation.Validator;+import org.apache.shiro.authc.credential.PasswordService;import org.joda.time.DateTime;import org.joda.time.format.DateTimeFormat;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;-import com.google.common.base.Throwables;-import com.google.common.collect.Lists;-import com.google.common.collect.Sets;import com.gitplex.commons.bootstrap.Bootstrap;import com.gitplex.commons.bootstrap.BootstrapUtils;import com.gitplex.commons.hibernate.IdManager;@@ -44,6 +42,9 @@ import com.gitplex.server.core.setting.BackupSetting;import com.gitplex.server.core.setting.MailSetting;import com.gitplex.server.core.setting.SecuritySetting;import com.gitplex.server.core.setting.SystemSetting;+import com.google.common.base.Throwables;+import com.google.common.collect.Lists;+import com.google.common.collect.Sets;@Singletonpublic class DefaultDataManager implements DataManager, Serializable {@@ -64,13 +65,15 @@ public class DefaultDataManager implements DataManager, Serializable {private final MailManager mailManager;+ private final PasswordService passwordService;+private String backupTaskId;@Injectpublic DefaultDataManager(IdManager idManager, AccountManager accountManager,ConfigManager configManager, TaskScheduler taskScheduler,PersistManager persistManager, MailManager mailManager,- Validator validator) {+ Validator validator, PasswordService passwordService) {this.accountManager = accountManager;this.configManager = configManager;this.validator = validator;@@ -78,6 +81,7 @@ public class DefaultDataManager implements DataManager, Serializable {this.taskScheduler = taskScheduler;this.persistManager = persistManager;this.mailManager = mailManager;+ this.passwordService = passwordService;}@SuppressWarnings("serial")@@ -99,7 +103,9 @@ public class DefaultDataManager implements DataManager, Serializable {@Overridepublic void complete() {- accountManager.save((Account) getSetting(), null);+ Account account = (Account) getSetting();+ account.setPassword(passwordService.encryptPassword(account.getPassword()));+ accountManager.save(account, null);idManager.init(Account.class);}diff --git a/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.javaindex 773aabd62a..7f09c6fe90 100644--- a/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.java+++ b/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.java@@ -43,7 +43,7 @@ public class SymbolHit extends QueryHit {@Overridepublic String getScope() {- return symbol.getScope();+ return symbol.getNamespace();}@Overridediff --git a/server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.javaindex e30ce6a70e..bf2e47892a 100644--- a/server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java@@ -3,12 +3,14 @@ package com.gitplex.server.web.page.account.setting;import java.util.HashSet;import java.util.Set;+import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;+import com.gitplex.commons.loader.AppLoader;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.server.core.GitPlex;import com.gitplex.server.core.entity.Account;@@ -42,7 +44,7 @@ public class PasswordEditPage extends AccountSettingPage {@Overrideprotected void onSubmit() {super.onSubmit();- getAccount().setPassword(bean.getNewPassword());+ getAccount().setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(bean.getNewPassword()));GitPlex.getInstance(AccountManager.class).save(getAccount(), null);Session.get().success("Password has been changed");diff --git a/server.web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.javaindex 84274bef1b..74e0dda258 100644--- a/server.web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java@@ -1,8 +1,10 @@package com.gitplex.server.web.page.admin.account;+import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.Session;import org.apache.wicket.markup.html.form.Form;+import com.gitplex.commons.loader.AppLoader;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;@@ -40,6 +42,7 @@ public class NewUserPage extends AdministrationPage {.addError("This email has already been used by another account.");}if (!editor.hasErrors(true)){+ user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(user.getPassword()));accountManager.save(user, null);Session.get().success("New user account created");setResponsePage(UserListPage.class);diff --git a/server.web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java b/server.web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.javaindex b28b396336..31b01a617f 100644--- a/server.web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java@@ -4,6 +4,7 @@ import java.io.Serializable;import java.util.Arrays;import org.apache.commons.lang3.RandomStringUtils;+import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.head.CssHeaderItem;@@ -13,6 +14,7 @@ import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.gitplex.commons.loader.AppLoader;import com.gitplex.commons.wicket.behavior.testform.TestFormBehavior;import com.gitplex.commons.wicket.behavior.testform.TestResult;import com.gitplex.commons.wicket.editable.BeanContext;@@ -62,7 +64,7 @@ public class ForgetPage extends BasePage {ConfigManager configManager = GitPlex.getInstance(ConfigManager.class);if (configManager.getMailSetting() != null) {String password = RandomStringUtils.random(10, true, true);- user.setPassword(password);+ user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password));accountManager.save(user);MailManager mailManager = GitPlex.getInstance(MailManager.class);diff --git a/server.web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java b/server.web/src/main/java/com/gitplex/server/web/page/security/LoginPage.javaindex 5c6806b0e7..ecba117e51 100644--- a/server.web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java@@ -5,6 +5,7 @@ import java.util.Arrays;import org.apache.commons.lang3.RandomStringUtils;import org.apache.shiro.SecurityUtils;import org.apache.shiro.authc.AuthenticationException;+import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.RestartResponseException;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -17,6 +18,7 @@ import org.apache.wicket.model.IModel;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.gitplex.commons.loader.AppLoader;import com.gitplex.server.core.GitPlex;import com.gitplex.server.core.entity.Account;import com.gitplex.server.core.manager.AccountManager;@@ -67,7 +69,7 @@ public class LoginPage extends BasePage {+ "reset_admin_password command from GitPlex bin directory";} else {String password = RandomStringUtils.random(10, true, true);- user.setPassword(password);+ user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password));accountManager.save(user);ConfigManager configManager = GitPlex.getInstance(ConfigManager.class);