Skip to content

The Unified and Autonomous Development Platform

feat: able to self-delete user account (#1390)

Robin Shenb17f6bcf64d9
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index b9bc35197d..7304ad6e04 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -5329,6 +5329,20 @@ public class DataMigrator {
}
private void migrate122(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String key = element.elementTextTrim("key");
+ if (key.equals("SECURITY")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null)
+ valueElement.addElement("enableSelfDeregister").setText("false");
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
}
}
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 b960569e5f..8fa4bf5d35 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
@@ -25,6 +25,8 @@ public class SecuritySetting implements Serializable {
private boolean enableSelfRegister = true;
+ private boolean enableSelfDeregister;
+
private String defaultLoginGroupName;
private boolean enforce2FA;
@@ -38,7 +40,7 @@ public class SecuritySetting implements Serializable {
this.enableAnonymousAccess = enableAnonymousAccess;
}
- @Editable(order=200, name="Enable Self Sign-Up", description="User can sign up if this option is enabled")
+ @Editable(order=200, name="Enable Account Self Sign-Up", description="User can sign up if this option is enabled")
public boolean isEnableSelfRegister() {
return enableSelfRegister;
}
@@ -58,6 +60,16 @@ public class SecuritySetting implements Serializable {
this.defaultLoginGroupName = defaultLoginGroupName;
}
+ @Editable(order=350, name="Enable Account Self Removal", description = "Whether or not user " +
+ "can remove own account")
+ public boolean isEnableSelfDeregister() {
+ return enableSelfDeregister;
+ }
+
+ public void setEnableSelfDeregister(boolean enableSelfDeregister) {
+ this.enableSelfDeregister = enableSelfDeregister;
+ }
+
@Editable(order=400, name="Enforce Two-factor Authentication", description="Check this to enforce "
+ "all users to set up two-factor authentication upon next login. Users will not be able "
+ "to disable two-factor authentication themselves if this option is set")
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index 160aa81a87..d11d2ed176 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -334,6 +334,14 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
};
}
+ public static Long getPrevUserId() {
+ PrincipalCollection prevPrincipals = SecurityUtils.getSubject().getPreviousPrincipals();
+ if (prevPrincipals != null)
+ return (Long) prevPrincipals.getPrimaryPrincipal();
+ else
+ return 0L;
+ }
+
public static PrioritizedRunnable inheritSubject(PrioritizedRunnable task) {
Subject subject = SecurityUtils.getSubject();
return new PrioritizedRunnable(task.getPriority()) {
diff --git a/server-core/src/main/java/io/onedev/server/web/WebSession.java b/server-core/src/main/java/io/onedev/server/web/WebSession.java
index c703948867..a994ec0110 100644
--- a/server-core/src/main/java/io/onedev/server/web/WebSession.java
+++ b/server-core/src/main/java/io/onedev/server/web/WebSession.java
@@ -7,6 +7,7 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.Nullable;
import javax.servlet.http.HttpSession;
+import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.subject.Subject;
@@ -54,6 +55,7 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession {
public void logout() {
SecurityUtils.getSubject().logout();
replaceSession();
+ SsoProcessPage.clearConnectorCookie();
}
@Nullable
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java
index 0aa5d5f668..912397bb0f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java
@@ -1,8 +1,5 @@
package io.onedev.server.web.component.user;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.request.flow.RedirectToUrlException;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
@@ -10,6 +7,9 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.page.admin.usermanagement.UserListPage;
import io.onedev.server.web.util.ConfirmClickModifier;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.request.flow.RedirectToUrlException;
@SuppressWarnings("serial")
public abstract class UserDeleteLink extends Link<Void> {
@@ -22,27 +22,28 @@ public abstract class UserDeleteLink extends Link<Void> {
protected void onInitialize() {
super.onInitialize();
- add(new ConfirmClickModifier("Do you really want to delete user '" + getUser().getDisplayName() + "'?"));
- }
-
- @Override
- public void onClick() {
- OneDev.getInstance(UserManager.class).delete(getUser());
- WebSession.get().success("User '" + getUser().getDisplayName() + "' deleted");
-
- String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(User.class);
- if (redirectUrlAfterDelete != null)
- throw new RedirectToUrlException(redirectUrlAfterDelete);
+ if (getUser().equals(SecurityUtils.getUser()))
+ add(new ConfirmClickModifier("Do you really want to remove your account?"));
else
- setResponsePage(UserListPage.class);
+ add(new ConfirmClickModifier("Do you really want to delete user '" + getUser().getDisplayName() + "'?"));
}
@Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.isAdministrator()
- && !getUser().isRoot()
- && !getUser().equals(SecurityUtils.getUser()));
+ public void onClick() {
+ if (getUser().equals(SecurityUtils.getUser())) {
+ OneDev.getInstance(UserManager.class).delete(getUser());
+ WebSession.get().logout();
+ WebSession.get().warn("Your account is deleted");
+ throw new RestartResponseException(getApplication().getHomePage());
+ } else {
+ OneDev.getInstance(UserManager.class).delete(getUser());
+ WebSession.get().success("User '" + getUser().getDisplayName() + "' deleted");
+ String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(User.class);
+ if (redirectUrlAfterDelete != null)
+ throw new RedirectToUrlException(redirectUrlAfterDelete);
+ else
+ setResponsePage(UserListPage.class);
+ }
}
protected abstract User getUser();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
index ccd191a830..a36b100ff5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
@@ -2,6 +2,9 @@ package io.onedev.server.web.component.user.profileedit;
import java.io.Serializable;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.page.my.profile.MyProfilePage;
import org.apache.wicket.Session;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.form.Form;
@@ -85,6 +88,14 @@ public class ProfileEditPanel extends GenericPanel<User> {
form.add(new FencedFeedbackPanel("feedback", form).setEscapeModelStrings(false));
+ boolean canDelete;
+ if (getPage() instanceof MyProfilePage) {
+ canDelete = !getUser().isRoot()
+ && SecurityUtils.getPrevUserId().equals(0L)
+ && OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfDeregister();
+ } else {
+ canDelete = !getUser().isRoot() && !getUser().equals(SecurityUtils.getUser());
+ }
form.add(new UserDeleteLink("delete") {
@Override
@@ -92,7 +103,7 @@ public class ProfileEditPanel extends GenericPanel<User> {
return ProfileEditPanel.this.getUser();
}
- });
+ }.setVisible(canDelete));
add(form);
}
diff --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.java
index 6210efdd5d..61e729aec9 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
@@ -35,7 +35,7 @@ public class UserProfilePage extends UserPage {
return UserProfilePage.this.getUser();
}
- });
+ }).setVisible(!getUser().isRoot() && !getUser().equals(getLoginUser()));
} else {
add(new ProfileEditPanel("content", userModel));
add(new WebMarkupContainer("delete").setVisible(false));
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 682e4db6fb..0215eb351d 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
@@ -515,8 +515,7 @@ public abstract class LayoutPage extends BasePage {
if (getPage() instanceof MyTwoFactorAuthenticationPage)
item.add(AttributeAppender.append("class", "active"));
- PrincipalCollection prevPrincipals = SecurityUtils.getSubject().getPreviousPrincipals();
- if (prevPrincipals != null && !prevPrincipals.getPrimaryPrincipal().equals(0L)) {
+ if (!SecurityUtils.getPrevUserId().equals(0L)) {
Link<Void> signOutLink = new Link<Void>("signOut") {
@Override
diff --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.java
index 2835275851..bb9da661f7 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,19 @@
package io.onedev.server.web.page.my.profile;
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
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.model.AbstractReadOnlyModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
@SuppressWarnings("serial")
public class MyProfilePage extends MyPage {
@@ -29,6 +31,17 @@ public class MyProfilePage extends MyPage {
if (getLoginUser().isExternalManaged()) {
add(BeanContext.view("content", getLoginUser(), Sets.newHashSet("password"), true));
+ boolean canRemoveSelf = !getLoginUser().isRoot()
+ && SecurityUtils.getPrevUserId().equals(0L)
+ && 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<User>() {
@@ -38,17 +51,8 @@ public class MyProfilePage extends MyPage {
}
}));
+ add(new WebMarkupContainer("delete").setVisible(false));
}
-
- add(new UserDeleteLink("delete") {
-
- @Override
- protected User getUser() {
- return getLoginUser();
- }
-
- }.setVisible(getLoginUser().isExternalManaged()));
-
}
@Override
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.java
index e090dc43db..13bce1ed99 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
@@ -109,7 +109,7 @@ public class LoginPage extends SimplePage {
};
- form.add(new FencedFeedbackPanel("feedback"));
+ form.add(new FencedFeedbackPanel("feedback", form));
if (errorMessage != null)
form.error(errorMessage);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LogoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LogoutPage.java
index 2f6d54dcaa..8da9745f02 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LogoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LogoutPage.java
@@ -1,31 +1,20 @@
package io.onedev.server.web.page.simple.security;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.web.WebSession;
-import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;
import io.onedev.server.web.page.base.BasePage;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
@SuppressWarnings("serial")
public class LogoutPage extends BasePage {
public LogoutPage(PageParameters params) {
super(params);
-
WebSession.get().logout();
-
- SsoProcessPage.clearConnectorCookie();
-
- if (getLoginUser() != null || OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess())
- getSession().warn("You've been logged out");
-
- if (OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess())
- throw new RestartResponseException(getApplication().getHomePage());
- else
- throw new RestartResponseException(LoginPage.class);
+ getSession().warn("You've been logged out");
+ throw new RestartResponseException(getApplication().getHomePage());
}
}