The Unified and Autonomous Development Platform
feat(auth): support SSO-only login
Chief Work Horsed58413ffe0c1
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 0b67c8e0f1..09e1e25cb0 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -88,6 +88,7 @@ import io.onedev.server.commandhandler.BackupDatabase;import io.onedev.server.commandhandler.CheckDataVersion;import io.onedev.server.commandhandler.CleanDatabase;import io.onedev.server.commandhandler.ResetAdminPassword;+import io.onedev.server.commandhandler.EnableInternalLogin;import io.onedev.server.commandhandler.RestoreDatabase;import io.onedev.server.commandhandler.Translate;import io.onedev.server.commandhandler.Upgrade;@@ -951,6 +952,8 @@ public class CoreModule extends AbstractPluginModule {return CleanDatabase.class;else if (ResetAdminPassword.COMMAND.equals(Bootstrap.command.getName()))return ResetAdminPassword.class;+ else if (EnableInternalLogin.COMMAND.equals(Bootstrap.command.getName()))+ return EnableInternalLogin.class;else if (Translate.COMMAND.equals(Bootstrap.command.getName()))return Translate.class;elsediff --git a/server-core/src/main/java/io/onedev/server/commandhandler/EnableInternalLogin.java b/server-core/src/main/java/io/onedev/server/commandhandler/EnableInternalLogin.javanew file mode 100644index 0000000000..76ee9692de--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/commandhandler/EnableInternalLogin.java@@ -0,0 +1,90 @@+package io.onedev.server.commandhandler;++import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;++import java.sql.SQLException;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.data.DataService;+import io.onedev.server.model.Setting.Key;+import io.onedev.server.model.support.administration.SecuritySetting;+import io.onedev.server.persistence.HibernateConfig;+import io.onedev.server.persistence.SessionFactoryService;+import io.onedev.server.persistence.TransactionService;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.SettingService;++@Singleton+public class EnableInternalLogin extends CommandHandler {++ public static final String COMMAND = "enable-internal-login";++ private static final Logger logger = LoggerFactory.getLogger(EnableInternalLogin.class);++ private final DataService dataService;++ private final SessionFactoryService sessionFactoryService;++ private final SettingService settingService;++ private final TransactionService transactionService;++ @Inject+ public EnableInternalLogin(HibernateConfig hibernateConfig, DataService dataService,+ SessionFactoryService sessionFactoryService, SettingService settingService,+ TransactionService transactionService) {+ super(hibernateConfig);+ this.dataService = dataService;+ this.sessionFactoryService = sessionFactoryService;+ this.settingService = settingService;+ this.transactionService = transactionService;+ }++ @Override+ public void start() {+ SecurityUtils.bindAsSystem();++ try {+ doMaintenance(() -> {+ sessionFactoryService.start();++ try (var conn = dataService.openConnection()) {+ callWithTransaction(conn, () -> {+ dataService.checkDataVersion(conn, false);+ return null;+ });+ } catch (SQLException e) {+ throw new RuntimeException(e);+ }++ transactionService.run(() -> {+ var setting = settingService.findSetting(Key.SECURITY);+ if (setting == null || setting.getValue() == null)+ throw new ExplicitException("Server not set up yet");+ var securitySetting = (SecuritySetting) setting.getValue();+ securitySetting.setDisableInternalLogin(false);+ setting.setValue(securitySetting);+ });++ logger.info("Internal login form has been enabled");+ return null;+ });+ System.exit(0);+ } catch (ExplicitException e) {+ logger.error(e.getMessage());+ System.exit(1);+ }+ }++ @Override+ public void stop() {+ sessionFactoryService.stop();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 6855c1bd57..f75d114a71 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -9251,7 +9251,11 @@ public class DataMigrator {} else if (file.getName().startsWith("Settings.xml")) {var dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {- if (element.elementTextTrim("key").equals("SYSTEM")) {+ if (element.elementTextTrim("key").equals("SECURITY")) {+ Element valueElement = element.element("value");+ if (valueElement != null)+ valueElement.addElement("disableInternalLogin").setText("false");+ } else if (element.elementTextTrim("key").equals("SYSTEM")) {Element valueElement = element.element("value");if (valueElement != null) {valueElement.addElement("noreplyEmailDomain")diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.javaindex 686d8c24ce..1f75a7a454 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java@@ -27,6 +27,8 @@ public class SecuritySetting implements Serializable {private static final Logger logger = LoggerFactory.getLogger(SecuritySetting.class);private boolean enableAnonymousAccess = false;++ private boolean disableInternalLogin;private boolean enableSelfRegister = true;@@ -51,6 +53,15 @@ public class SecuritySetting implements Serializable {this.enableAnonymousAccess = enableAnonymousAccess;}+ @Editable(order=150, description="Whether or not to disable the internal password login form when SSO providers are configured")+ public boolean isDisableInternalLogin() {+ return disableInternalLogin;+ }++ public void setDisableInternalLogin(boolean disableInternalLogin) {+ this.disableInternalLogin = disableInternalLogin;+ }+@Editable(order=200, name="Enable Account Self Sign-Up", description="User can sign up if this option is enabled")public boolean isEnableSelfRegister() {return enableSelfRegister;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.javaindex 1b7c538534..fe17279c17 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@@ -32,6 +32,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.request.flow.RedirectToUrlException;import io.onedev.server.model.SsoProvider;import io.onedev.server.model.User;@@ -94,6 +95,16 @@ public class LoginPage extends SimplePage {// replace session to avoid session fixation attackgetSession().replaceSession();++ String serverUrl = settingService.getSystemSetting().getServerUrl();+ var ssoProviders = ssoProviderService.query();+ boolean disableInternalLogin = settingService.getSecuritySetting().isDisableInternalLogin()+ && !ssoProviders.isEmpty();+ if (disableInternalLogin && ssoProviders.size() == 1) {+ var provider = ssoProviders.iterator().next();+ throw new RedirectToUrlException(serverUrl + "/" + MOUNT_PATH + "/" + STAGE_INITIATE+ + "/" + provider.getName());+ }Fragment fragment = new Fragment("content", "passwordCheckFrag", this);@@ -185,15 +196,12 @@ public class LoginPage extends SimplePage {}));form.add(new ViewStateAwarePageLink<Void>("forgetPassword", PasswordResetPage.class));- fragment.add(form);+ fragment.add(form.setVisible(!disableInternalLogin));boolean enableSelfRegister = settingService.getSecuritySetting().isEnableSelfRegister();fragment.add(new ViewStateAwarePageLink<Void>("registerUser", SignUpPage.class).setVisible(enableSelfRegister));- String serverUrl = settingService.getSystemSetting().getServerUrl();-RepeatingView ssoButtonsView = new RepeatingView("ssoButtons");- var ssoProviders = ssoProviderService.query();for (SsoProvider provider: ssoProviders) {ExternalLink ssoButton = new ExternalLink(ssoButtonsView.newChildId(),Model.of(serverUrl + "/" + MOUNT_PATH + "/" + STAGE_INITIATE + "/" + provider.getName()));