The Unified and Autonomous Development Platform
fix issue #25 and fix issue #26
Robin Shen00284855d29b
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.javaindex 5317be2c9b..c4d9420488 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java@@ -12,9 +12,9 @@ public class Authenticated {private final Collection<String> groupNames;- public Authenticated(@Nullable String fullName, @Nullable String email, Collection<String> groupNames) {- this.fullName = fullName;+ public Authenticated(String email, @Nullable String fullName, Collection<String> groupNames) {this.email = email;+ this.fullName = fullName;this.groupNames = groupNames;}@@ -23,7 +23,6 @@ public class Authenticated {return fullName;}- @Nullablepublic String getEmail() {return email;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.javaindex 3a03c5eefc..1a01e0df94 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java@@ -22,6 +22,7 @@ import javax.naming.directory.SearchControls;import javax.naming.directory.SearchResult;import javax.validation.constraints.NotNull;+import org.apache.shiro.authc.AccountException;import org.apache.shiro.authc.UnknownAccountException;import org.apache.shiro.authc.UsernamePasswordToken;import org.hibernate.validator.constraints.NotEmpty;@@ -129,9 +130,9 @@ public class LdapAuthenticator extends Authenticator {}@Editable(order=800, description=""- + "Optionally specifies name of the attribute inside the user LDAP entry whose value will be taken as user "- + "email. This field is normally set to <i>mail</i> according to RFC 2798. If left empty, email of the user "- + "will not be retrieved")+ + "Specifies name of the attribute inside the user LDAP entry whose value will be taken as user "+ + "email. This field is normally set to <i>mail</i> according to RFC 2798")+ @NotEmptypublic String getUserEmailAttribute() {return userEmailAttribute;}@@ -171,8 +172,7 @@ public class LdapAuthenticator extends Authenticator {List<String> attributeNames = new ArrayList<String>();if (getUserFullNameAttribute() != null)attributeNames.add(getUserFullNameAttribute());- if (getUserEmailAttribute() != null)- attributeNames.add(getUserEmailAttribute());+ attributeNames.add(getUserEmailAttribute());if (getGroupRetrieval() instanceof GetGroupsUsingAttribute) {GetGroupsUsingAttribute groupRetrieval = (GetGroupsUsingAttribute)getGroupRetrieval();attributeNames.add(groupRetrieval.getUserGroupsAttribute());@@ -246,14 +246,12 @@ public class LdapAuthenticator extends Authenticator {if (attribute != null && attribute.get() != null)fullName = (String) attribute.get();}- if (getUserEmailAttribute() != null) {- Attribute attribute = searchResultAttributes.get(getUserEmailAttribute());- if (attribute != null && attribute.get() != null)- email = (String) attribute.get();- }+ Attribute attribute = searchResultAttributes.get(getUserEmailAttribute());+ if (attribute != null && attribute.get() != null)+ email = (String) attribute.get();if (getGroupRetrieval() instanceof GetGroupsUsingAttribute) {GetGroupsUsingAttribute groupRetrieval = (GetGroupsUsingAttribute) getGroupRetrieval();- Attribute attribute = searchResultAttributes.get(+ attribute = searchResultAttributes.get(groupRetrieval.getUserGroupsAttribute());if (attribute != null) {for (NamingEnumeration<?> e = attribute.getAll(); e.hasMore();) {@@ -333,7 +331,10 @@ public class LdapAuthenticator extends Authenticator {"'follow referrals' to true to avoid this exception.", pre);}}- return new Authenticated(fullName, email, groupNames);+ if (email == null)+ throw new AccountException("Email is required but not available in ldap directory");+ else+ return new Authenticated(email, fullName, groupNames);} catch (NamingException e) {throw new RuntimeException(e);} finally {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 39f5bec6d0..01c88a4811 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@@ -66,7 +66,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {private final UserManager userManager;- private final SettingManager configManager;+ private final SettingManager settingManager;private final MembershipManager membershipManager;@@ -83,7 +83,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {new MetaDataKey<Map<Long, AuthorizationInfo>>() {};@Inject- public OneAuthorizingRealm(UserManager userManager, SettingManager configManager,+ public OneAuthorizingRealm(UserManager userManager, SettingManager settingManager,MembershipManager membershipManager, GroupManager groupManager,ProjectManager projectManager, SessionManager sessionManager,TransactionManager transactionManager) {@@ -92,7 +92,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {setCredentialsMatcher(passwordMatcher);this.userManager = userManager;- this.configManager = configManager;+ this.settingManager = settingManager;this.membershipManager = membershipManager;this.groupManager = groupManager;this.projectManager = projectManager;@@ -202,7 +202,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {return user;if (user == null || StringUtils.isBlank(user.getPassword())) {- Authenticator authenticator = configManager.getAuthenticator();+ Authenticator authenticator = settingManager.getAuthenticator();if (authenticator != null) {Authenticated authenticated;try {@@ -217,8 +217,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {}}if (user != null) {- if (authenticated.getEmail() != null)- user.setEmail(authenticated.getEmail());+ user.setEmail(authenticated.getEmail());if (authenticated.getFullName() != null)user.setFullName(authenticated.getFullName());diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.htmlindex cea9cbd9fa..9a06146d09 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html@@ -3,7 +3,7 @@<form wicket:id="authenticator" class="authenticator leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save setting">+ <button wicket:id="save" class="btn btn-primary dirty-aware">Save setting</button><input wicket:id="test" type="submit" class="btn btn-primary" value="Test setting"></div></form>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 abc92a8133..575a554951 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@@ -2,7 +2,6 @@ package io.onedev.server.web.page.admin.authenticator;import java.io.Serializable;-import org.apache.shiro.authc.AuthenticationException;import org.apache.shiro.authc.UsernamePasswordToken;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -80,90 +79,88 @@ public class AuthenticatorPage extends AdministrationPage {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {- new ModalPanel(target) {-- @Override- protected Component newContent(String id) {- Fragment fragment = new Fragment(id, "testFrag", AuthenticatorPage.this);- BeanEditor tokenEditor = BeanContext.edit("editor", token);- tokenEditor.setOutputMarkupId(true);- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(tokenEditor);- }-- @Override- protected void onSubmit() {- super.onSubmit();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);- target.add(tokenEditor);- target.focusComponent(null);- close();- submitTask(target);- }-- };- form.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- close();- }-- });- form.add(tokenEditor);- form.add(new AjaxButton("ok") {});- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- close();- }-- });- fragment.add(form);- return fragment;- }-- };- target.add(form);- target.focusComponent(null);+ if (editor.isValid()) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ Fragment fragment = new Fragment(id, "testFrag", AuthenticatorPage.this);+ BeanEditor tokenEditor = BeanContext.edit("editor", token);+ tokenEditor.setOutputMarkupId(true);+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(tokenEditor);+ }++ @Override+ protected void onSubmit() {+ super.onSubmit();+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ target.add(tokenEditor);+ target.focusComponent(null);+ close();+ submitTask(target);+ }++ };+ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(tokenEditor);+ form.add(new AjaxButton("ok") {});+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ fragment.add(form);+ return fragment;+ }++ };+ } else {+ target.add(form);+ }}@Overrideprotected String runTask(JobLogger logger) {- try {- Authenticated authenticated = bean.getAuthenticator().authenticate(- new UsernamePasswordToken(token.getUserName(), token.getPassword()));- StringBuilder retrievedInfoBuilder = new StringBuilder();- if (authenticated.getFullName() != null) {- retrievedInfoBuilder.append("Full name: ")- .append(authenticated.getFullName())- .append("\n");- }- if (authenticated.getEmail() != null) {- retrievedInfoBuilder.append("Email: ")- .append(authenticated.getEmail())- .append("\n");- }- if (authenticated.getGroupNames() != null) {- retrievedInfoBuilder.append("Groups: ")- .append(Joiner.on(", ").join(authenticated.getGroupNames()))- .append("\n");- }- StringBuilder messageBuilder =- new StringBuilder("Test successful: authentication passed");- if (retrievedInfoBuilder.length() != 0) {- messageBuilder.append(" with below information retrieved:\n")- .append(retrievedInfoBuilder);- }- return messageBuilder.toString();- } catch (AuthenticationException e) {- return "Test successful: authentication not passed: " + e.getMessage();+ Authenticated authenticated = bean.getAuthenticator().authenticate(+ new UsernamePasswordToken(token.getUserName(), token.getPassword()));+ StringBuilder retrievedInfoBuilder = new StringBuilder();+ if (authenticated.getFullName() != null) {+ retrievedInfoBuilder.append("Full name: ")+ .append(authenticated.getFullName())+ .append("\n");+ }+ if (authenticated.getEmail() != null) {+ retrievedInfoBuilder.append("Email: ")+ .append(authenticated.getEmail())+ .append("\n");+ }+ if (authenticated.getGroupNames() != null) {+ retrievedInfoBuilder.append("Groups: ")+ .append(Joiner.on(", ").join(authenticated.getGroupNames()))+ .append("\n");+ }+ StringBuilder messageBuilder =+ new StringBuilder("Test successful: authentication passed");+ if (retrievedInfoBuilder.length() != 0) {+ messageBuilder.append(" with below information retrieved:\n")+ .append(retrievedInfoBuilder);}+ return messageBuilder.toString();}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.javaindex 5f81de0ddc..14cdad33fd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java@@ -5,6 +5,8 @@ import java.util.Arrays;import org.apache.commons.lang3.RandomStringUtils;import org.apache.shiro.SecurityUtils;import org.apache.shiro.authc.AuthenticationException;+import org.apache.shiro.authc.IncorrectCredentialsException;+import org.apache.shiro.authc.UnknownAccountException;import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.RestartResponseException;import org.apache.wicket.markup.head.CssHeaderItem;@@ -113,8 +115,12 @@ public class LoginPage extends BasePage {WebSession.get().login(userName, password, rememberMe);continueToOriginalDestination();setResponsePage(getApplication().getHomePage());+ } catch (IncorrectCredentialsException e) {+ error("Incorrect credentials");+ } catch (UnknownAccountException e) {+ error("Unknown user name");} catch (AuthenticationException ae) {- error("Authentication not passed");+ error(ae.getMessage());}}}