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/10/25 11:29:08 UTC
[1/2] archiva-redback-core git commit: Allowing filtering of LDAP
groups
Repository: archiva-redback-core
Updated Branches:
refs/heads/master 7142138dc -> ae4d7f775
Allowing filtering of LDAP groups
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/e546fe3b
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/e546fe3b
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/e546fe3b
Branch: refs/heads/master
Commit: e546fe3bc0c08ecc022e421058abb97f06b7acc4
Parents: 7142138
Author: Mat Jaggard <gi...@jaggard.org.uk>
Authored: Fri Oct 23 11:01:44 2015 +0100
Committer: Mat Jaggard <gi...@jaggard.org.uk>
Committed: Fri Oct 23 11:01:44 2015 +0100
----------------------------------------------------------------------
.../redback/common/ldap/role/DefaultLdapRoleMapper.java | 9 +++++++++
.../redback/configuration/UserConfigurationKeys.java | 2 ++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/e546fe3b/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 369ff17..d7f2ead 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
@@ -92,6 +92,8 @@ public class DefaultLdapRoleMapper
private String groupsDn;
+ private String groupFilter;
+
private String baseDn;
private String ldapGroupMember = "uniquemember";
@@ -120,6 +122,8 @@ public class DefaultLdapRoleMapper
this.groupsDn = this.baseDn;
}
+ this.groupFilter = userConf.getString( UserConfigurationKeys.LDAP_GROUPS_FILTER, this.groupFilter );
+
this.useDefaultRoleName =
userConf.getBoolean( UserConfigurationKeys.LDAP_GROUPS_USE_ROLENAME, this.useDefaultRoleName );
@@ -145,6 +149,11 @@ public class DefaultLdapRoleMapper
String filter = "objectClass=" + getLdapGroupClass();
+ if ( !StringUtils.isEmpty( this.groupFilter ) )
+ {
+ filter = "&(" + filter + ")(" + this.groupFilter + ")";
+ }
+
namingEnumeration = context.search( getGroupsDn(), filter, searchControls );
List<String> allGroups = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/e546fe3b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
----------------------------------------------------------------------
diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
index e4541dd..a61802b 100644
--- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
+++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
@@ -84,6 +84,8 @@ public interface UserConfigurationKeys
String LDAP_GROUPS_BASEDN = "ldap.config.groups.base.dn";
+ String LDAP_GROUPS_FILTER = "ldap.config.groups.filter";
+
String LDAP_GROUPS_MEMBER = "ldap.config.groups.member";
String LDAP_GROUPS_ROLE_START_KEY = "ldap.config.groups.role.";
[2/2] archiva-redback-core git commit: Fixed issue with syntax for
filter
Posted by ol...@apache.org.
Fixed issue with syntax for filter
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/ae4d7f77
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/ae4d7f77
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/ae4d7f77
Branch: refs/heads/master
Commit: ae4d7f775ecfad1c464a8a7459f0dcefc65d756b
Parents: e546fe3
Author: Mat Jaggard <gi...@jaggard.org.uk>
Authored: Fri Oct 23 13:35:31 2015 +0100
Committer: Mat Jaggard <gi...@jaggard.org.uk>
Committed: Fri Oct 23 13:35:31 2015 +0100
----------------------------------------------------------------------
.../archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/ae4d7f77/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 d7f2ead..c4193a5 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
@@ -151,7 +151,7 @@ public class DefaultLdapRoleMapper
if ( !StringUtils.isEmpty( this.groupFilter ) )
{
- filter = "&(" + filter + ")(" + this.groupFilter + ")";
+ filter = "(&(" + filter + ")(" + this.groupFilter + "))";
}
namingEnumeration = context.search( getGroupsDn(), filter, searchControls );