Skip to content

The Unified and Autonomous Development Platform

Improve LDAP group retrieve inline help

Robin Shenabe59de4b38a
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/ActiveDirectoryAuthenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/ActiveDirectoryAuthenticator.java
index c6d913a8ba..c599c8d9d7 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/ActiveDirectoryAuthenticator.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/ActiveDirectoryAuthenticator.java
@@ -3,6 +3,7 @@ package io.onedev.server.model.support.administration.authenticator.ldap;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@Editable(name="Active Directory", order=100)
public class ActiveDirectoryAuthenticator extends LdapAuthenticator {
@@ -64,8 +65,11 @@ public class ActiveDirectoryAuthenticator extends LdapAuthenticator {
}
@Editable(order=1000, description=""
- + "Specify group search base if you want to search groups associated with the user. For example: "
- + "<i>cn=Users, dc=example, dc=com</i>")
+ + "Optionally specify group search base if you want to retrieve group membership information "
+ + "of the user. For example: <i>cn=Users, dc=example, dc=com</i>. To give appropriate "
+ + "permissions to a Active Directory group, a OneDev group with same name should be defined. "
+ + "Leave empty to manage group memberships at OneDev side")
+ @NameOfEmptyValue("Do not retrieve groups")
public String getGroupSearchBase() {
return groupSearchBase;
}
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.java
index 1a01e0df94..193abde0f1 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
@@ -141,7 +141,10 @@ public class LdapAuthenticator extends Authenticator {
this.userEmailAttribute = userEmailAttribute;
}
- @Editable(order=900)
+ @Editable(order=900, description="Specify the strategy to retrieve group membership information. "
+ + "To give appropriate permissions to a LDAP group, a OneDev group with same name "
+ + "should be defined. Use strategy <tt>Do Not Retrieve Groups</tt> if you want to manage "
+ + "group memberships at OneDev side")
@NotNull(message="may not be empty")
public GroupRetrieval getGroupRetrieval() {
return groupRetrieval;
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.java
index 01c88a4811..a69e1e9a7c 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
@@ -239,7 +239,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
}
retrievedGroupNames.add(groupName);
} else {
- logger.debug("Group '{}' from external authenticator is not defined", groupName);
+ logger.warn("Group '{}' from external authenticator is not defined", groupName);
}
}
for (Iterator<Membership> it = user.getMemberships().iterator(); it.hasNext();) {