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/02/13 23:42:49 UTC
[1/3] archiva-redback-core git commit: Escape user DN used to build
group filter. Fixes MRM-1873
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 <ch...@gmail.com>
Authored: Thu Feb 12 10:49:42 2015 -0600
Committer: Chris Heyne <ch...@nd.gov>
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(
[3/3] archiva-redback-core git commit: fix MRM-1873
Posted by ol...@apache.org.
fix 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/3258c66a
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/3258c66a
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/3258c66a
Branch: refs/heads/master
Commit: 3258c66af1e2091840f3932952f8f412212808c5
Parents: 8f99e1a 43e0161
Author: Olivier Lamy <ol...@apache.org>
Authored: Sat Feb 14 09:42:29 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Feb 14 09:42:29 2015 +1100
----------------------------------------------------------------------
.../archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
[2/3] archiva-redback-core git commit: plugin version inherited from
parent(
Posted by ol...@apache.org.
plugin version inherited from parent(
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/43e01615
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/43e01615
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/43e01615
Branch: refs/heads/master
Commit: 43e016158379b2ab8fcc96193e3212fad152207e
Parents: 221aa62
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Feb 12 21:45:49 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Feb 14 09:41:56 2015 +1100
----------------------------------------------------------------------
redback-features/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/43e01615/redback-features/pom.xml
----------------------------------------------------------------------
diff --git a/redback-features/pom.xml b/redback-features/pom.xml
index 1a4d5ab..f511d4c 100644
--- a/redback-features/pom.xml
+++ b/redback-features/pom.xml
@@ -68,7 +68,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>attach-artifact</id>