You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/04/16 18:16:09 UTC
[1/3] git commit: KARAF-2916 - Add fully qualified DN replacement for
role search
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 6d88fd32b -> 824c575f4
refs/heads/karaf-3.0.x 9d51e3730 -> 626e54cef
refs/heads/master 732e9bd17 -> 63a79b5d0
KARAF-2916 - Add fully qualified DN replacement for role search
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/63a79b5d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/63a79b5d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/63a79b5d
Branch: refs/heads/master
Commit: 63a79b5d0c2659cf7be26f483cee835a48b4406c
Parents: 732e9bd
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Apr 16 13:45:01 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Apr 16 13:45:01 2014 -0230
----------------------------------------------------------------------
.../java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/63a79b5d/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
index bfd911e..c3b55db 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
@@ -277,6 +277,7 @@ public class LDAPLoginModule extends AbstractKarafLoginModule {
logger.debug(" base DN: " + roleBaseDN);
roleFilter = roleFilter.replaceAll(Pattern.quote("%u"), Matcher.quoteReplacement(user));
roleFilter = roleFilter.replaceAll(Pattern.quote("%dn"), Matcher.quoteReplacement(userDN));
+ roleFilter = roleFilter.replaceAll(Pattern.quote("%fqdn"), Matcher.quoteReplacement(userDN + "," + userBaseDN));
roleFilter = roleFilter.replace("\\", "\\\\");
logger.debug(" filter: " + roleFilter);
NamingEnumeration namingEnumeration = context.search(roleBaseDN, roleFilter, controls);
[3/3] git commit: KARAF-2916 - Add fully qualified DN replacement for
role search
Posted by ja...@apache.org.
KARAF-2916 - Add fully qualified DN replacement for role search
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/824c575f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/824c575f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/824c575f
Branch: refs/heads/karaf-2.x
Commit: 824c575f49a8f219f6c294d2856a4894b8c2f483
Parents: 6d88fd3
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Apr 16 13:45:01 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Apr 16 13:45:50 2014 -0230
----------------------------------------------------------------------
.../java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/824c575f/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
index bfd911e..c3b55db 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
@@ -277,6 +277,7 @@ public class LDAPLoginModule extends AbstractKarafLoginModule {
logger.debug(" base DN: " + roleBaseDN);
roleFilter = roleFilter.replaceAll(Pattern.quote("%u"), Matcher.quoteReplacement(user));
roleFilter = roleFilter.replaceAll(Pattern.quote("%dn"), Matcher.quoteReplacement(userDN));
+ roleFilter = roleFilter.replaceAll(Pattern.quote("%fqdn"), Matcher.quoteReplacement(userDN + "," + userBaseDN));
roleFilter = roleFilter.replace("\\", "\\\\");
logger.debug(" filter: " + roleFilter);
NamingEnumeration namingEnumeration = context.search(roleBaseDN, roleFilter, controls);
[2/3] git commit: KARAF-2916 - Add fully qualified DN replacement for
role search
Posted by ja...@apache.org.
KARAF-2916 - Add fully qualified DN replacement for role search
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/626e54ce
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/626e54ce
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/626e54ce
Branch: refs/heads/karaf-3.0.x
Commit: 626e54cefa58866808bcf05575d12fa99b067db0
Parents: 9d51e37
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Apr 16 13:45:01 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Apr 16 13:45:39 2014 -0230
----------------------------------------------------------------------
.../java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/626e54ce/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
index bfd911e..c3b55db 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
@@ -277,6 +277,7 @@ public class LDAPLoginModule extends AbstractKarafLoginModule {
logger.debug(" base DN: " + roleBaseDN);
roleFilter = roleFilter.replaceAll(Pattern.quote("%u"), Matcher.quoteReplacement(user));
roleFilter = roleFilter.replaceAll(Pattern.quote("%dn"), Matcher.quoteReplacement(userDN));
+ roleFilter = roleFilter.replaceAll(Pattern.quote("%fqdn"), Matcher.quoteReplacement(userDN + "," + userBaseDN));
roleFilter = roleFilter.replace("\\", "\\\\");
logger.debug(" filter: " + roleFilter);
NamingEnumeration namingEnumeration = context.search(roleBaseDN, roleFilter, controls);