You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2015/06/08 12:46:30 UTC
archiva-redback-core git commit: Fix for MRM-1873 which broke AD
group assignments
Repository: archiva-redback-core
Updated Branches:
refs/heads/master fc28ad176 -> d0bc52fff
Fix for MRM-1873 which broke AD group assignments
Escaping only needed in the LDAP filter string
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/d0bc52ff
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/d0bc52ff
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/d0bc52ff
Branch: refs/heads/master
Commit: d0bc52fff1d8901decff5b16dd2e6ed07bb67354
Parents: fc28ad1
Author: Sascha Vogt <s....@seeburger.de>
Authored: Thu May 28 12:00:34 2015 +0200
Committer: Sascha Vogt <s....@seeburger.de>
Committed: Thu May 28 12:00:34 2015 +0200
----------------------------------------------------------------------
.../archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/d0bc52ff/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 101d156..369ff17 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
@@ -392,11 +392,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(
+ "(" ).append( getLdapGroupMember() ).append( "=" ).append( Rdn.escapeValue(groupEntry) ).append( ")" ).append(
")" ).toString();
log.debug( "filter: {}", filter );