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/30 16:55:51 UTC
[2/2] git commit: KARAF-2916 - Add fully qualified DN replacement for
role search
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/87c6031c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/87c6031c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/87c6031c
Branch: refs/heads/karaf-2.3.x
Commit: 87c6031cef3142180d2ca91d7b7827c3b191926b
Parents: f353610
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Apr 16 13:45:01 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Apr 30 12:25:06 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/87c6031c/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 e202cd9..0ddc83f 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
@@ -287,6 +287,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);