Skip to content

The Unified and Autonomous Development Platform

chore: update dependencies and enhance security settings

Robin Shenbe6ca5b996fb
diff --git a/pom.xml b/pom.xml
index 5cc0d054f7..62e478eb08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<plugin>
<groupId>io.onedev</groupId>
<artifactId>plugin-maven</artifactId>
- <version>2.7.0</version>
+ <version>2.8.0</version>
<executions>
<execution>
<?m2e execute onConfiguration,onIncremental?>
@@ -681,8 +681,8 @@
</repository>
</repositories>
<properties>
- <commons.version>4.1.1</commons.version>
- <agent.version>3.2.0</agent.version>
+ <commons.version>4.1.2</commons.version>
+ <agent.version>3.2.1</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
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.java
index 1f75a7a454..3114c6c9bb 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
@@ -7,6 +7,7 @@ import java.util.List;
import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotNull;
+import io.onedev.server.annotation.ShowCondition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,6 +17,7 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.GroupChoice;
import io.onedev.server.annotation.Patterns;
import io.onedev.server.service.GroupService;
+import io.onedev.server.service.SsoProviderService;
import io.onedev.server.model.Group;
import io.onedev.server.util.usage.Usage;
@@ -53,7 +55,11 @@ 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")
+ @Editable(order=150, description="""
+ Whether or not to disable the internal password login form and use SSO login only.
+ <b class="text-info">TIPS:</b> If you are locked out, internal login can be re-enabled from command
+ line by running <code>bin/enable-internal-login</code>""")
+ @ShowCondition("hasSSOProviders")
public boolean isDisableInternalLogin() {
return disableInternalLogin;
}
@@ -62,6 +68,11 @@ public class SecuritySetting implements Serializable {
this.disableInternalLogin = disableInternalLogin;
}
+ @SuppressWarnings("unused")
+ private static boolean hasSSOProviders() {
+ return OneDev.getInstance(SsoProviderService.class).count() > 0;
+ }
+
@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/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index efecbff1a6..e446aee174 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -52,76 +52,10 @@
<a wicket:id="showCommandPalette" class="topbar-link command-palette"></a>
<a wicket:id="languageSelector" t:data-tippy-content="Language" class="topbar-link language-selector"><wicket:svg href="globe" class="icon"></wicket:svg></a>
<a wicket:id="signIn" class="topbar-link sign-in"><wicket:svg href="login" class="icon"/> <span class="d-none d-sm-inline"><wicket:t>Sign In</wicket:t></span></a>
- <div wicket:id="userInfo" class="dropdown user-info">
- <a href="#" class="dropdown-toggle user-info no-dropdown-caret topbar-link" data-toggle="dropdown">
- <img wicket:id="avatar">
- <span wicket:id="name" class="ml-1 d-none d-lg-inline"></span>
- </a>
- <div class="dropdown-menu">
- <wicket:enclosure child="hasUnverifiedLink">
- <div class="mx-3 my-2 alert alert-light-warning">
- <wicket:t>You have unverified <a wicket:id="hasUnverifiedLink">email addresses</a></wicket:t>
- </div>
- </wicket:enclosure>
- <wicket:enclosure child="noPrimaryAddressLink">
- <div class="mx-3 my-2 alert alert-light-warning">
- <wicket:t>Primary <a wicket:id="noPrimaryAddressLink">email address</a> not specified</wicket:t>
- </div>
- </wicket:enclosure>
- <a wicket:id="myProfile" class="dropdown-item">
- <wicket:svg href="profile" class="icon mr-2"></wicket:svg>
- <wicket:t>Profile</wicket:t>
- </a>
- <a wicket:id="myBasicSetting" class="dropdown-item">
- <wicket:svg href="info" class="icon mr-2"></wicket:svg>
- <wicket:t>Basic Settings</wicket:t>
- </a>
- <a wicket:id="myEmailSetting" class="dropdown-item">
- <wicket:svg href="mail" class="icon mr-2"></wicket:svg>
- <wicket:t>Email Addresses</wicket:t>
- </a>
- <a wicket:id="myAvatar" class="dropdown-item">
- <wicket:svg href="avatar" class="icon mr-2"></wicket:svg>
- <wicket:t>Edit Avatar</wicket:t>
- </a>
- <a wicket:id="myPassword" class="dropdown-item">
- <wicket:svg href="password" class="icon mr-2"></wicket:svg>
- <wicket:t>Password</wicket:t>
- </a>
- <a wicket:id="myAISetting" class="dropdown-item">
- <wicket:svg href="ai-setting" class="icon mr-2"></wicket:svg>
- <wicket:t>AI Settings</wicket:t>
- </a>
- <a wicket:id="mySshKeys" class="dropdown-item">
- <wicket:svg href="key" class="icon mr-2"></wicket:svg>
- <wicket:t>SSH Keys</wicket:t>
- </a>
- <a wicket:id="myGpgKeys" class="dropdown-item">
- <wicket:svg href="key" class="icon mr-2"></wicket:svg>
- <wicket:t>GPG Keys</wicket:t>
- </a>
- <a wicket:id="myAccessTokens" class="dropdown-item">
- <wicket:svg href="token" class="icon mr-2"></wicket:svg>
- <wicket:t>Access Tokens</wicket:t>
- </a>
- <a wicket:id="myTwoFactorAuthentication" class="dropdown-item">
- <wicket:svg href="shield" class="icon mr-2"></wicket:svg>
- <wicket:t>Two-factor Authentication</wicket:t>
- </a>
- <a wicket:id="mySsoAccounts" class="dropdown-item">
- <wicket:svg href="user" class="icon mr-2"></wicket:svg>
- <wicket:t>SSO Accounts</wicket:t>
- </a>
- <a wicket:id="myWorkspaceData" class="dropdown-item">
- <wicket:svg href="workspace" class="icon mr-2"></wicket:svg>
- <wicket:t>Workspace Data</wicket:t>
- </a>
- <a wicket:id="signOut" class="dropdown-item">
- <wicket:svg href="logout" class="icon mr-2"></wicket:svg>
- <span wicket:id="label"></span>
- </a>
- </div>
- </div>
+ <a wicket:id="userInfo" class="user-info topbar-link">
+ <img wicket:id="avatar">
+ <span wicket:id="name" class="ml-1 d-none d-lg-inline"></span>
+ </a>
</div>
</div>
<div class="main autofit d-flex flex-column resize-aware">
@@ -147,6 +81,19 @@
<div wicket:id="subMenu" class="menu-body"></div>
</div>
</wicket:fragment>
+ <wicket:fragment wicket:id="userMenuFrag">
+ <wicket:enclosure child="hasUnverifiedLink">
+ <div class="mx-3 my-2 alert alert-light-warning">
+ <wicket:t>You have unverified <a wicket:id="hasUnverifiedLink">email addresses</a></wicket:t>
+ </div>
+ </wicket:enclosure>
+ <wicket:enclosure child="noPrimaryAddressLink">
+ <div class="mx-3 my-2 alert alert-light-warning">
+ <wicket:t>Primary <a wicket:id="noPrimaryAddressLink">email address</a> not specified</wicket:t>
+ </div>
+ </wicket:enclosure>
+ <div wicket:id="items"></div>
+ </wicket:fragment>
<wicket:fragment wicket:id="alertsFrag">
<div class="alerts">
<div class="text-center font-size-h6 border-bottom bg-light px-3 py-2 mb-2"><wicket:t>Alerts</wicket:t></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 570b262193..cbbe2a9dd5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -22,6 +22,7 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.Component;
+import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.Session;
@@ -74,6 +75,7 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.AlertService;
import io.onedev.server.service.SettingService;
+import io.onedev.server.service.SsoProviderService;
import io.onedev.server.updatecheck.UpdateCheckService;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
@@ -83,6 +85,7 @@ import io.onedev.server.web.component.ai.chat.ChatPanel;
import io.onedev.server.web.component.brandlogo.BrandLogoPanel;
import io.onedev.server.web.component.commandpalette.CommandPalettePanel;
import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -1104,154 +1107,131 @@ public abstract class LayoutPage extends BasePage {
});
- WebMarkupContainer userInfo = new WebMarkupContainer("userInfo");
- if (loginUser != null) {
- userInfo.add(new UserAvatar("avatar", loginUser));
- userInfo.add(new Label("name", loginUser.getDisplayName()));
- if (loginUser.getType() != ORDINARY || loginUser.isDisabled()) {
- userInfo.add(new WebMarkupContainer("hasUnverifiedLink").setVisible(false));
- userInfo.add(new WebMarkupContainer("noPrimaryAddressLink").setVisible(false));
- } else if (loginUser.getEmailAddresses().isEmpty()) {
- userInfo.add(new WebMarkupContainer("hasUnverifiedLink").setVisible(false));
- userInfo.add(new ViewStateAwarePageLink<Void>("noPrimaryAddressLink", MyEmailAddressesPage.class));
- } else if (loginUser.getEmailAddresses().stream().anyMatch(it->!it.isVerified())) {
- userInfo.add(new ViewStateAwarePageLink<Void>("hasUnverifiedLink", MyEmailAddressesPage.class));
- userInfo.add(new WebMarkupContainer("noPrimaryAddressLink").setVisible(false));
- } else {
- userInfo.add(new WebMarkupContainer("hasUnverifiedLink").setVisible(false));
- userInfo.add(new WebMarkupContainer("noPrimaryAddressLink").setVisible(false));
- }
- } else {
- userInfo.add(new WebMarkupContainer("avatar"));
- userInfo.add(new WebMarkupContainer("name"));
- }
-
- WebMarkupContainer item;
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myProfile", MyProfilePage.class));
- if (getPage() instanceof MyProfilePage)
- item.add(AttributeAppender.append("class", "active"));
+ MenuLink userInfo = new MenuLink("userInfo", new AlignPlacement(100, 100, 100, 0)) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myBasicSetting", MyBasicSettingPage.class));
- if (getPage() instanceof MyBasicSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- if (getLoginUser() != null) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myEmailSetting", MyEmailAddressesPage.class));
- if (getPage() instanceof MyEmailAddressesPage)
- item.add(AttributeAppender.append("class", "active"));
- } else {
- userInfo.add(new WebMarkupContainer("myEmailSetting").setVisible(false));
- }
-
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myAvatar", MyAvatarPage.class));
- if (getPage() instanceof MyAvatarPage)
- item.add(AttributeAppender.append("class", "active"));
-
- if (loginUser != null && loginUser.getPassword() != null && loginUser.getType() == ORDINARY && !loginUser.isDisabled()) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myPassword", MyPasswordPage.class));
- if (getPage() instanceof MyPasswordPage)
- item.add(AttributeAppender.append("class", "active"));
- } else {
- userInfo.add(new WebMarkupContainer("myPassword").setVisible(false));
- }
-
- if (loginUser != null && loginUser.getType() == AI && !loginUser.isDisabled()) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myAISetting", MyModelSettingPage.class));
- if (getPage() instanceof MyModelSettingPage
- || getPage() instanceof MyBehaviorPage
- || getPage() instanceof MyEntitlementSettingPage) {
- item.add(AttributeAppender.append("class", "active"));
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ Fragment fragment = new Fragment(id, "userMenuFrag", LayoutPage.this);
+ User user = getLoginUser();
+ if (user.getType() != ORDINARY || user.isDisabled()) {
+ fragment.add(new WebMarkupContainer("hasUnverifiedLink").setVisible(false));
+ fragment.add(new WebMarkupContainer("noPrimaryAddressLink").setVisible(false));
+ } else if (user.getEmailAddresses().isEmpty()) {
+ fragment.add(new WebMarkupContainer("hasUnverifiedLink").setVisible(false));
+ fragment.add(new ViewStateAwarePageLink<Void>("noPrimaryAddressLink", MyEmailAddressesPage.class));
+ } else if (user.getEmailAddresses().stream().anyMatch(it -> !it.isVerified())) {
+ fragment.add(new ViewStateAwarePageLink<Void>("hasUnverifiedLink", MyEmailAddressesPage.class));
+ fragment.add(new WebMarkupContainer("noPrimaryAddressLink").setVisible(false));
+ } else {
+ fragment.add(new WebMarkupContainer("hasUnverifiedLink").setVisible(false));
+ fragment.add(new WebMarkupContainer("noPrimaryAddressLink").setVisible(false));
+ }
+ fragment.add(super.newContent("items", dropdown));
+ return fragment;
}
- } else {
- userInfo.add(new WebMarkupContainer("myAISetting").setVisible(false));
- }
-
- if (OneDev.getInstance(ServerConfig.class).getSshPort() != 0 && loginUser != null && !loginUser.isDisabled()) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("mySshKeys", MySshKeysPage.class));
- if (getPage() instanceof MySshKeysPage)
- item.add(AttributeAppender.append("class", "active"));
- } else {
- userInfo.add(new WebMarkupContainer("mySshKeys").setVisible(false));
- }
-
- if (loginUser != null && !loginUser.isDisabled()) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myGpgKeys", MyGpgKeysPage.class));
- if (getPage() instanceof MyGpgKeysPage)
- item.add(AttributeAppender.append("class", "active"));
- } else {
- userInfo.add(new WebMarkupContainer("myGpgKeys").setVisible(false));
- }
-
- if (loginUser != null && !loginUser.isDisabled()) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myAccessTokens", MyAccessTokensPage.class));
- if (getPage() instanceof MyAccessTokensPage)
- item.add(AttributeAppender.append("class", "active"));
- } else {
- userInfo.add(new WebMarkupContainer("myAccessTokens").setVisible(false));
- }
- if (getLoginUser() != null && getLoginUser().getType() == ORDINARY && !getLoginUser().isDisabled()) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myTwoFactorAuthentication", MyTwoFactorAuthenticationPage.class) {
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getLoginUser().isEnforce2FA());
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ User user = getLoginUser();
+ var menuItems = new ArrayList<MenuItem>();
+ menuItems.add(newPageMenuItem(_T("Profile"), "profile", MyProfilePage.class,
+ getPage() instanceof MyProfilePage));
+ menuItems.add(newPageMenuItem(_T("Basic Settings"), "info", MyBasicSettingPage.class,
+ getPage() instanceof MyBasicSettingPage));
+ menuItems.add(newPageMenuItem(_T("Email Addresses"), "mail", MyEmailAddressesPage.class,
+ getPage() instanceof MyEmailAddressesPage));
+ menuItems.add(newPageMenuItem(_T("Edit Avatar"), "avatar", MyAvatarPage.class,
+ getPage() instanceof MyAvatarPage));
+ if (user.getPassword() != null && user.getType() == ORDINARY && !user.isDisabled()) {
+ menuItems.add(newPageMenuItem(_T("Password"), "password", MyPasswordPage.class,
+ getPage() instanceof MyPasswordPage));
}
- });
- if (getPage() instanceof MyTwoFactorAuthenticationPage)
- item.add(AttributeAppender.append("class", "active"));
- } else {
- userInfo.add(new WebMarkupContainer("myTwoFactorAuthentication").setVisible(false));
- }
-
- if (loginUser != null && !loginUser.isDisabled() && loginUser.getType() == ORDINARY) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("mySsoAccounts", MySsoAccountsPage.class));
- if (getPage() instanceof MySsoAccountsPage)
- item.add(AttributeAppender.append("class", "active"));
- } else {
- userInfo.add(new WebMarkupContainer("mySsoAccounts").setVisible(false));
- }
+ if (user.getType() == AI && !user.isDisabled()) {
+ menuItems.add(newPageMenuItem(_T("AI Settings"), "ai-setting", MyModelSettingPage.class,
+ getPage() instanceof MyModelSettingPage
+ || getPage() instanceof MyBehaviorPage
+ || getPage() instanceof MyEntitlementSettingPage));
+ }
+ if (OneDev.getInstance(ServerConfig.class).getSshPort() != 0 && !user.isDisabled()) {
+ menuItems.add(newPageMenuItem(_T("SSH Keys"), "key", MySshKeysPage.class,
+ getPage() instanceof MySshKeysPage));
+ }
+ if (!user.isDisabled()) {
+ menuItems.add(newPageMenuItem(_T("GPG Keys"), "key", MyGpgKeysPage.class,
+ getPage() instanceof MyGpgKeysPage));
+ menuItems.add(newPageMenuItem(_T("Access Tokens"), "token", MyAccessTokensPage.class,
+ getPage() instanceof MyAccessTokensPage));
+ }
+ if (user.getType() == ORDINARY && !user.isDisabled() && user.isEnforce2FA()) {
+ menuItems.add(newPageMenuItem(_T("Two-factor Authentication"), "shield",
+ MyTwoFactorAuthenticationPage.class,
+ getPage() instanceof MyTwoFactorAuthenticationPage));
+ }
+ if (!user.isDisabled() && user.getType() == ORDINARY) {
+ menuItems.add(newPageMenuItem(_T("SSO Accounts"), "user", MySsoAccountsPage.class,
+ getPage() instanceof MySsoAccountsPage));
+ }
+ if (user.getType() != SERVICE && !user.isDisabled()) {
+ menuItems.add(newPageMenuItem(_T("Query Watches"), "bell", MyQueryWatchesPage.class,
+ getPage() instanceof MyQueryWatchesPage));
+ }
+ if (!user.isDisabled()) {
+ menuItems.add(newPageMenuItem(_T("Workspace Data"), "workspace", MyWorkspaceDataPage.class,
+ getPage() instanceof MyWorkspaceDataPage));
+ }
+ boolean exitRunAs = !SecurityUtils.isAnonymous(SecurityUtils.getPrevPrincipal());
+ var securitySetting = getSettingService().getSecuritySetting();
+ boolean hideSignOut = !exitRunAs
+ && securitySetting.isDisableInternalLogin()
+ && !securitySetting.isEnableAnonymousAccess()
+ && OneDev.getInstance(SsoProviderService.class).count() == 1;
+ if (!hideSignOut) {
+ menuItems.add(new MenuItem() {
- if (getLoginUser() != null && getLoginUser().getType() != SERVICE && !getLoginUser().isDisabled()) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myQueryWatches", MyQueryWatchesPage.class));
- if (getPage() instanceof MyQueryWatchesPage)
- item.add(AttributeAppender.append("class", "active"));
- } else {
- userInfo.add(new WebMarkupContainer("myQueryWatches").setVisible(false));
- }
+ @Override
+ public String getLabel() {
+ return exitRunAs ? _T("Exit Run As") : _T("Sign Out");
+ }
- if (loginUser != null && !loginUser.isDisabled()) {
- userInfo.add(item = new ViewStateAwarePageLink<Void>("myWorkspaceData", MyWorkspaceDataPage.class));
- if (getPage() instanceof MyWorkspaceDataPage)
- item.add(AttributeAppender.append("class", "active"));
- } else {
- userInfo.add(new WebMarkupContainer("myWorkspaceData").setVisible(false));
- }
+ @Override
+ public String getIconHref() {
+ return "logout";
+ }
- if (!SecurityUtils.isAnonymous(SecurityUtils.getPrevPrincipal())) {
- Link<Void> signOutLink = new Link<Void>("signOut") {
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ if (exitRunAs) {
+ return new Link<Void>(id) {
+
+ @Override
+ public void onClick() {
+ SecurityUtils.getSubject().releaseRunAs();
+ Session.get().warn(_T("Exited run as"));
+ throw new RestartResponseException(HomePage.class);
+ }
+
+ };
+ } else {
+ return new ViewStateAwarePageLink<Void>(id, LogoutPage.class);
+ }
+ }
- @Override
- public void onClick() {
- SecurityUtils.getSubject().releaseRunAs();
- Session.get().warn(_T("Exited run as"));
- throw new RestartResponseException(HomePage.class);
+ });
}
+ return menuItems;
+ }
- };
- signOutLink.add(new Label("label", _T("Exit Run As")));
- userInfo.add(signOutLink);
+ };
+ if (loginUser != null) {
+ userInfo.add(new UserAvatar("avatar", loginUser));
+ userInfo.add(new Label("name", loginUser.getDisplayName()));
} else {
- ViewStateAwarePageLink<Void> signOutLink = new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class);
- signOutLink.add(new Label("label", _T("Sign Out")));
- userInfo.add(signOutLink);
+ userInfo.add(new WebMarkupContainer("avatar"));
+ userInfo.add(new WebMarkupContainer("name"));
}
-
userInfo.setVisible(loginUser != null);
-
if (getPage() instanceof MyPage)
userInfo.add(AttributeAppender.append("class", "active"));
-
topbar.add(userInfo);
add(commandPaletteBehavior = new AbstractDefaultAjaxBehavior() {
@@ -1295,6 +1275,33 @@ public abstract class LayoutPage extends BasePage {
return OneDev.getInstance(AlertService.class);
}
+ private MenuItem newPageMenuItem(String label, String iconHref, Class<? extends Page> pageClass,
+ boolean selected) {
+ return new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return label;
+ }
+
+ @Override
+ public String getIconHref() {
+ return iconHref;
+ }
+
+ @Override
+ public boolean isSelected() {
+ return selected;
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ViewStateAwarePageLink<Void>(id, pageClass);
+ }
+
+ };
+ }
+
private ClusterService getClusterService() {
return OneDev.getInstance(ClusterService.class);
}
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 3e72991af3..be38783e53 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
@@ -5,6 +5,7 @@ import static io.onedev.server.web.page.security.SsoProcessPage.STAGE_INITIATE;
import static io.onedev.server.web.translation.Translation._T;
import java.text.MessageFormat;
+import java.util.Collection;
import javax.inject.Inject;
@@ -76,6 +77,8 @@ public class LoginPage extends SimplePage {
private String errorMessage;
private String subTitle = _T("Enter your details to login to your account");
+
+ private boolean disableInternalLogin;
public LoginPage(PageParameters params) {
super(params);
@@ -98,7 +101,7 @@ public class LoginPage extends SimplePage {
String serverUrl = settingService.getSystemSetting().getServerUrl();
var ssoProviders = ssoProviderService.query();
- boolean disableInternalLogin = settingService.getSecuritySetting().isDisableInternalLogin()
+ disableInternalLogin = settingService.getSecuritySetting().isDisableInternalLogin()
&& !ssoProviders.isEmpty();
if (disableInternalLogin && ssoProviders.size() == 1) {
var provider = ssoProviders.iterator().next();
@@ -196,7 +199,7 @@ public class LoginPage extends SimplePage {
}));
form.add(new ViewStateAwarePageLink<Void>("forgetPassword", PasswordResetPage.class));
- fragment.add(form.setVisible(!disableInternalLogin));
+ fragment.add(form);
boolean enableSelfRegister = settingService.getSecuritySetting().isEnableSelfRegister();
fragment.add(new ViewStateAwarePageLink<Void>("registerUser", SignUpPage.class).setVisible(enableSelfRegister));
@@ -345,5 +348,13 @@ public class LoginPage extends SimplePage {
protected String getSubTitle() {
return subTitle;
}
+
+ @Override
+ protected Collection<String> getCssClasses() {
+ var cssClasses = super.getCssClasses();
+ if (disableInternalLogin)
+ cssClasses.add("internal-login-disabled");
+ return cssClasses;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
index cccf1186d6..5f963d2e58 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
@@ -47,7 +47,15 @@
margin-top: 2.5rem;
}
.SimplePage .main .sso {
- margin-top: 6rem;
+ margin-top: 4rem;
+}
+.SimplePage.LoginPage.internal-login-disabled .main .title,
+.SimplePage.LoginPage.internal-login-disabled .main form,
+.SimplePage.LoginPage.internal-login-disabled .main .signup {
+ display: none;
+}
+.SimplePage.LoginPage.internal-login-disabled .main .sso {
+ margin-top: 2rem;
}
.SimplePage .main .sso img {
width: 24px;
diff --git a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml
index 64f0a7faff..4a79b515ee 100644
--- a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<groupId>io.onedev</groupId>
<artifactId>plugin-maven</artifactId>
- <version>2.7.0</version>
+ <version>2.8.0</version>
<executions>
<execution>
<?m2e execute onConfiguration,onIncremental?>