| commit | d0bc52fff1d8901decff5b16dd2e6ed07bb67354 | [log] [tgz] |
|---|---|---|
| author | Sascha Vogt <s.vogt@seeburger.de> | Thu May 28 12:00:34 2015 +0200 |
| committer | Sascha Vogt <s.vogt@seeburger.de> | Thu May 28 12:00:34 2015 +0200 |
| tree | 255ec800a60ce11a9c3a4b2979ed9d0468a6f7ea | |
| parent | fc28ad1769e458c7aa2ec353d3f606907bca515c [diff] |
Fix for MRM-1873 which broke AD group assignments Escaping only needed in the LDAP filter string
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 @@ 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 );