Repository: archiva-redback-core Updated Branches: refs/heads/master 8f99e1a6f -> 3258c66af
Escape user DN used to build group filter. Fixes MRM-1873 Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/221aa62c Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/221aa62c Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/221aa62c Branch: refs/heads/master Commit: 221aa62c8f733adbfd2aacdf62333bd0a708bffc Parents: 458bcde Author: Chris Heyne <[email protected]> Authored: Thu Feb 12 10:49:42 2015 -0600 Committer: Chris Heyne <[email protected]> Committed: Thu Feb 12 10:57:02 2015 -0600 ---------------------------------------------------------------------- .../archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/221aa62c/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java ---------------------------------------------------------------------- diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java index 572e9c7..101d156 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java @@ -48,6 +48,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import javax.naming.ldap.Rdn; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -390,6 +391,9 @@ public class DefaultLdapRoleMapper } groupEntry = builder.toString(); } + + groupEntry = Rdn.escapeValue(groupEntry); + String filter = new StringBuilder().append( "(&" ).append( "(objectClass=" + getLdapGroupClass() + ")" ).append( "(" ).append( getLdapGroupMember() ).append( "=" ).append( groupEntry ).append( ")" ).append(
