Skip to content

The Unified and Autonomous Development Platform

fix issue #43: Unable to restore database with SQLServer connector

Robin Shen071123ea7663
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index d6bbd97fa5..724bceb8ca 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -7,21 +7,17 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.apache.shiro.authc.credential.PasswordService;
import org.eclipse.jgit.lib.PersonIdent;
import org.hibernate.ReplicationMode;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
-import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ListenerRegistry;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.entity.EntityPersisted;
-import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.BranchProtection;
@@ -37,8 +33,6 @@ import io.onedev.server.util.Usage;
@Singleton
public class DefaultUserManager extends AbstractEntityManager<User> implements UserManager {
- private final PasswordService passwordService;
-
private final ProjectManager projectManager;
private final SettingManager settingManager;
@@ -49,10 +43,9 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
@Inject
public DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,
- IssueFieldManager issueFieldManager, PasswordService passwordService, ListenerRegistry listenerRegistry) {
+ IssueFieldManager issueFieldManager, ListenerRegistry listenerRegistry) {
super(dao);
- this.passwordService = passwordService;
this.projectManager = projectManager;
this.settingManager = settingManager;
this.issueFieldManager = issueFieldManager;
@@ -248,18 +241,6 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
return findByEmail(person.getEmailAddress());
}
- @Listen
- public void on(SystemStarted event) {
- for (User user: query()) {
- // Fix a critical issue that password of self-registered users are not hashed
- if (StringUtils.isNotBlank(user.getPassword()) && !user.getPassword().startsWith("$2a$10")
- && !user.getPassword().startsWith("@hash^prefix@")) {
- user.setPassword(passwordService.encryptPassword(user.getPassword()));
- save(user);
- }
- }
- }
-
@Override
public List<User> queryAndSort(Collection<User> topUsers) {
List<User> users = query();
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 57e27ea758..9c5e2bade6 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -114,8 +114,7 @@ public class DefaultDataManager implements DataManager, Serializable {
administrator = new User();
administrator.setId(User.ROOT_ID);
Set<String> excludedProperties = Sets.newHashSet("administrator", "canCreateProjects");
- manualConfigs.add(new ManualConfig("Create Administrator Account", null,
- administrator, excludedProperties) {
+ manualConfigs.add(new ManualConfig("Create Administrator Account", null, administrator, excludedProperties) {
@Override
public Skippable getSkippable() {
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 3f54ba19ce..90cee052ed 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -1520,6 +1520,11 @@ public class DataMigrator {
for (Element buildPreservationElement: buildSettingElement.element("buildPreservations").elements())
buildPreservationElement.setName("io.onedev.server.model.support.build.BuildPreservation");
buildSettingElement.addElement("actionAuthorizations");
+ Element passwordElement = element.element("password");
+ if (passwordElement == null)
+ element.addElement("password").setText("external_managed");
+ else if (StringUtils.isBlank(passwordElement.getText()))
+ passwordElement.setText("external_managed");
}
dom.writeToFile(file, false);
} else if (file.getName().startsWith("BuildQuerySettings.xml")) {
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index f2f6b7f277..c2659fb444 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -57,6 +57,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public static final Long ROOT_ID = 1L;
+ public static final String EXTERNAL_MANAGED = "external_managed";
+
private static ThreadLocal<Stack<User>> stack = new ThreadLocal<Stack<User>>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
index a69e1e9a7c..cd3332d2c4 100644
--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
@@ -31,7 +31,6 @@ import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.MembershipManager;
@@ -201,7 +200,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
if (user != null && user.isRoot())
return user;
- if (user == null || StringUtils.isBlank(user.getPassword())) {
+ if (user == null || user.getPassword().equals(User.EXTERNAL_MANAGED)) {
Authenticator authenticator = settingManager.getAuthenticator();
if (authenticator != null) {
Authenticated authenticated;
@@ -254,7 +253,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
} else {
user = new User();
user.setName(((UsernamePasswordToken) token).getUsername());
- user.setPassword("");
+ user.setPassword(User.EXTERNAL_MANAGED);
if (authenticated.getEmail() != null)
user.setEmail(authenticated.getEmail());
if (authenticated.getFullName() != null)
diff --git a/server-core/src/main/java/io/onedev/server/security/OnePasswordService.java b/server-core/src/main/java/io/onedev/server/security/OnePasswordService.java
index 3874022c06..3444948687 100644
--- a/server-core/src/main/java/io/onedev/server/security/OnePasswordService.java
+++ b/server-core/src/main/java/io/onedev/server/security/OnePasswordService.java
@@ -6,7 +6,7 @@ import org.apache.shiro.authc.credential.PasswordService;
import com.pmease.security.shiro.bcrypt.BCryptPasswordService;
-import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.model.User;
@Singleton
public class OnePasswordService implements PasswordService {
@@ -20,7 +20,7 @@ public class OnePasswordService implements PasswordService {
@Override
public boolean passwordsMatch(Object submittedPlaintext, String encrypted) {
- if (StringUtils.isNotBlank(encrypted))
+ if (!User.EXTERNAL_MANAGED.equals(encrypted))
return bcryptPasswordService.passwordsMatch(submittedPlaintext, encrypted);
else
return true;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
index 14cdad33fd..8acba49d82 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
@@ -1,13 +1,9 @@
package io.onedev.server.web.page.security;
-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.IncorrectCredentialsException;
import org.apache.shiro.authc.UnknownAccountException;
-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,16 +13,10 @@ import org.apache.wicket.markup.html.form.StatelessForm;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.User;
-import io.onedev.server.notification.MailManager;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.base.BasePage;
@@ -34,8 +24,6 @@ import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
public class LoginPage extends BasePage {
- private static final Logger logger = LoggerFactory.getLogger(LoginPage.class);
-
private String userName;
private String password;
@@ -59,69 +47,16 @@ public class LoginPage extends BasePage {
@Override
protected void onSubmit() {
super.onSubmit();
-
- String feedback = null;
-
- UserManager userManager = OneDev.getInstance(UserManager.class);
- if (userName != null) {
- User user = userManager.findByName(userName);
- if (user != null && user.getPassword() != null && user.getPassword().startsWith("@hash^prefix@")) {
- String hashAlgorithmChangeMessage = "OneDev password hash algorithm has been changed for security reason.";
- if (user.isRoot()) {
- feedback = hashAlgorithmChangeMessage + " Please reset administrator password by running "
- + "reset_admin_password command from OneDev bin directory";
- } else {
- String password = RandomStringUtils.random(10, true, true);
- user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password));
- userManager.save(user);
-
- SettingManager configManager = OneDev.getInstance(SettingManager.class);
- if (configManager.getMailSetting() != null) {
-
- MailManager mailManager = OneDev.getInstance(MailManager.class);
- try {
- String mailBody = String.format("Dear %s, "
- + "<p style='margin: 16px 0;'>"
- + hashAlgorithmChangeMessage
- + " As a result of this, password of your user \"%s\" has been reset to:<br>"
- + "%s<br><br>"
- + "-- Sent by OneDev",
- user.getDisplayName(), user.getName(), password);
-
- mailManager.sendMail(configManager.getMailSetting(), Arrays.asList(user.getEmail()),
- "Your OneDev password has been reset", mailBody);
- feedback = hashAlgorithmChangeMessage
- + " As a result of this, password of your user has been reset and sent to "
- + "address " + user.getEmail();
- } catch (Exception e) {
- logger.error("Error sending password reset email", e);
- feedback = hashAlgorithmChangeMessage
- + " Since the reset password can not be been sent to your mail box "
- + "due to mail error (check server log for details). Please "
- + "contact OneDev administrator to reset your password manually";
- }
- } else {
- feedback = hashAlgorithmChangeMessage
- + " The reset password can not be sent as mail setting is not defined. "
- + "Please contact OneDev administrator to reset your password manually";
- }
- }
- }
- }
- if (feedback != null) {
- error(feedback);
- } else {
- try {
- WebSession.get().login(userName, password, rememberMe);
- continueToOriginalDestination();
- setResponsePage(getApplication().getHomePage());
- } catch (IncorrectCredentialsException e) {
- error("Incorrect credentials");
- } catch (UnknownAccountException e) {
- error("Unknown user name");
- } catch (AuthenticationException ae) {
- error(ae.getMessage());
- }
+ try {
+ WebSession.get().login(userName, password, rememberMe);
+ continueToOriginalDestination();
+ setResponsePage(getApplication().getHomePage());
+ } catch (IncorrectCredentialsException e) {
+ error("Incorrect credentials");
+ } catch (UnknownAccountException e) {
+ error("Unknown user name");
+ } catch (AuthenticationException ae) {
+ error(ae.getMessage());
}
}