The Unified and Autonomous Development Platform
chore: Refactoring user password/2FA management
Robin Shendc4ba9c99476
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java b/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.javaindex d0c83cda02..7fffa03848 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java@@ -70,7 +70,6 @@ public class ResetAdminPassword extends CommandHandler {if (root == null)throw new ExplicitException("Server not set up yet");String password = Bootstrap.command.getArgs()[0];- root.setSsoConnector(null);root.setTwoFactorAuthentication(null);root.setPassword(passwordService.encryptPassword(password));userManager.update(root, null);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 78af2e873b..9b41d99e88 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@@ -7047,5 +7047,22 @@ public class DataMigrator {}}}++ private void migrate178(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Users.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var ssoConnectorElement = element.element("ssoConnector");+ if (ssoConnectorElement != null)+ ssoConnectorElement.detach();+ var passwordElement = element.element("password");+ if (passwordElement.getText().trim().equals("external_managed"))+ passwordElement.detach();+ }+ dom.writeToFile(file, false);+ }+ }+ }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.javaindex dd5a82a659..8085c8be11 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java@@ -31,10 +31,6 @@ public interface UserManager extends EntityManager<User> {void delete(User user);void delete(Collection<User> users);-- void useInternalAuthentication(Collection<User> users);-- void useExternalAuthentication(Collection<User> users);void setAsGuest(Collection<User> users, boolean guest);@@ -89,10 +85,6 @@ public interface UserManager extends EntityManager<User> {int count(String term);- void onRenameSsoConnector(String oldName, String newName);-- void onDeleteSsoConnector(String name);-UserCache cloneCache();}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.javaindex 7e7b750dd1..861c99426d 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@@ -36,8 +36,6 @@ import javax.persistence.criteria.*;import java.util.Collection;import java.util.List;-import static io.onedev.server.model.User.*;-@Singletonpublic class DefaultUserManager extends BaseEntityManager<User> implements UserManager {@@ -252,24 +250,6 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserMdelete(user);}- @Transactional- @Override- public void useInternalAuthentication(Collection<User> users) {- for (var user: users) {- user.setPassword(passwordService.encryptPassword(CryptoUtils.generateSecret()));- user.setSsoConnector(null);- }- }-- @Transactional- @Override- public void useExternalAuthentication(Collection<User> users) {- for (var user: users) {- user.setPassword(EXTERNAL_MANAGED);- user.setSsoConnector(null);- }- }-@Transactional@Overridepublic void setAsGuest(Collection<User> users, boolean guest) {@@ -364,26 +344,6 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserMfor (User user: query())cache.put(user.getId(), user.getFacade());}-- @Transactional- @Override- public void onRenameSsoConnector(String oldName, String newName) {- Query<?> query = getSession().createQuery(String.format("update User set %s=:newName "- + "where %s=:oldName", PROP_SSO_CONNECTOR, PROP_SSO_CONNECTOR));- query.setParameter("oldName", oldName);- query.setParameter("newName", newName);- query.executeUpdate();- }-- @Transactional- @Override- public void onDeleteSsoConnector(String name) {- Query<?> query = getSession().createQuery(String.format("update User set %s=null, %s='12345' "- + "where %s=:name",- PROP_SSO_CONNECTOR, PROP_PASSWORD, PROP_SSO_CONNECTOR));- query.setParameter("name", name);- query.executeUpdate();- }private Predicate[] getPredicates(CriteriaBuilder builder, CriteriaQuery<?> query,Root<User> root, String term) {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.javaindex 2d61067f47..2b00fba97b 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@@ -14,8 +14,6 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.model.support.TwoFactorAuthentication;-import io.onedev.server.model.support.administration.authenticator.Authenticator;-import io.onedev.server.model.support.administration.sso.SsoConnector;import io.onedev.server.model.support.build.NamedBuildQuery;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.pack.NamedPackQuery;@@ -37,14 +35,13 @@ import javax.validation.constraints.NotEmpty;import java.util.*;import java.util.stream.Collectors;-import static io.onedev.server.model.User.*;+import static io.onedev.server.model.User.PROP_FULL_NAME;+import static io.onedev.server.model.User.PROP_NAME;import static io.onedev.server.security.SecurityUtils.asPrincipals;import static io.onedev.server.security.SecurityUtils.asUserPrincipal;@Entity-@Table(- indexes={@Index(columnList=PROP_NAME), @Index(columnList=PROP_FULL_NAME),- @Index(columnList=PROP_SSO_CONNECTOR)})+@Table(indexes={@Index(columnList=PROP_NAME), @Index(columnList=PROP_FULL_NAME)})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editablepublic class User extends AbstractEntity implements AuthenticationInfo {@@ -63,16 +60,12 @@ public class User extends AbstractEntity implements AuthenticationInfo {public static final String UNKNOWN_NAME = "unknown";- public static final String EXTERNAL_MANAGED = "external_managed";-public static final String PROP_NAME = "name";public static final String PROP_PASSWORD = "password";public static final String PROP_FULL_NAME = "fullName";- public static final String PROP_SSO_CONNECTOR = "ssoConnector";-public static final String PROP_GUEST = "guest";public static final String PROP_DISABLE_WATCH_NOTIFICATIONS = "disableWatchNotifications";@@ -93,14 +86,11 @@ public class User extends AbstractEntity implements AuthenticationInfo {private String passwordResetCode;- @Column(length=1024, nullable=false)+ @Column(length=1024)@JsonIgnoreprivate String password;private String fullName;-- @JsonIgnore- private String ssoConnector;private boolean guest;@@ -501,7 +491,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Overridepublic Object getCredentials() {- return password;+ return password!=null?password:"";}public Subject asSubject() {@@ -518,10 +508,16 @@ public class User extends AbstractEntity implements AuthenticationInfo {public void setName(String name) {this.name = name;}-++ /**+ * Password will be null if user is created by external authenticator. However, when+ * created via OneDev, it is required. So it has @NotEmpty and @Nullable in the same+ * time+ */@Editable(order=150)@Password(needConfirm=true, autoComplete="new-password")@NotEmpty+ @Nullablepublic String getPassword() {return password;}@@ -532,7 +528,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {* @param password* password to set*/- public void setPassword(String password) {+ public void setPassword(@Nullable String password) {this.password = password;}@@ -543,10 +539,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {public void setPasswordResetCode(String passwordResetCode) {this.passwordResetCode = passwordResetCode;}-- public boolean isExternalManaged() {- return getPassword().equals(EXTERNAL_MANAGED);- }@Editable(order=200)public String getFullName() {@@ -557,15 +549,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.fullName = fullName;}- @Nullable- public String getSsoConnector() {- return ssoConnector;- }-- public void setSsoConnector(String ssoConnector) {- this.ssoConnector = ssoConnector;- }-@Editable(order=300, description = "Whether or not to create the user as <a href='https://docs.onedev.io/concepts#guest-user' target='_blank'>guest</a>")public boolean isGuest() {return guest;@@ -741,33 +724,12 @@ public class User extends AbstractEntity implements AuthenticationInfo {public void setGpgKeys(Collection<GpgKey> gpgKeys) {this.gpgKeys = gpgKeys;}-- public boolean isMembershipExternalManaged() {- if (isExternalManaged()) {- SettingManager settingManager = OneDev.getInstance(SettingManager.class);- if (getSsoConnector() != null) {- SsoConnector ssoConnector = settingManager.getSsoConnectors().stream()- .filter(it->it.getName().equals(getSsoConnector()))- .findFirst().orElse(null);- return ssoConnector != null && ssoConnector.isManagingMemberships();- } else {- Authenticator authenticator = settingManager.getAuthenticator();- return authenticator != null && authenticator.isManagingMemberships();- }- } else {- return false;- }- }-+public String getAuthSource() {- if (isExternalManaged()) {- if (getSsoConnector() != null)- return "SSO Provider: " + getSsoConnector();- else- return "External Authenticator";- } else {- return "Builtin User Store";- }+ if (getPassword() == null)+ return "External System";+ else+ return "Internal Database";}public Collection<Dashboard> getDashboards() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoAuthenticated.java b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoAuthenticated.javaindex 0db90cc321..24c51504ba 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoAuthenticated.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoAuthenticated.java@@ -38,7 +38,7 @@ public class SsoAuthenticated extends Authenticated implements AuthenticationTok@Overridepublic Object getCredentials() {- return User.EXTERNAL_MANAGED;+ return null;}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.javaindex 2935501a9e..c369638463 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java@@ -69,6 +69,4 @@ public abstract class SsoConnector implements Serializable {public abstract void initiateLogin();- public abstract boolean isManagingMemberships();-}diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.javaindex e564b6c17d..0159cbd4a0 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java@@ -86,7 +86,7 @@ public class EmailAddressResource {if (!SecurityUtils.isAdministrator() && !owner.equals(getAuthUser()))throw new UnauthorizedException();- if (owner.isExternalManaged())+ if (owner.getPassword() == null)throw new ExplicitException("Can not set primary email address for externally authenticated user");emailAddressManager.setAsPrimary(emailAddress);@@ -133,7 +133,7 @@ public class EmailAddressResource {if (!SecurityUtils.isAdministrator() && !emailAddress.getOwner().equals(getAuthUser()))throw new UnauthorizedException();- if (emailAddress.isPrimary() && emailAddress.getOwner().isExternalManaged()) {+ if (emailAddress.isPrimary() && emailAddress.getOwner().getPassword() == null) {throw new ExplicitException("Can not delete primary email address of "+ "externally authenticated user");}diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.javaindex 0513155b1a..a7accc8f39 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java@@ -307,22 +307,37 @@ public class UserResource {@POSTpublic Response setPassword(@PathParam("userId") Long userId, @NotEmpty String password) {User user = userManager.load(userId);- if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getAuthUser())) {- throw new UnauthorizedException();- } else if (user.getPassword().equals(User.EXTERNAL_MANAGED)) {- if (user.getSsoConnector() != null) {- throw new ExplicitException("The user is currently authenticated via SSO provider '"- + user.getSsoConnector() + "', please change password there instead");- } else {+ if (SecurityUtils.isAdministrator()) {+ user.setPassword(passwordService.encryptPassword(password));+ userManager.update(user, null);+ return Response.ok().build();+ } else if (user.equals(SecurityUtils.getAuthUser())) {+ if (user.getPassword() == null) {throw new ExplicitException("The user is currently authenticated via external system, "+ "please change password there instead");- }- } else {- user.setPassword(passwordService.encryptPassword(password));- userManager.update(user, null);- return Response.ok().build();+ } else {+ user.setPassword(passwordService.encryptPassword(password));+ userManager.update(user, null);+ return Response.ok().build();+ }+ } else {+ throw new UnauthorizedException();}}++ @Api(order=2025)+ @Path("/{userId}/two-factor-authentication")+ @DELETE+ public Response resetTwoFactorAuthentication(@PathParam("userId") Long userId) {+ User user = userManager.load(userId);+ if (SecurityUtils.isAdministrator()) {+ user.setTwoFactorAuthentication(null);+ userManager.update(user, null);+ return Response.ok().build();+ } else {+ throw new UnauthorizedException();+ }+ }@Api(order=2050)@Path("/{userId}/guest")diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultPasswordService.java b/server-core/src/main/java/io/onedev/server/security/DefaultPasswordService.javaindex bf478b2dba..a2164268ff 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultPasswordService.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultPasswordService.java@@ -1,13 +1,10 @@package io.onedev.server.security;-import java.util.regex.Pattern;--import javax.inject.Singleton;-+import io.onedev.commons.utils.StringUtils;import org.apache.shiro.authc.credential.PasswordService;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.model.User;+import javax.inject.Singleton;+import java.util.regex.Pattern;@Singletonpublic class DefaultPasswordService implements PasswordService {@@ -29,7 +26,7 @@ public class DefaultPasswordService implements PasswordService {@Overridepublic boolean passwordsMatch(Object submittedPlaintext, String encrypted) {- if (encrypted.equals(User.EXTERNAL_MANAGED)) {+ if (encrypted.length() == 0) {return true;} else {String raw;diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.javaindex 71350ae5d3..66bd61bb70 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java@@ -70,7 +70,6 @@ public class PasswordAuthenticatingRealm extends AuthenticatingRealm {if (userName.contains("@"))userName = StringUtils.substringBefore(userName, "@");user.setName(UserNameValidator.suggestUserName(userName));- user.setPassword(User.EXTERNAL_MANAGED);user.setGuest(createAsGuest);if (authenticated.getFullName() != null)user.setFullName(authenticated.getFullName());@@ -117,7 +116,6 @@ public class PasswordAuthenticatingRealm extends AuthenticatingRealm {emailAddress.setGit(true);emailAddressManager.create(emailAddress);}- user.setSsoConnector(null);if (authenticated.getFullName() != null)user.setFullName(authenticated.getFullName());userManager.update(user, null);@@ -141,7 +139,7 @@ public class PasswordAuthenticatingRealm extends AuthenticatingRealm {elseuser = userManager.findByName(userNameOrEmailAddressValue);if (user != null) {- if (user.isExternalManaged()) {+ if (user.getPassword() == null) {Authenticator authenticator = settingManager.getAuthenticator();if (authenticator != null) {UsernamePasswordToken authToken = (UsernamePasswordToken) token;diff --git a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthenticatingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthenticatingRealm.javaindex f148438c8d..47ba5bb1a5 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthenticatingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthenticatingRealm.java@@ -48,8 +48,6 @@ public class SsoAuthenticatingRealm extends AuthenticatingRealm {User user = new User();user.setName(authenticated.getUserName());user.setGuest(authenticated.getConnector().isCreateUserAsGuest());- user.setSsoConnector(authenticated.getConnector().getName());- user.setPassword(User.EXTERNAL_MANAGED);if (authenticated.getFullName() != null)user.setFullName(authenticated.getFullName());userManager.create(user);@@ -78,8 +76,6 @@ public class SsoAuthenticatingRealm extends AuthenticatingRealm {private void updateUser(EmailAddress emailAddress, SsoAuthenticated authenticated) {User user = emailAddress.getOwner();user.setName(authenticated.getUserName());- user.setSsoConnector(authenticated.getConnector().getName());- user.setPassword(User.EXTERNAL_MANAGED);if (authenticated.getFullName() != null)user.setFullName(authenticated.getFullName());userManager.update(user, null);diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskResult.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskResult.javaindex fa29beda88..4811025fdb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskResult.java+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskResult.java@@ -27,7 +27,7 @@ public class TaskResult implements Serializable {successful? "alert-light-success": "alert-light-danger", message.getHtmlText());}- public static interface Message extends Serializable {+ public interface Message extends Serializable {String getHtmlText();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.htmlindex 01ef0435fc..fe99866633 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.html@@ -4,7 +4,7 @@<form wicket:id="form" class="leave-confirm" autocomplete="off"><div wicket:id="editor"></div><div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Change">+ <input wicket:id="submit" type="submit" class="btn btn-primary dirty-aware"></div></form></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.javaindex db9779e4ab..72a03fcb1c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java@@ -8,8 +8,11 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.Session;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.form.Button;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import java.util.HashSet;@@ -43,9 +46,13 @@ public class PasswordEditPanel extends GenericPanel<User> {@Overrideprotected void onSubmit() {super.onSubmit();+ if (getUser().getPassword() != null)+ Session.get().success("Password has been changed");+ else+ Session.get().success("Password has been set");+getUser().setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(bean.getNewPassword()));OneDev.getInstance(UserManager.class).update(getUser(), null);- Session.get().success("Password has been changed");bean.setOldPassword(null);@@ -56,6 +63,12 @@ public class PasswordEditPanel extends GenericPanel<User> {add(form);form.add(BeanContext.edit("editor", bean, excludedProperties, true));+ form.add(new Button("submit").add(AttributeAppender.append("value", new AbstractReadOnlyModel<>() {+ @Override+ public String getObject() {+ return getUser().getPassword()!=null?"Change":"Set";+ }+ })));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationStatusPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationStatusPanel.htmlnew file mode 100644index 0000000000..29b9eef52c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationStatusPanel.html@@ -0,0 +1,14 @@+<wicket:panel>+ <div wicket:id="content"></div>+ <wicket:fragment wicket:id="configuredFrag">+ <div class="alert alert-notice alert-light-success mb-0">+ Two-factor authentication already set up. <a wicket:id="requestToSetupAgain">Request to set up again</a> in case+ both TOTP authenticator and access codes are lost+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="notConfiguredFrag">+ <div class="alert alert-notice alert-light-warning mb-0">+ Will be prompted to set up two-factor authentication upon next login+ </div>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationStatusPanel.javanew file mode 100644index 0000000000..7144a785d7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationStatusPanel.java@@ -0,0 +1,39 @@+package io.onedev.server.web.component.user.twofactorauthentication;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;++public abstract class TwoFactorAuthenticationStatusPanel extends Panel {+ public TwoFactorAuthenticationStatusPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Fragment fragment;+ if (getUser().getTwoFactorAuthentication() != null) {+ fragment = new Fragment("content", "configuredFrag", this);+ fragment.add(new Link<Void>("requestToSetupAgain") {++ @Override+ public void onClick() {+ getUser().setTwoFactorAuthentication(null);+ OneDev.getInstance(UserManager.class).update(getUser(), null);+ setResponsePage(getPage().getPageClass(), getPage().getPageParameters());+ }+ });+ } else {+ fragment = new Fragment("content", "notConfiguredFrag", this);+ }+ add(fragment);+ }++ protected abstract User getUser();++}diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex b430c50b97..10a9354571 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -56,6 +56,7 @@ import io.onedev.server.web.page.admin.usermanagement.password.UserPasswordPage;import io.onedev.server.web.page.admin.usermanagement.preferences.UserPreferencesPage;import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;import io.onedev.server.web.page.admin.usermanagement.sshkeys.UserSshKeysPage;+import io.onedev.server.web.page.admin.usermanagement.twofactorauthentication.UserTwoFactorAuthenticationPage;import io.onedev.server.web.page.builds.BuildListPage;import io.onedev.server.web.page.help.IncompatibilitiesPage;import io.onedev.server.web.page.help.MethodDetailPage;@@ -233,6 +234,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new BasePageMapper("~administration/users/${user}/ssh-keys", UserSshKeysPage.class));add(new BasePageMapper("~administration/users/${user}/gpg-keys", UserGpgKeysPage.class));add(new BasePageMapper("~administration/users/${user}/access-tokens", UserAccessTokensPage.class));+ add(new BasePageMapper("~administration/users/${user}/two-factor-authentication", UserTwoFactorAuthenticationPage.class));add(new BasePageMapper("~administration/users/${user}/preferences", UserPreferencesPage.class));add(new BasePageMapper("~administration/invitations", InvitationListPage.class));add(new BasePageMapper("~administration/invitations/new", NewInvitationPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.javaindex 4b04853d35..0d94d0dde6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java@@ -12,7 +12,7 @@ public class AuthenticatorBean implements Serializable {private Authenticator authenticator;- @Editable(placeholder="No external authentication")+ @Editable(placeholder="No external authenticator")public Authenticator getAuthenticator() {return authenticator;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.javaindex cc37e1853f..aad72579ea 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java@@ -53,7 +53,7 @@ public class AuthenticatorPage extends AdministrationPage {super.onSubmit();OneDev.getInstance(SettingManager.class).saveAuthenticator(bean.getAuthenticator());- getSession().success("External authentication settings saved");+ getSession().success("External authenticator settings saved");}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorEditPanel.javaindex 864cfe09fe..e68a137250 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorEditPanel.java@@ -1,21 +1,7 @@package io.onedev.server.web.page.admin.ssosetting;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.commons.lang3.SerializationUtils;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.support.administration.sso.SsoConnector;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.util.Path;@@ -23,6 +9,17 @@ import io.onedev.server.util.PathNode;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;+import org.apache.commons.lang3.SerializationUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import javax.annotation.Nullable;+import java.util.List;@SuppressWarnings("serial")abstract class SsoConnectorEditPanel extends Panel {@@ -93,15 +90,10 @@ abstract class SsoConnectorEditPanel extends Panel {@Overridepublic void run() {- if (connectorIndex != -1) {- String oldName = getConnectors().get(connectorIndex).getName();- String newName = bean.getConnector().getName();- if (!oldName.equals(newName))- OneDev.getInstance(UserManager.class).onRenameSsoConnector(oldName, newName);+ if (connectorIndex != -1)getConnectors().set(connectorIndex, bean.getConnector());- } else {+ elsegetConnectors().add(bean.getConnector());- }OneDev.getInstance(SettingManager.class).saveSsoConnectors(getConnectors());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.javaindex 39ade2ff43..1842f555f8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.java@@ -1,20 +1,25 @@package io.onedev.server.web.page.admin.ssosetting;-import java.util.ArrayList;-import java.util.Collections;-import java.util.List;-+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.sso.SsoConnector;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.behavior.NoRecordsBehavior;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.svg.SpriteImage;+import io.onedev.server.web.page.admin.AdministrationPage;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.*;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.LoopItem;@@ -26,20 +31,9 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.administration.sso.SsoConnector;-import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;-import io.onedev.server.web.behavior.NoRecordsBehavior;-import io.onedev.server.web.behavior.sortable.SortBehavior;-import io.onedev.server.web.behavior.sortable.SortPosition;-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.page.admin.AdministrationPage;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;@SuppressWarnings("serial")public class SsoConnectorListPage extends AdministrationPage {@@ -178,7 +172,6 @@ public class SsoConnectorListPage extends AdministrationPage {@Overridepublic void run() {OneDev.getInstance(SettingManager.class).saveSsoConnectors(connectors);- OneDev.getInstance(UserManager.class).onDeleteSsoConnector(connector.getName());}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.javaindex 5a05f65267..c097fd4480 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java@@ -305,124 +305,6 @@ public class UserListPage extends AdministrationPage {});- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return "Set Selected Users to Use Internal Authentication";- }-- @Override- public WebMarkupContainer newLink(String id) {- return new AjaxLink<Void>(id) {-- @Override- public void onClick(AjaxRequestTarget target) {- dropdown.close();-- new ConfirmModalPanel(target) {-- @Override- protected void onConfirm(AjaxRequestTarget target) {- getUserManager().useInternalAuthentication(selectionColumn.getSelections().stream().map(IModel::getObject).collect(Collectors.toSet()));- target.add(usersTable);- selectionColumn.getSelections().clear();- Session.get().success("Set to use internal authentication successfully");- }-- @Override- protected String getConfirmMessage() {- return "Passwords of selected users will be reset to use internal authentication. Type <code>yes</code> to confirm";- }-- @Override- protected String getConfirmInput() {- return "yes";- }-- };-- }-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(!selectionColumn.getSelections().isEmpty());- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- configure();- if (!isEnabled()) {- tag.put("disabled", "disabled");- tag.put("title", "Please select users to set to use internal authentication");- }- }-- };- }-- });-- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return "Set Selected Users to Use External Authentication";- }-- @Override- public WebMarkupContainer newLink(String id) {- return new AjaxLink<Void>(id) {-- @Override- public void onClick(AjaxRequestTarget target) {- dropdown.close();- new ConfirmModalPanel(target) {-- @Override- protected void onConfirm(AjaxRequestTarget target) {- getUserManager().useExternalAuthentication(selectionColumn.getSelections().stream().map(IModel::getObject).collect(Collectors.toSet()));- target.add(usersTable);- selectionColumn.getSelections().clear();- Session.get().success("Set to use external authentication successfully");- }-- @Override- protected String getConfirmMessage() {- return "Passwords of selected users will be cleared to use external authentication. Type <code>yes</code> to confirm";- }-- @Override- protected String getConfirmInput() {- return "yes";- }-- };- }-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(!selectionColumn.getSelections().isEmpty());- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- configure();- if (!isEnabled()) {- tag.put("disabled", "disabled");- tag.put("title", "Please select users to set to use external authentication");- }- }-- };- }-- });-menuItems.add(new MenuItem() {@Override@@ -614,132 +496,6 @@ public class UserListPage extends AdministrationPage {});- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return "Set All Queried Users to Use Internal Authentication";- }-- @Override- public WebMarkupContainer newLink(String id) {- return new AjaxLink<Void>(id) {-- @Override- public void onClick(AjaxRequestTarget target) {- dropdown.close();-- new ConfirmModalPanel(target) {-- @Override- protected void onConfirm(AjaxRequestTarget target) {- Collection<User> users = new ArrayList<>();- for (Iterator<User> it = (Iterator<User>) dataProvider.iterator(0, usersTable.getItemCount()); it.hasNext();)- users.add(it.next());- getUserManager().useInternalAuthentication(users);- target.add(usersTable);- selectionColumn.getSelections().clear();-- Session.get().success("Set to use internal authentication successfully");- }-- @Override- protected String getConfirmMessage() {- return "Passwords of all queried users will be reset to use internal authentication. Type <code>yes</code> to confirm";- }-- @Override- protected String getConfirmInput() {- return "yes";- }-- };- }-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(usersTable.getItemCount() != 0);- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- configure();- if (!isEnabled()) {- tag.put("disabled", "disabled");- tag.put("title", "No users to set to use internal authentication");- }- }-- };- }-- });-- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return "Set All Queried Users to Use External Authentication";- }-- @Override- public WebMarkupContainer newLink(String id) {- return new AjaxLink<Void>(id) {-- @Override- public void onClick(AjaxRequestTarget target) {- dropdown.close();-- new ConfirmModalPanel(target) {-- @Override- protected void onConfirm(AjaxRequestTarget target) {- Collection<User> users = new ArrayList<>();- for (Iterator<User> it = (Iterator<User>) dataProvider.iterator(0, usersTable.getItemCount()); it.hasNext();)- users.add(it.next());- getUserManager().useExternalAuthentication(users);- target.add(usersTable);- selectionColumn.getSelections().clear();-- Session.get().success("Set to use external authentication successfully");- }-- @Override- protected String getConfirmMessage() {- return "Passwords of all queried users will be cleared to use external authentication. Type <code>yes</code> to confirm";- }-- @Override- protected String getConfirmInput() {- return "yes";- }-- };- }-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(usersTable.getItemCount() != 0);- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- configure();- if (!isEnabled()) {- tag.put("disabled", "disabled");- tag.put("title", "No users to set to use external authentication");- }- }-- };- }-- });-menuItems.add(new MenuItem() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.javaindex 3500223186..2c04c12521 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java@@ -18,6 +18,7 @@ import io.onedev.server.web.page.admin.usermanagement.password.UserPasswordPage;import io.onedev.server.web.page.admin.usermanagement.preferences.UserPreferencesPage;import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;import io.onedev.server.web.page.admin.usermanagement.sshkeys.UserSshKeysPage;+import io.onedev.server.web.page.admin.usermanagement.twofactorauthentication.UserTwoFactorAuthenticationPage;import io.onedev.server.web.util.UserAware;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -53,13 +54,13 @@ public abstract class UserPage extends AdministrationPage implements UserAware {Long userId = Long.valueOf(userIdString);Preconditions.checkArgument(userId > 0);- userModel = new LoadableDetachableModel<User>() {+ userModel = new LoadableDetachableModel<>() {@Overrideprotected User load() {- return OneDev.getInstance(UserManager.class).load(userId);+ return getUserManager().load(userId);}-+};}@@ -74,13 +75,15 @@ public abstract class UserPage extends AdministrationPage implements UserAware {tabs.add(new PageTab(Model.of("Email Addresses"), Model.of("mail"), UserEmailAddressesPage.class, params));tabs.add(new PageTab(Model.of("Edit Avatar"), Model.of("avatar"), UserAvatarPage.class, params));- tabs.add(new PageTab(Model.of("Change Password"), Model.of("password"), UserPasswordPage.class, params));+ tabs.add(new PageTab(Model.of("Password"), Model.of("password"), UserPasswordPage.class, params));tabs.add(new PageTab(Model.of("Belonging Groups"), Model.of("group"), UserMembershipsPage.class, params));tabs.add(new PageTab(Model.of("Authorized Projects"), Model.of("project"), UserAuthorizationsPage.class, params));if (OneDev.getInstance(ServerConfig.class).getSshPort() != 0)tabs.add(new PageTab(Model.of("SSH Keys"), Model.of("key"), UserSshKeysPage.class, params));tabs.add(new PageTab(Model.of("GPG Keys"), Model.of("key"), UserGpgKeysPage.class, params));tabs.add(new PageTab(Model.of("Access Tokens"), Model.of("token"), UserAccessTokensPage.class, params));+ if (getUser().isEnforce2FA())+ tabs.add(new PageTab(Model.of("Two-factor Authentication"), Model.of("shield"), UserTwoFactorAuthenticationPage.class, params));tabs.add(new PageTab(Model.of("Preferences"), Model.of("sliders"), UserPreferencesPage.class, params));add(new Tabbable("userTabs", tabs));@@ -104,6 +107,10 @@ public abstract class UserPage extends AdministrationPage implements UserAware {return userModel.getObject();}+ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }+public static PageParameters paramsOf(User user) {PageParameters params = new PageParameters();params.add(PARAM_USER, user.getId());diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.htmlindex f875ebc1fc..8726d15f9b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.html@@ -1,6 +1,5 @@<wicket:extend><div class="alert alert-notice alert-light-info mb-4">- <wicket:svg href="bulb" class="icon mr-2"></wicket:svg>When authorize a project, all child projects will also be authorized with the role</div><form wicket:id="form" class="user-authorizations leave-confirm">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.htmlindex 4ae420c1fc..9eccd237fc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.html@@ -1,7 +1,6 @@<wicket:extend><div class="membership-list"><div class="head">- <div wicket:id="externalManagedNote" class="alert alert-notice alert-light-warning mb-4"></div><div class="d-flex align-items-center flex-wrap"><div class="clearable-wrapper mr-3 mb-4"><input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name...">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.javaindex e494ced570..c6af8c5708 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.java@@ -85,9 +85,6 @@ public class UserMembershipsPage extends UserPage {protected void onInitialize() {super.onInitialize();- add(new Label("externalManagedNote", "Group membership of this user is managed from " + getUser().getAuthSource())- .setVisible(getUser().isMembershipExternalManaged()));-TextField<String> searchField;add(searchField = new TextField<String>("filterGroups", Model.of(query)));@@ -157,7 +154,7 @@ public class UserMembershipsPage extends UserPage {response.render(JavaScriptHeaderItem.forReference(new GroupChoiceResourceReference()));}- }.setVisible(!getUser().isMembershipExternalManaged()));+ });add(new MenuLink("delete") {@@ -292,56 +289,49 @@ public class UserMembershipsPage extends UserPage {return menuItems;}- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getUser().isMembershipExternalManaged());- }-});List<IColumn<Membership, Void>> columns = new ArrayList<>();- if (!getUser().isMembershipExternalManaged())- columns.add(selectionColumn = new SelectionColumn<Membership, Void>());+ columns.add(selectionColumn = new SelectionColumn<>());- columns.add(new AbstractColumn<Membership, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<>(Model.of("Name")) {@Overridepublic void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,- IModel<Membership> rowModel) {+ IModel<Membership> rowModel) {Membership membership = rowModel.getObject();Fragment fragment = new Fragment(componentId, "groupFrag", UserMembershipsPage.this);- Link<Void> link = new BookmarkablePageLink<Void>("group", GroupProfilePage.class,+ Link<Void> link = new BookmarkablePageLink<Void>("group", GroupProfilePage.class,GroupProfilePage.paramsOf(membership.getGroup())) {@Overridepublic IModel<?> getBody() {return Model.of(rowModel.getObject().getGroup().getName());}-+};fragment.add(link);cellItem.add(fragment);}});- columns.add(new AbstractColumn<Membership, Void>(Model.of("Description")) {+ columns.add(new AbstractColumn<>(Model.of("Description")) {@Overridepublic void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,- IModel<Membership> rowModel) {+ IModel<Membership> rowModel) {cellItem.add(new Label(componentId, rowModel.getObject().getGroup().getDescription()));}});- dataProvider = new SortableDataProvider<Membership, Void>() {+ dataProvider = new SortableDataProvider<>() {@Overridepublic Iterator<? extends Membership> iterator(long first, long count) {EntityCriteria<Membership> criteria = getCriteria();criteria.addOrder(Order.desc("id"));- return OneDev.getInstance(MembershipManager.class).query(criteria, (int)first, (int)count).iterator();+ return OneDev.getInstance(MembershipManager.class).query(criteria, (int) first, (int) count).iterator();}@Override@@ -352,18 +342,18 @@ public class UserMembershipsPage extends UserPage {@Overridepublic IModel<Membership> model(Membership object) {Long id = object.getId();- return new LoadableDetachableModel<Membership>() {+ return new LoadableDetachableModel<>() {@Overrideprotected Membership load() {return OneDev.getInstance(MembershipManager.class).load(id);}-+};}};- add(membershipsTable = new DefaultDataTable<Membership, Void>("memberships", columns, dataProvider,+ add(membershipsTable = new DefaultDataTable<>("memberships", columns, dataProvider,WebConstants.PAGE_SIZE, null));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/password/UserPasswordPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/password/UserPasswordPage.htmlindex d93f935cce..788a5c835a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/password/UserPasswordPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/password/UserPasswordPage.html@@ -1,3 +1,6 @@<wicket:extend>+ <div wicket:id="authViaExternalSystemNotice" class="alert alert-notice alert-light-warning mt-4">+ This user is currently authenticating via external system. Setting password will switch to use internal database+ </div><div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/password/UserPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/password/UserPasswordPage.javaindex f2d9dcf2c9..8a0b25a68a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/password/UserPasswordPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/password/UserPasswordPage.java@@ -1,12 +1,9 @@package io.onedev.server.web.page.admin.usermanagement.password;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.User;import io.onedev.server.web.component.user.passwordedit.PasswordEditPanel;import io.onedev.server.web.page.admin.usermanagement.UserPage;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.request.mapper.parameter.PageParameters;@SuppressWarnings("serial")public class UserPasswordPage extends UserPage {@@ -18,21 +15,8 @@ public class UserPasswordPage extends UserPage {@Overrideprotected void onInitialize() {super.onInitialize();-- if (getUser().getPassword().equals(User.EXTERNAL_MANAGED)) {- String message;- if (getUser().getSsoConnector() != null) {- message = "The user is currently authenticated via SSO provider '"- + getUser().getSsoConnector()- + "', please change password there instead";- } else {- message = "The user is currently authenticated via external system, "- + "please change password there instead";- }- add(new Label("content", message).add(AttributeAppender.append("class", "alert alert-light-warning alert-notice mb-0")));- } else {- add(new PasswordEditPanel("content", userModel));- }+ add(new WebMarkupContainer("authViaExternalSystemNotice").setVisible(getUser().getPassword() == null));+ add(new PasswordEditPanel("content", userModel));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.htmlindex 357374f4a6..a027d745f5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.html@@ -1,5 +1,14 @@<wicket:extend>- <div wicket:id="externalManagedNote" class="alert alert-notice alert-light-warning"></div>+ <div wicket:id="authSource" class="mb-4"></div><div wicket:id="content"></div>- <a wicket:id="delete" class="btn btn-light-danger">Delete</a>+ <wicket:fragment wicket:id="authViaInternalDatabaseFrag">+ <div class="alert alert-light alert-notice">This user is authenticating via internal database.+ <a wicket:id="removePassword">Remove password</a> to force the user to authenticate via external system+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="authViaExternalSystemFrag">+ <div class="alert alert-light-warning alert-notice">This user is authenticating via external system.+ To authenticate via internal database, <a wicket:id="setPasswordForUser">set password for user</a> or <form wicket:id="tellUserToResetPassword" class="d-inline"><a wicket:id="tellUserToResetPassword">tell user to reset password</a></form>+ </div>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.javaindex 592a80f76c..0f863c2a9c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.java@@ -1,16 +1,31 @@package io.onedev.server.web.page.admin.usermanagement.profile;+import com.google.common.collect.Lists;+import io.onedev.commons.utils.TaskLogger;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.mail.MailManager;+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.util.CryptoUtils;+import io.onedev.server.web.component.taskbutton.TaskButton;+import io.onedev.server.web.component.taskbutton.TaskResult;+import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;+import io.onedev.server.web.page.admin.usermanagement.UserPage;+import io.onedev.server.web.page.admin.usermanagement.password.UserPasswordPage;+import io.onedev.server.web.util.ConfirmClickModifier;+import org.apache.wicket.Session;import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.collect.Sets;--import io.onedev.server.model.User;-import io.onedev.server.web.component.user.UserDeleteLink;-import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.page.admin.usermanagement.UserPage;+import java.util.Arrays;+import java.util.HashMap;+import java.util.Map;@SuppressWarnings("serial")public class UserProfilePage extends UserPage {@@ -23,24 +38,74 @@ public class UserProfilePage extends UserPage {protected void onInitialize() {super.onInitialize();- add(new Label("externalManagedNote", "Profile of this user is managed from " + getUser().getAuthSource())- .setVisible(getUser().isExternalManaged()));-- if (getUser().isExternalManaged()) {- add(BeanContext.view("content", getUser(), Sets.newHashSet("password"), true));- add(new UserDeleteLink("delete") {+ WebMarkupContainer authSourceContainer;+ if (getUser().getPassword() != null) {+ authSourceContainer = new Fragment("authSource", "authViaInternalDatabaseFrag", this);+ authSourceContainer.add(new Link<Void>("removePassword") {@Override- protected User getUser() {- return UserProfilePage.this.getUser();+ public void onClick() {+ getUser().setPassword(null);+ getUserManager().update(getUser(), null);+ Session.get().success("Password has been removed");+ setResponsePage(UserPasswordPage.class, paramsOf(getUser()));}-- }.setVisible(!getUser().isRoot() && !getUser().equals(getLoginUser())));+ }.add(new ConfirmClickModifier("Do you really want to remove password of this user?")));} else {- add(new ProfileEditPanel("content", userModel));- add(new WebMarkupContainer("delete").setVisible(false));+ authSourceContainer = new Fragment("authSource", "authViaExternalSystemFrag", this);+ authSourceContainer.add(new BookmarkablePageLink<Void>("setPasswordForUser",+ UserPasswordPage.class, UserPasswordPage.paramsOf(getUser())));+ var form = new Form<Void>("tellUserToResetPassword");+ authSourceContainer.add(form);+ var userId = getUser().getId();+ form.add(new TaskButton("tellUserToResetPassword") {++ @Override+ protected TaskResult runTask(TaskLogger logger) {+ var sessionManager = OneDev.getInstance(SessionManager.class);+ return sessionManager.call(() -> {+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ if (settingManager.getMailService() != null) {+ var user = getUserManager().load(userId);+ if (user.getPrimaryEmailAddress() != null && user.getPrimaryEmailAddress().isVerified()) {+ String passwordResetCode = CryptoUtils.generateSecret();+ user.setPasswordResetCode(passwordResetCode);+ getUserManager().update(user, null);++ MailManager mailManager = OneDev.getInstance(MailManager.class);++ Map<String, Object> bindings = new HashMap<>();+ bindings.put("passwordResetUrl", settingManager.getSystemSetting().getServerUrl() + "/~reset-password/" + passwordResetCode);+ bindings.put("user", user);++ var template = settingManager.getEmailTemplates().getPasswordReset();+ var htmlBody = EmailTemplates.evalTemplate(true, template, bindings);+ var textBody = EmailTemplates.evalTemplate(false, template, bindings);++ mailManager.sendMail(Arrays.asList(user.getPrimaryEmailAddress().getValue()),+ Lists.newArrayList(), Lists.newArrayList(),+ "[Reset Password] Please Reset Your OneDev Password",+ htmlBody, textBody, null, null, null);++ return new TaskResult(true, new TaskResult.PlainMessage("Password reset request has been sent"));+ } else {+ return new TaskResult(false, new TaskResult.PlainMessage("No verified primary email address"));+ }+ } else {+ return new TaskResult(false, new TaskResult.PlainMessage("Unable to notify user as mail service is not configured"));+ }+ });+ }++ });}+ add(authSourceContainer);+ add(new ProfileEditPanel("content", userModel));}+ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.htmlnew file mode 100644index 0000000000..d93f935cce--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div wicket:id="content"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.javanew file mode 100644index 0000000000..06d62311f1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.java@@ -0,0 +1,38 @@+package io.onedev.server.web.page.admin.usermanagement.twofactorauthentication;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.User;+import io.onedev.server.web.component.user.twofactorauthentication.TwoFactorAuthenticationStatusPanel;+import io.onedev.server.web.page.admin.usermanagement.UserPage;+import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.mapper.parameter.PageParameters;++@SuppressWarnings("serial")+public class UserTwoFactorAuthenticationPage extends UserPage {++ public UserTwoFactorAuthenticationPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (!getUser().isEnforce2FA())+ throw new ExplicitException("Two-factor authentication not enabled");++ add(new TwoFactorAuthenticationStatusPanel("content") {+ @Override+ protected User getUser() {+ return UserTwoFactorAuthenticationPage.this.getUser();+ }+ });+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, "Two Factor Authentication");+ }++}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.htmlindex 5186fb9ab2..31f667ae93 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@@ -80,7 +80,7 @@</a><a wicket:id="myPassword" class="dropdown-item"><wicket:svg href="password" class="icon mr-2"></wicket:svg>- Change Password+ Password</a><a wicket:id="mySshKeys" class="dropdown-item"><wicket:svg href="key" class="icon mr-2"></wicket:svg>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.javaindex 3da32b073a..100406f597 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@@ -199,12 +199,12 @@ public abstract class LayoutPage extends BasePage {new PageParameters(), Lists.newArrayList(NewGroupPage.class, GroupPage.class)));List<SidebarMenuItem> authenticationMenuItems = new ArrayList<>();- authenticationMenuItems.add(new SidebarMenuItem.Page(null, "External Authentication",+ authenticationMenuItems.add(new SidebarMenuItem.Page(null, "Authenticator",AuthenticatorPage.class, new PageParameters()));authenticationMenuItems.add(new SidebarMenuItem.Page(null, "Single Sign On",SsoConnectorListPage.class, new PageParameters()));- administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Authentication Source", authenticationMenuItems));+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "External Auth Source", authenticationMenuItems));var sshPort = OneDev.getInstance(ServerConfig.class).getSshPort();List<SidebarMenuItem> keyManagementMenuItems = new ArrayList<>();@@ -804,9 +804,13 @@ public abstract class LayoutPage extends BasePage {if (getPage() instanceof MyAvatarPage)item.add(AttributeAppender.append("class", "active"));- userInfo.add(item = new ViewStateAwarePageLink<Void>("myPassword", MyPasswordPage.class));- if (getPage() instanceof MyPasswordPage)- item.add(AttributeAppender.append("class", "active"));+ if (loginUser != null && loginUser.getPassword() != null) {+ 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 (OneDev.getInstance(ServerConfig.class).getSshPort() != 0) {userInfo.add(item = new ViewStateAwarePageLink<Void>("mySshKeys", MySshKeysPage.class));@@ -828,7 +832,7 @@ public abstract class LayoutPage extends BasePage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getLoginUser().isEnforce2FA() && getLoginUser().getSsoConnector() == null);+ setVisible(getLoginUser().isEnforce2FA());}});if (getPage() instanceof MyTwoFactorAuthenticationPage)diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.htmlindex 9f8fe5a012..59c3f68773 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.html@@ -1,5 +1,9 @@<wicket:extend><div id="my">- <wicket:child></wicket:child>+ <div class="card m-2 m-sm-5">+ <div class="card-body">+ <wicket:child></wicket:child>+ </div>+ </div></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.javaindex f93406df01..4d187191d6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java@@ -3,13 +3,12 @@ package io.onedev.server.web.page.my;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;+import io.onedev.server.web.page.layout.LayoutPage;+import io.onedev.server.web.page.simple.security.LoginPage;import io.onedev.server.web.util.UserAware;import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.web.page.layout.LayoutPage;-import io.onedev.server.web.page.simple.security.LoginPage;-@SuppressWarnings("serial")public abstract class MyPage extends LayoutPage implements UserAware {@@ -21,7 +20,7 @@ public abstract class MyPage extends LayoutPage implements UserAware {protected void onInitialize() {super.onInitialize();- if (getLoginUser() == null)+ if (getUser() == null)throw new RestartResponseAtInterceptPageException(LoginPage.class);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.htmlindex b03057768e..356f467eab 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.html@@ -1,10 +1,6 @@<wicket:extend>- <div class="card m-2 m-sm-5">- <div class="card-body">- <div class="alert alert-notice alert-light mb-5">- Access token is intended for api access and repository pull/push. It can not be used to sign in to web ui- </div>- <div wicket:id="accessTokens"></div>- </div>+ <div class="alert alert-notice alert-light mb-5">+ Access token is intended for api access and repository pull/push. It can not be used to sign in to web ui</div>+ <div wicket:id="accessTokens"></div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.htmlindex 1bc76fedd6..3c7d14f84d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.html@@ -1,7 +1,3 @@<wicket:extend>- <div class="card m-2 m-sm-5">- <div class="card-body">- <div wicket:id="content"></div>- </div>- </div>+ <div wicket:id="content"></div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.htmlindex 0b1076727f..d93f935cce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.html@@ -1,7 +1,3 @@<wicket:extend>- <div class="card m-2 m-sm-5">- <div class="card-body">- <div wicket:id="content"></div>- </div>- </div>+ <div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.htmlindex f44fbe5d56..1753f14e94 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html@@ -1,11 +1,5 @@<wicket:extend>- <div class="p-5">- <div class="card">- <div class="card-body">- <div class="alert alert-light alert-notice mb-4">Add GPG keys here to verify commits/tags signed by you</div>- <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add GPG Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <div wicket:id="keyList"></div>- </div>- </div>- </div>+ <div class="alert alert-light alert-notice mb-4">Add GPG keys here to verify commits/tags signed by you</div>+ <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add GPG Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div wicket:id="keyList"></div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.htmlindex 1bc76fedd6..3c7d14f84d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.html@@ -1,7 +1,3 @@<wicket:extend>- <div class="card m-2 m-sm-5">- <div class="card-body">- <div wicket:id="content"></div>- </div>- </div>+ <div wicket:id="content"></div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.javaindex 9f068e1cba..b407af1232 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java@@ -1,39 +1,28 @@package io.onedev.server.web.page.my.password;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.User;+import io.onedev.server.web.component.user.passwordedit.PasswordEditPanel;+import io.onedev.server.web.page.my.MyPage;import org.apache.wicket.Component;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.model.User;-import io.onedev.server.web.component.user.passwordedit.PasswordEditPanel;-import io.onedev.server.web.page.my.MyPage;-@SuppressWarnings("serial")public class MyPasswordPage extends MyPage {public MyPasswordPage(PageParameters params) {super(params);+ if (getLoginUser().getPassword() == null)+ throw new ExplicitException("Unable to change password as you are authenticating via external system");}@Overrideprotected void onInitialize() {super.onInitialize();- if (getLoginUser().getPassword().equals(User.EXTERNAL_MANAGED)) {- String message;- if (getLoginUser().getSsoConnector() != null) {- message = "You are currently authenticated via SSO provider '"- + getLoginUser().getSsoConnector()- + "', please change password there instead";- } else {- message = "You are currently authenticated via external system, "- + "please change password there instead";- }- add(new Label("content", message).add(AttributeAppender.append("class", "alert alert-light-warning alert-notice mb-0")));- } else {- add(new PasswordEditPanel("content", new AbstractReadOnlyModel<User>() {+ add(new PasswordEditPanel("content", new AbstractReadOnlyModel<User>() {@Overridepublic User getObject() {@@ -41,7 +30,6 @@ public class MyPasswordPage extends MyPage {}}));- }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.htmlindex 0b1076727f..d93f935cce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.html@@ -1,7 +1,3 @@<wicket:extend>- <div class="card m-2 m-sm-5">- <div class="card-body">- <div wicket:id="content"></div>- </div>- </div>+ <div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.htmlindex 6bca76d1d1..207225bba1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html@@ -1,9 +1,10 @@<wicket:extend>- <div class="card m-2 m-sm-5">- <div class="card-body">- <div wicket:id="externalManagedNote" class="alert alert-warning alert-light-warning"></div>- <div wicket:id="content"></div>- <a wicket:id="delete" class="btn btn-light-danger">Delete</a>- </div>- </div>+ <div wicket:id="authSource" class="mb-4"></div>+ <div wicket:id="content"></div>+ <wicket:fragment wicket:id="authViaInternalDatabaseFrag">+ <div class="alert alert-light alert-notice">You are authenticating via internal database</div>+ </wicket:fragment>+ <wicket:fragment wicket:id="authViaExternalSystemFrag">+ <div class="alert alert-light-warning alert-notice">You are authenticating via external system</div>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.javaindex ef16919f3c..caa054d7bd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java@@ -1,17 +1,11 @@package io.onedev.server.web.page.my.profile;-import com.google.common.collect.Sets;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.component.user.UserDeleteLink;import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.my.MyPage;import org.apache.wicket.Component;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -25,34 +19,20 @@ public class MyProfilePage extends MyPage {@Overrideprotected void onInitialize() {super.onInitialize();-- add(new Label("externalManagedNote", "Your profile is managed from " + getLoginUser().getAuthSource())- .setVisible(getLoginUser().isExternalManaged()));- if (getLoginUser().isExternalManaged()) {- add(BeanContext.view("content", getLoginUser(), Sets.newHashSet("password"), true));- boolean canRemoveSelf = !getLoginUser().isRoot()- && SecurityUtils.isAnonymous(SecurityUtils.getPrevPrincipal())- && OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfDeregister();- add(new UserDeleteLink("delete") {-- @Override- protected User getUser() {- return getLoginUser();- }-- }.setVisible(canRemoveSelf));- } else {- add(new ProfileEditPanel("content", new AbstractReadOnlyModel<>() {-- @Override- public User getObject() {- return getLoginUser();- }-- }));- add(new WebMarkupContainer("delete").setVisible(false));- }+ if (getUser().getPassword() != null)+ add(new Fragment("authSource", "authViaInternalDatabaseFrag", this));+ else+ add(new Fragment("authSource", "authViaExternalSystemFrag", this));++ add(new ProfileEditPanel("content", new AbstractReadOnlyModel<>() {++ @Override+ public User getObject() {+ return getLoginUser();+ }++ }));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.htmlindex 1fbd935298..f5722594cb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html@@ -1,10 +1,4 @@<wicket:extend>- <div class="p-5">- <div class="card">- <div class="card-body">- <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add SSH Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <div wicket:id="keyList"></div>- </div>- </div>- </div>+ <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add SSH Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div wicket:id="keyList"></div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.htmlindex ca4a337d12..d93f935cce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.html@@ -1,8 +1,3 @@<wicket:extend>- <div class="card m-2 m-sm-5">- <div class="card-body">- <div wicket:id="notice" class="alert alert-notice"></div>- <div wicket:id="setup" class="bg-light rounded p-4"></div>- </div>- </div>+ <div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.javaindex bbe25399db..1891ae9ccd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.java@@ -2,14 +2,10 @@ package io.onedev.server.web.page.my.twofactorauthentication;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.User;-import io.onedev.server.web.component.user.twofactorauthentication.TwoFactorAuthenticationSetupPanel;+import io.onedev.server.web.component.user.twofactorauthentication.TwoFactorAuthenticationStatusPanel;import io.onedev.server.web.page.my.MyPage;import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@SuppressWarnings("serial")@@ -25,38 +21,12 @@ public class MyTwoFactorAuthenticationPage extends MyPage {if (!getLoginUser().isEnforce2FA())throw new ExplicitException("Two-factor authentication not enabled");- if (getLoginUser().getSsoConnector() != null)- throw new ExplicitException("Two-factor authentication not applicable as you are authenticating via SSO");-- add(new Label("notice", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (getLoginUser().getTwoFactorAuthentication() != null)- return "Two-factor authentication already configured. You may reconfigure it below if desired";- else- return "Two-factor authentication is enabled. Please set it up below";- }- }).add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (getLoginUser().getTwoFactorAuthentication() != null)- return "alert-light-success";- else- return "alert-light-warning";- }- })));- add(new TwoFactorAuthenticationSetupPanel("setup") {-- @Override- protected void onConfigured(AjaxRequestTarget target) {- setResponsePage(MyTwoFactorAuthenticationPage.class);- }-++ add(new TwoFactorAuthenticationStatusPanel("content") {@Overrideprotected User getUser() {return getLoginUser();}-});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.javaindex afcaf83e0b..f063715d4e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java@@ -160,16 +160,7 @@ public class LoginPage extends SimplePage {}));- form.add(new ViewStateAwarePageLink<Void>("forgetPassword", PasswordResetPage.class) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(OneDev.getInstance(SettingManager.class).getMailService() != null);- }-- });-+ form.add(new ViewStateAwarePageLink<Void>("forgetPassword", PasswordResetPage.class));fragment.add(form);SettingManager settingManager = OneDev.getInstance(SettingManager.class);diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.javaindex 2c7b956088..f2e4f63116 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java@@ -58,7 +58,7 @@ public class PasswordResetPage extends SimplePage {Form<?> form = new Form<Void>("form");form.add(new FencedFeedbackPanel("feedback", form));- form.add(new TextField<String>("loginNameOrEmail", new IModel<String>() {+ form.add(new TextField<>("loginNameOrEmail", new IModel<String>() {@Overridepublic void detach() {@@ -87,13 +87,14 @@ public class PasswordResetPage extends SimplePage {@Overrideprotected TaskResult runTask(TaskLogger logger) {- OneDev.getInstance(SessionManager.class).openSession();- try {+ return OneDev.getInstance(SessionManager.class).call(() -> {User user = getUserManager().findByName(loginNameOrEmail);if (user == null)user = getUserManager().findByVerifiedEmailAddress(loginNameOrEmail);if (user == null) {throw new ExplicitException("No user found with login name or verified email: " + loginNameOrEmail);+ } else if (user.getPassword() == null) {+ throw new ExplicitException("Can not reset password for user authenticating via external system");} else {SettingManager settingManager = OneDev.getInstance(SettingManager.class);if (settingManager.getMailService() != null) {@@ -131,12 +132,10 @@ public class PasswordResetPage extends SimplePage {return new TaskResult(true, new PlainMessage("Please check your email for password reset instructions"));} else {- return new TaskResult(false, new PlainMessage("Unable to send password reset email as smtp settings are not defined"));+ return new TaskResult(false, new PlainMessage("Unable to send password reset email as mail service is not configured"));}}- } finally {- OneDev.getInstance(SessionManager.class).closeSession();- }+ });}});@@ -163,7 +162,6 @@ public class PasswordResetPage extends SimplePage {super.onSubmit();var user = getUserManager().load(userId);user.setPasswordResetCode(null);- user.setSsoConnector(null);user.setPassword(OneDev.getInstance(PasswordService.class).encryptPassword(bean.getNewPassword()));getUserManager().update(user, null);Session.get().success("Password changed. Please login with your new password");@@ -183,7 +181,7 @@ public class PasswordResetPage extends SimplePage {} else {throw new ExplicitException("Password reset url is invalid or obsolete");}- }+ }}private UserManager getUserManager() {diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.javaindex 301560f6de..903c1bf415 100644--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java@@ -1,11 +1,16 @@package io.onedev.server.plugin.sso.discord;-import java.io.IOException;-import java.net.URI;-import java.net.URISyntaxException;--import javax.servlet.http.HttpServletRequest;-+import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Password;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.sso.SsoAuthenticated;+import io.onedev.server.model.support.administration.sso.SsoConnector;+import io.onedev.server.plugin.sso.discord.oauth2.AccessTokenResponse;+import io.onedev.server.plugin.sso.discord.oauth2.Request;+import io.onedev.server.plugin.sso.discord.oauth2.UserGuildsResponse;+import io.onedev.server.plugin.sso.discord.oauth2.UserInfoResponse;+import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authc.AuthenticationException;import org.apache.wicket.Session;@@ -14,21 +19,14 @@ import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.PackageResourceReference;import org.apache.wicket.request.resource.ResourceReference;-import javax.validation.constraints.NotEmpty;-import org.json.JSONObject;import org.json.JSONException;+import org.json.JSONObject;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.sso.SsoAuthenticated;-import io.onedev.server.model.support.administration.sso.SsoConnector;-import io.onedev.server.plugin.sso.discord.oauth2.AccessTokenResponse;-import io.onedev.server.plugin.sso.discord.oauth2.Request;-import io.onedev.server.plugin.sso.discord.oauth2.UserGuildsResponse;-import io.onedev.server.plugin.sso.discord.oauth2.UserInfoResponse;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Password;-import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;+import javax.servlet.http.HttpServletRequest;+import javax.validation.constraints.NotEmpty;+import java.io.IOException;+import java.net.URI;+import java.net.URISyntaxException;@Editable(name="Discord", order=150, description="Single sign on via discord.com")public class DiscordConnector extends SsoConnector {@@ -127,12 +125,6 @@ public class DiscordConnector extends SsoConnector {String authURI = apiRequest.getAuthorizationURI();throw new RedirectToUrlException(authURI);}-- @Override- public boolean isManagingMemberships() {- // TODO Auto-generated method stub- return false;- }private SsoAuthenticated processTokenResponse(AccessTokenResponse accessTokenResponse) {try {diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.javaindex 59526045c1..ba6e7c45eb 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java@@ -102,9 +102,4 @@ public class GitHubConnector extends OpenIdConnector {}}- @Override- public boolean isManagingMemberships() {- return false;- }-}diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.javaindex e9758b1bc7..6845a75725 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java@@ -75,11 +75,6 @@ public class OpenIdConnector extends SsoConnector {ResourceReference logo = new PackageResourceReference(OpenIdConnector.class, "openid.png");buttonImageUrl = RequestCycle.get().urlFor(logo, new PageParameters()).toString();}-- @Override- public boolean isManagingMemberships() {- return getGroupsClaim() != null;- }@Editable(order=100, description="Name of the provider will serve two purpose: "+ "<ul>"diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.javaindex 3b75151c39..022287791d 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java@@ -1,8 +1,5 @@package io.onedev.server.plugin.sso.openid;-import java.net.URLEncoder;-import java.nio.charset.StandardCharsets;-import com.nimbusds.oauth2.sdk.ParseException;import com.nimbusds.oauth2.sdk.Scope;import com.nimbusds.oauth2.sdk.TokenErrorResponse;@@ -15,11 +12,13 @@ import com.nimbusds.oauth2.sdk.id.ClientID;import com.nimbusds.oauth2.sdk.token.BearerAccessToken;import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;import com.nimbusds.openid.connect.sdk.token.OIDCTokens;-import io.onedev.server.annotation.Editable;import net.minidev.json.JSONArray;import net.minidev.json.JSONObject;+import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;+@Editable(name="Twitch", order=200, description = "Single sign on via twitch.tv")public class TwitchConnector extends OpenIdConnector {@@ -48,11 +47,6 @@ public class TwitchConnector extends OpenIdConnector {return super.getGroupsClaim();}- @Override- public boolean isManagingMemberships() {- return false;- }-@Overridepublic String getRequestScopes() {return "openid user:read:email";