The Unified and Autonomous Development Platform
fix issue #59: Regression : unable to connect with LDAP account
Robin Shenb5f1f68ebcb6
diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex cd3332d2c4..e69fffb94a 100644--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -197,85 +197,78 @@ public class OneAuthorizingRealm extends AuthorizingRealm {@Overridepublic AuthenticationInfo call() throws Exception {User user = userManager.findByName(((UsernamePasswordToken) token).getUsername());- if (user != null && user.isRoot())- return user;+ Authenticator authenticator;+ if ((user == null || user.getPassword().equals(User.EXTERNAL_MANAGED)) &&+ ((authenticator = settingManager.getAuthenticator()) != null)) {+ Authenticated authenticated;+ try {+ authenticated = authenticator.authenticate((UsernamePasswordToken) token);+ } catch (Exception e) {+ if (e instanceof AuthenticationException) {+ logger.debug("Authentication not passed", e);+ throw ExceptionUtils.unchecked(e);+ } else {+ logger.error("Error authenticating user", e);+ throw new AuthenticationException("Error authenticating user", e);+ }+ }+ if (user != null) {+ user.setEmail(authenticated.getEmail());+ if (authenticated.getFullName() != null)+ user.setFullName(authenticated.getFullName());- if (user == null || user.getPassword().equals(User.EXTERNAL_MANAGED)) {- Authenticator authenticator = settingManager.getAuthenticator();- if (authenticator != null) {- Authenticated authenticated;- try {- authenticated = authenticator.authenticate((UsernamePasswordToken) token);- } catch (Exception e) {- if (e instanceof AuthenticationException) {- logger.debug("Authentication not passed", e);- throw ExceptionUtils.unchecked(e);- } else {- logger.error("Error authenticating user", e);- throw new AuthenticationException("Error authenticating user", e);- }- }- if (user != null) {- user.setEmail(authenticated.getEmail());- if (authenticated.getFullName() != null)- user.setFullName(authenticated.getFullName());-- Collection<String> existingGroupNames = new HashSet<>();- for (Membership membership: user.getMemberships())- existingGroupNames.add(membership.getGroup().getName());- if (!authenticated.getGroupNames().isEmpty()) {- Collection<String> retrievedGroupNames = new HashSet<>();- for (String groupName: authenticated.getGroupNames()) {- Group group = groupManager.find(groupName);- if (group != null) {- if (!existingGroupNames.contains(groupName)) {- Membership membership = new Membership();- membership.setGroup(group);- membership.setUser(user);- membershipManager.save(membership);- user.getMemberships().add(membership);- existingGroupNames.add(groupName);- }- retrievedGroupNames.add(groupName);- } else {- logger.warn("Group '{}' from external authenticator is not defined", groupName);- }- }- for (Iterator<Membership> it = user.getMemberships().iterator(); it.hasNext();) {- Membership membership = it.next();- if (!retrievedGroupNames.contains(membership.getGroup().getName())) {- it.remove();- membershipManager.delete(membership);- }- }- }- userManager.save(user);- } else {- user = new User();- user.setName(((UsernamePasswordToken) token).getUsername());- user.setPassword(User.EXTERNAL_MANAGED);- if (authenticated.getEmail() != null)- user.setEmail(authenticated.getEmail());- if (authenticated.getFullName() != null)- user.setFullName(authenticated.getFullName());- userManager.save(user);- if (authenticated.getGroupNames().isEmpty() && authenticator.getDefaultGroup() != null) {- Group group = groupManager.find(authenticator.getDefaultGroup());+ Collection<String> existingGroupNames = new HashSet<>();+ for (Membership membership: user.getMemberships())+ existingGroupNames.add(membership.getGroup().getName());+ if (!authenticated.getGroupNames().isEmpty()) {+ Collection<String> retrievedGroupNames = new HashSet<>();+ for (String groupName: authenticated.getGroupNames()) {+ Group group = groupManager.find(groupName);if (group != null) {- Membership membership = new Membership();- membership.setGroup(group);- membership.setUser(user);- user.getMemberships().add(membership);- membershipManager.save(membership);+ if (!existingGroupNames.contains(groupName)) {+ Membership membership = new Membership();+ membership.setGroup(group);+ membership.setUser(user);+ membershipManager.save(membership);+ user.getMemberships().add(membership);+ existingGroupNames.add(groupName);+ }+ retrievedGroupNames.add(groupName);} else {- logger.error("Default group '{}' of external authenticator is not defined",- authenticator.getDefaultGroup());+ logger.warn("Group '{}' from external authenticator is not defined", groupName);}- }- }- } else {- user = null;- }+ }+ for (Iterator<Membership> it = user.getMemberships().iterator(); it.hasNext();) {+ Membership membership = it.next();+ if (!retrievedGroupNames.contains(membership.getGroup().getName())) {+ it.remove();+ membershipManager.delete(membership);+ }+ }+ }+ userManager.save(user);+ } else {+ user = new User();+ user.setName(((UsernamePasswordToken) token).getUsername());+ user.setPassword(User.EXTERNAL_MANAGED);+ user.setEmail(authenticated.getEmail());+ if (authenticated.getFullName() != null)+ user.setFullName(authenticated.getFullName());+ userManager.save(user);+ if (authenticated.getGroupNames().isEmpty() && authenticator.getDefaultGroup() != null) {+ Group group = groupManager.find(authenticator.getDefaultGroup());+ if (group != null) {+ Membership membership = new Membership();+ membership.setGroup(group);+ membership.setUser(user);+ user.getMemberships().add(membership);+ membershipManager.save(membership);+ } else {+ logger.error("Default group '{}' of external authenticator is not defined",+ authenticator.getDefaultGroup());+ }+ }+ }}return user;diff --git a/server-core/src/main/java/io/onedev/server/security/OnePasswordService.java b/server-core/src/main/java/io/onedev/server/security/OnePasswordService.javaindex b945595059..ea1d715a8f 100644--- a/server-core/src/main/java/io/onedev/server/security/OnePasswordService.java+++ b/server-core/src/main/java/io/onedev/server/security/OnePasswordService.java@@ -2,6 +2,7 @@ package io.onedev.server.security;import java.util.regex.Pattern;+import javax.inject.Inject;import javax.inject.Singleton;import org.apache.shiro.authc.credential.PasswordService;@@ -9,6 +10,8 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.User;@Singletonpublic class OnePasswordService implements PasswordService {@@ -17,6 +20,13 @@ public class OnePasswordService implements PasswordService {private static final Logger logger = LoggerFactory.getLogger(OnePasswordService.class);+ private final SettingManager settingManager;++ @Inject+ public OnePasswordService(SettingManager settingManager) {+ this.settingManager = settingManager;+ }+@Overridepublic String encryptPassword(Object plaintextPassword) throws IllegalArgumentException {String str;@@ -32,26 +42,30 @@ public class OnePasswordService implements PasswordService {@Overridepublic boolean passwordsMatch(Object submittedPlaintext, String encrypted) {- String raw;+ if (User.EXTERNAL_MANAGED.equals(encrypted) && settingManager.getAuthenticator() != null) {+ return true;+ } else {+ String raw;- if (submittedPlaintext instanceof char[])- raw = new String((char[]) submittedPlaintext);- else if (submittedPlaintext instanceof String)- raw = (String) submittedPlaintext;- else- throw new IllegalArgumentException("Unsupported password type " + submittedPlaintext.getClass());+ if (submittedPlaintext instanceof char[])+ raw = new String((char[]) submittedPlaintext);+ else if (submittedPlaintext instanceof String)+ raw = (String) submittedPlaintext;+ else+ throw new IllegalArgumentException("Unsupported password type " + submittedPlaintext.getClass());- if (StringUtils.isBlank(encrypted)) {- logger.warn("Empty encoded password");- return false;- }+ if (StringUtils.isBlank(encrypted)) {+ logger.warn("Empty encoded password");+ return false;+ }- if (!BCRYPT_PATTERN.matcher(encrypted).matches()) {- logger.warn("Encoded password does not look like BCrypt");- return false;- }+ if (!BCRYPT_PATTERN.matcher(encrypted).matches()) {+ logger.warn("Encoded password does not look like BCrypt");+ return false;+ }- return BCrypt.checkpw(raw, encrypted);+ return BCrypt.checkpw(raw, encrypted);+ }}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.javaindex 3d9e92799b..70ec93f8e1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java@@ -47,6 +47,7 @@ public abstract class BeanEditModalPanel extends ModalPanel {@Overrideprotected void onCancel(AjaxRequestTarget target) {close();+ BeanEditModalPanel.this.onCancel(target);}@Override@@ -74,4 +75,7 @@ public abstract class BeanEditModalPanel extends ModalPanel {protected abstract void onSave(AjaxRequestTarget target, Serializable bean);+ protected void onCancel(AjaxRequestTarget target) {+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.javaindex ffde11ff35..79c780f856 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.java@@ -27,6 +27,7 @@ public abstract class ConfirmModal extends ModalPanel {@Overrideprotected void onCancel(AjaxRequestTarget target) {close();+ ConfirmModal.this.onCancel(target);}@Override@@ -44,6 +45,9 @@ public abstract class ConfirmModal extends ModalPanel {protected abstract void onConfirm(AjaxRequestTarget target);+ protected void onCancel(AjaxRequestTarget target) {+ }+@Nullableprotected abstract String getConfirmInput();diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.htmlindex 0720ba6f87..5b6243bcf7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html@@ -17,6 +17,11 @@<wicket:fragment wicket:id="nameFrag"><a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a></wicket:fragment>+ <wicket:fragment wicket:id="authenticatorFrag">+ <div class="checkbox">+ <label><input wicket:id="external" type="checkbox"> Use External</label>+ </div>+ </wicket:fragment><wicket:fragment wicket:id="actionFrag"><a wicket:id="impersonate" title="Impersonate this user"><i class="fa fa-user-circle"></i></a><a wicket:id="delete" title="Delete this user"><i class="fa fa-trash"></i></a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.javaindex e4a4616708..c4a34194a5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java@@ -1,20 +1,27 @@package io.onedev.server.web.page.admin.user;+import java.io.Serializable;import java.util.ArrayList;import java.util.Iterator;import java.util.List;import org.apache.commons.lang.StringUtils;+import org.apache.shiro.authc.credential.PasswordService;+import org.apache.wicket.Component;+import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;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.IColumn;import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;@@ -27,18 +34,24 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;+import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;+import io.onedev.server.web.component.modal.confirm.ConfirmModal;import io.onedev.server.web.component.user.UserDeleteLink;import io.onedev.server.web.component.user.avatar.UserAvatar;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Password;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;@@ -145,6 +158,109 @@ public class UserListPage extends AdministrationPage {}});+ if (OneDev.getInstance(SettingManager.class).getAuthenticator() != null) {+ columns.add(new AbstractColumn<User, Void>(Model.of("Authenticator")) {++ private Component newCheckBox(String componentId, IModel<User> userModel) {+ boolean useExternal = userModel.getObject().getPassword().equals(User.EXTERNAL_MANAGED);+ CheckBox checkbox = new CheckBox(componentId, Model.of(useExternal)) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(!userModel.getObject().isRoot());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (userModel.getObject().isRoot()) {+ tag.put("disabled", "disabled");+ tag.put("title", "Administrator always authenticate via internal database");+ }+ }++ };++ checkbox.add(new OnChangeAjaxBehavior() {++ private void refresh(AjaxRequestTarget target) {+ Component newCheckbox = newCheckBox(componentId, userModel);+ checkbox.replaceWith(newCheckbox);+ target.add(newCheckbox);+ }++ @Override+ public void onUpdate(AjaxRequestTarget target) {+ User user = userModel.getObject();+ if (user.getPassword().equals(User.EXTERNAL_MANAGED)) {+ PasswordBean bean = new PasswordBean();+ new BeanEditModalPanel(target, bean) {++ @Override+ protected void onSave(AjaxRequestTarget target, Serializable bean) {+ User user = userModel.getObject();+ user.setPassword(OneDev.getInstance(PasswordService.class).encryptPassword(((PasswordBean) bean).getPassword()));+ OneDev.getInstance(UserManager.class).save(user);+ refresh(target);+ close();+ Session.get().success("Switched to authenticate via internal database");+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ super.onCancel(target);+ refresh(target);+ }++ };+ } else {+ new ConfirmModal(target) {++ @Override+ protected void onConfirm(AjaxRequestTarget target) {+ user.setPassword(User.EXTERNAL_MANAGED);+ OneDev.getInstance(UserManager.class).save(user);+ refresh(target);+ Session.get().success("Switched to use external authenticator");+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ super.onCancel(target);+ refresh(target);+ }++ @Override+ protected String getConfirmMessage() {+ return "This will clear password of user '" + userModel.getObject().getDisplayName()+ + "' from internal database, and use external authenticator instead. Do you really want to continue?";+ }++ @Override+ protected String getConfirmInput() {+ return null;+ }++ };+ }+ }++ }).setOutputMarkupId(true);++ return checkbox;+ }++ @Override+ public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId, IModel<User> rowModel) {+ Fragment fragment = new Fragment(componentId, "authenticatorFrag", UserListPage.this);+ fragment.add(newCheckBox("external", rowModel));+ cellItem.add(fragment);+ }++ });+ }+columns.add(new AbstractColumn<User, Void>(Model.of("")) {@Override@@ -241,4 +357,23 @@ public class UserListPage extends AdministrationPage {response.render(CssHeaderItem.forReference(new UserCssResourceReference()));}+ @Editable(name="Authenticate via Internal Database")+ public static class PasswordBean implements Serializable {++ private String password;++ @Editable(order=200, name="Specify User Password",+ description="To authenticate via internal database, you need to specify password of the user")+ @Password(confirmative=true)+ @NotEmpty+ public String getPassword() {+ return password;+ }++ public void setPassword(String password) {+ this.password = password;+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.javaindex 1ec011c62b..7586004ced 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java@@ -1,7 +1,12 @@package io.onedev.server.web.page.admin.user.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.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.User;import io.onedev.server.web.component.user.passwordedit.PasswordEditPanel;import io.onedev.server.web.page.admin.user.UserPage;@@ -16,7 +21,13 @@ public class UserPasswordPage extends UserPage {protected void onInitialize() {super.onInitialize();- add(new PasswordEditPanel("content", userModel));+ if (OneDev.getInstance(SettingManager.class).getAuthenticator() != null+ && getUser().getPassword().equals(User.EXTERNAL_MANAGED)) {+ String 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-warning")));+ } else {+ add(new PasswordEditPanel("content", userModel));+ }}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.cssindex d0467a8082..b7a9bc1d90 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css@@ -52,6 +52,9 @@width: 360px;}+.user.list .checkbox {+ margin: 0;+}.new-user .actions .btn {margin-right: 20px;}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 0e3854334a..59fac89e33 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,8 +1,12 @@package io.onedev.server.web.page.my.password;+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.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;import io.onedev.server.web.component.user.passwordedit.PasswordEditPanel;import io.onedev.server.web.page.my.MyPage;@@ -18,14 +22,20 @@ public class MyPasswordPage extends MyPage {protected void onInitialize() {super.onInitialize();- add(new PasswordEditPanel("content", new AbstractReadOnlyModel<User>() {+ if (OneDev.getInstance(SettingManager.class).getAuthenticator() != null+ && getLoginUser().getPassword().equals(User.EXTERNAL_MANAGED)) {+ String message = "You are currently authenticated via external system, please change password there instead";+ add(new Label("content", message).add(AttributeAppender.append("class", "alert alert-warning")));+ } else {+ add(new PasswordEditPanel("content", new AbstractReadOnlyModel<User>() {- @Override- public User getObject() {- return getLoginUser();- }-- }));+ @Override+ public User getObject() {+ return getLoginUser();+ }++ }));+ }}}