Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-25 05:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-963: LDAP Group Search Root

Browse Source 
http://jira.springframework.org/browse/SEC-963. Changed namespace instances of DefaultAuthoritiesPopulator to use the root as the default search location.
This commit is contained in:
Luke Taylor 2008-08-26 13:51:01 +00:00
parent 83868a7334
commit a4e4120443
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParser.java
View File

@ -23,7 +23,7 @@ public class LdapUserServiceBeanDefinitionParser extends AbstractUserDetailsServ
public static final String ATT_GROUP_SEARCH_BASE = "group-search-base"; public static final String ATT_GROUP_SEARCH_BASE = "group-search-base";
public static final String ATT_GROUP_ROLE_ATTRIBUTE = "group-role-attribute"; public static final String ATT_GROUP_ROLE_ATTRIBUTE = "group-role-attribute";
public static final String DEF_GROUP_SEARCH_FILTER = "(uniqueMember={0})"; public static final String DEF_GROUP_SEARCH_FILTER = "(uniqueMember={0})";
public static final String DEF_GROUP_SEARCH_BASE = "ou=groups"; public static final String DEF_GROUP_SEARCH_BASE = "";
static final String ATT_ROLE_PREFIX = "role-prefix"; static final String ATT_ROLE_PREFIX = "role-prefix";
static final String ATT_USER_CLASS = "user-details-class"; static final String ATT_USER_CLASS = "user-details-class";
@ -94,14 +94,14 @@ public class LdapUserServiceBeanDefinitionParser extends AbstractUserDetailsServ
} }
static RootBeanDefinition parseUserDetailsClass(Element elt, ParserContext parserContext) { static RootBeanDefinition parseUserDetailsClass(Element elt, ParserContext parserContext) {
String userDetailsClass = elt.getAttribute(ATT_USER_CLASS); String userDetailsClass = elt.getAttribute(ATT_USER_CLASS);
if (OPT_PERSON.equals(userDetailsClass)) { if (OPT_PERSON.equals(userDetailsClass)) {
return new RootBeanDefinition(PERSON_MAPPER_CLASS, null, null); return new RootBeanDefinition(PERSON_MAPPER_CLASS, null, null);
} else if (OPT_INETORGPERSON.equals(userDetailsClass)) { } else if (OPT_INETORGPERSON.equals(userDetailsClass)) {
return new RootBeanDefinition(INET_ORG_PERSON_MAPPER_CLASS, null, null); return new RootBeanDefinition(INET_ORG_PERSON_MAPPER_CLASS, null, null);
} }
return new RootBeanDefinition(LDAP_USER_MAPPER_CLASS, null, null); return new RootBeanDefinition(LDAP_USER_MAPPER_CLASS, null, null);
} }
static RootBeanDefinition parseAuthoritiesPopulator(Element elt, ParserContext parserContext) { static RootBeanDefinition parseAuthoritiesPopulator(Element elt, ParserContext parserContext) {

2
core/src/main/resources/org/springframework/security/config/spring-security-2.0.4.rnc
View File

@ -89,7 +89,7 @@ group-search-filter-attribute =
## Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user. ## Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user.
attribute group-search-filter {xsd:string} attribute group-search-filter {xsd:string}
group-search-base-attribute = group-search-base-attribute =
## Search base for group membership searches. Defaults to "ou=groups". ## Search base for group membership searches. Defaults to "" (searching from the root).
attribute group-search-base {xsd:string} attribute group-search-base {xsd:string}
user-search-filter-attribute = user-search-filter-attribute =
## The LDAP filter used to search for users (optional). For example "(uid={0})". The substituted parameter is the user's login name. ## The LDAP filter used to search for users (optional). For example "(uid={0})". The substituted parameter is the user's login name.

2
core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
View File

@ -222,7 +222,7 @@
<xs:attribute name="group-search-base" use="required" type="xs:string"> <xs:attribute name="group-search-base" use="required" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>Search base for group membership searches. Defaults to <xs:documentation>Search base for group membership searches. Defaults to
"ou=groups".</xs:documentation> "" (searching from the root).</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
</xs:attributeGroup> </xs:attributeGroup>