Skip to content

The Unified and Autonomous Development Platform

Fix issue #1183 - LDAP account and local account coexist

Robin Shenc3f03ffe095b
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
index 56b97b891e..965a2d9cc3 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
@@ -32,6 +32,12 @@ 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);
+
/**
* Find root user in the system.
*
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index 8ba3d4ae78..bb5d5bf53a 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
@@ -1,8 +1,5 @@
package io.onedev.server.entitymanager.impl;
-import static io.onedev.server.model.User.PROP_PASSWORD;
-import static io.onedev.server.model.User.PROP_SSO_CONNECTOR;
-
import java.util.Collection;
import java.util.List;
@@ -14,6 +11,8 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
+import io.onedev.server.util.CryptoUtils;
+import org.apache.shiro.authc.credential.PasswordService;
import org.apache.shiro.authz.Permission;
import org.hibernate.ReplicationMode;
import org.hibernate.criterion.Restrictions;
@@ -58,6 +57,8 @@ import io.onedev.server.util.usage.Usage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static io.onedev.server.model.User.*;
+
@Singleton
public class DefaultUserManager extends BaseEntityManager<User> implements UserManager {
@@ -78,14 +79,17 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
private final TransactionManager transactionManager;
private final ClusterManager clusterManager;
+
+ private final PasswordService passwordService;
private volatile UserCache cache;
@Inject
public DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,
- IssueFieldManager issueFieldManager, IdManager idManager, GroupManager groupManager,
- EmailAddressManager emailAddressManager, TransactionManager transactionManager,
- ClusterManager clusterManager) {
+ IssueFieldManager issueFieldManager, IdManager idManager,
+ GroupManager groupManager, EmailAddressManager emailAddressManager,
+ TransactionManager transactionManager, ClusterManager clusterManager,
+ PasswordService passwordService) {
super(dao);
this.projectManager = projectManager;
@@ -96,6 +100,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
this.transactionManager = transactionManager;
this.groupManager = groupManager;
this.clusterManager = clusterManager;
+ this.passwordService = passwordService;
}
@Transactional
@@ -246,7 +251,32 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
dao.remove(user);
}
+
+ @Transactional
+ @Override
+ public void delete(Collection<User> users) {
+ for (var user: users)
+ delete(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);
+ }
+ }
+
@Sessional
@Override
public User findByName(String userName) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html
index 994b8edf34..3f20ebdde9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html
@@ -7,6 +7,11 @@
</div>
<a wicket:id="addNew" class="btn btn-icon btn-primary flex-shrink-0"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
+ <div class="mb-4">
+ <a wicket:id="operations" class="text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="ellipsis-circle" class="icon rotate-180"></wicket:svg> Operations
+ </a>
+ </div>
<table wicket:id="users" class="users table table-hover"></table>
</div>
</div>
@@ -15,7 +20,6 @@
</wicket:fragment>
<wicket:fragment wicket:id="actionsFrag">
<a wicket:id="impersonate" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Impersonate this user"><wicket:svg href="user-tick" class="icon align-middle"/></a>
- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this user"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>
</wicket:fragment>
<wicket:fragment wicket:id="emailFrag">
<span wicket:id="emailAddress"></span>
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.java
index 8cda539247..cb822fec9d 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
@@ -1,14 +1,33 @@
package io.onedev.server.web.page.admin.usermanagement;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
+import com.google.common.collect.Sets;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.EmailAddress;
+import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.UserCache;
+import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.WebSession;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.component.EmailAddressVerificationStatusBadge;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.ActionablePageLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.menu.MenuLink;
+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
+import io.onedev.server.web.component.user.UserAvatar;
+import io.onedev.server.web.page.HomePage;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;
+import io.onedev.server.web.util.LoadableDetachableDataProvider;
+import io.onedev.server.web.util.PagingHistorySupport;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
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.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
@@ -30,28 +49,12 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.google.common.collect.Sets;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.EmailAddress;
-import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.Similarities;
-import io.onedev.server.util.facade.UserCache;
-import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.WebSession;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.EmailAddressVerificationStatusBadge;
-import io.onedev.server.web.component.datatable.DefaultDataTable;
-import io.onedev.server.web.component.link.ActionablePageLink;
-import io.onedev.server.web.component.user.UserAvatar;
-import io.onedev.server.web.page.HomePage;
-import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;
-import io.onedev.server.web.util.LoadableDetachableDataProvider;
-import io.onedev.server.web.util.PagingHistorySupport;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
@SuppressWarnings("serial")
public class UserListPage extends AdministrationPage {
@@ -59,7 +62,7 @@ public class UserListPage extends AdministrationPage {
private static final String PARAM_PAGE = "page";
private static final String PARAM_QUERY = "query";
-
+
private final IModel<List<User>> usersModel = new LoadableDetachableModel<List<User>>() {
@Override
@@ -83,6 +86,10 @@ public class UserListPage extends AdministrationPage {
private TextField<String> searchField;
private DataTable<User, Void> usersTable;
+
+ private SortableDataProvider<User, Void> dataProvider;
+
+ private SelectionColumn<User, Void> selectionColumn;
private String query;
@@ -101,6 +108,7 @@ public class UserListPage extends AdministrationPage {
getPageParameters().set(PARAM_QUERY, query);
target.add(searchField);
target.add(usersTable);
+ selectionColumn.getSelections().clear();
}
@Override
@@ -141,6 +149,7 @@ public class UserListPage extends AdministrationPage {
usersTable.setCurrentPage(0);
target.add(usersTable);
+ selectionColumn.getSelections().clear();
typing = true;
}
@@ -169,8 +178,411 @@ public class UserListPage extends AdministrationPage {
}
});
+
+ add(new MenuLink("operations") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+
+ 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
+ public String getLabel() {
+ return "Delete Selected Users";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+
+ for (var model: selectionColumn.getSelections()) {
+ var user = model.getObject();
+ if (user.isRoot()) {
+ Session.get().error("Can not delete root account");
+ return;
+ } else if (user.equals(SecurityUtils.getUser())) {
+ Session.get().error("Can not delete yourself");
+ return;
+ }
+ }
+
+ new ConfirmModalPanel(target) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ getUserManager().delete(selectionColumn.getSelections().stream().map(IModel::getObject).collect(Collectors.toSet()));
+ target.add(usersTable);
+ selectionColumn.getSelections().clear();
+ Session.get().success("Users deleted successfully");
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Type <code>yes</code> below to confirm deleting selected users";
+ }
+
+ @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 delete");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ 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() {
+
+ @Override
+ public String getLabel() {
+ return "Delete All Queried Users";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+
+ for (Iterator<User> it = (Iterator<User>) dataProvider.iterator(0, usersTable.getItemCount()); it.hasNext();) {
+ var user = it.next();
+ if (user.isRoot()) {
+ Session.get().error("Can not delete root account");
+ return;
+ } else if (user.equals(SecurityUtils.getUser())) {
+ Session.get().error("Can not delete yourself");
+ return;
+ }
+ }
+
+ 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().delete(users);
+ target.add(usersTable);
+ dataProvider.detach();
+ usersModel.detach();
+ selectionColumn.getSelections().clear();
+
+ Session.get().success("Users deleted successfully");
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Type <code>yes</code> below to confirm deleting all queried users";
+ }
+
+ @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 delete");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ return menuItems;
+ }
+
+ });
List<IColumn<User, Void>> columns = new ArrayList<>();
+
+ columns.add(selectionColumn = new SelectionColumn<User, Void>());
columns.add(new AbstractColumn<User, Void>(Model.of("Login Name")) {
@@ -255,47 +667,6 @@ public class UserListPage extends AdministrationPage {
public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId, IModel<User> rowModel) {
Fragment fragment = new Fragment(componentId, "actionsFrag", UserListPage.this);
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- User user = rowModel.getObject();
- OneDev.getInstance(UserManager.class).delete(user);
- Session.get().success("User '" + user.getDisplayName() + "' deleted");
-
- target.add(usersTable);
- }
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
-
- User user = rowModel.getObject();
- String message = "Do you really want to delete user '" + user.getDisplayName() + "'?";
- attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- if (!isEnabled())
- tag.put("disabled", "disabled");
- User user = rowModel.getObject();
- if (user.isRoot())
- tag.put("title", "Root user can not be deleted");
- else if (user.equals(SecurityUtils.getUser()))
- tag.put("title", "You can not delete yourself");
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- User user = rowModel.getObject();
- setEnabled(!user.isRoot() && !user.equals(SecurityUtils.getUser()));
- }
-
- });
-
fragment.add(new Link<Void>("impersonate") {
@Override
@@ -316,7 +687,7 @@ public class UserListPage extends AdministrationPage {
});
- SortableDataProvider<User, Void> dataProvider = new LoadableDetachableDataProvider<User, Void>() {
+ dataProvider = new LoadableDetachableDataProvider<User, Void>() {
@Override
public Iterator<? extends User> iterator(long first, long count) {
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.java
index d0060f0d22..4ba6d12d72 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
@@ -83,6 +83,7 @@ public class PasswordResetPage extends SimplePage {
if (settingManager.getMailSetting() != null) {
String password = CryptoUtils.generateSecret();
user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password));
+ user.setSsoConnector(null);
userManager.save(user);
MailManager mailManager = OneDev.getInstance(MailManager.class);