Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-4685: Improved LDAPLoginModule to support ldap alias when result is absolute. Thanks to Igor Podolskiy for patch.

This commit is contained in:
Claus Ibsen 2013-11-02 14:51:09 +01:00
parent 70e2b998d2
commit 20747eedca
2 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java
View File

@ -17,6 +17,8 @@
package org.apache.activemq.jaas; package org.apache.activemq.jaas;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.Principal; import java.security.Principal;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.*; import java.util.*;
@ -225,13 +227,43 @@ public class LDAPLoginModule implements LoginModule {
if (results.hasMore()) { if (results.hasMore()) {
// ignore for now // ignore for now
} }
String dn;
if (result.isRelative()) {
log.debug("LDAP returned a relative name: {}", result.getName());
NameParser parser = context.getNameParser(""); NameParser parser = context.getNameParser("");
Name contextName = parser.parse(context.getNameInNamespace()); Name contextName = parser.parse(context.getNameInNamespace());
Name baseName = parser.parse(getLDAPPropertyValue(USER_BASE)); Name baseName = parser.parse(getLDAPPropertyValue(USER_BASE));
Name entryName = parser.parse(result.getName()); Name entryName = parser.parse(result.getName());
Name name = contextName.addAll(baseName); Name name = contextName.addAll(baseName);
name = name.addAll(entryName); name = name.addAll(entryName);
String dn = name.toString(); dn = name.toString();
} else {
log.debug("LDAP returned an absolute name: {}", result.getName());
try {
URI uri = new URI(result.getName());
String path = uri.getPath();
if (path.startsWith("/")) {
dn = path.substring(1);
} else {
dn = path;
}
} catch (URISyntaxException e) {
if (context != null) {
close(context);
}
FailedLoginException ex = new FailedLoginException("Error parsing absolute name as URI.");
ex.initCause(e);
throw ex;
}
}
if (log.isDebugEnabled()) {
log.debug("Using DN [" + dn + "] for binding.");
}
Attributes attrs = result.getAttributes(); Attributes attrs = result.getAttributes();
if (attrs == null) { if (attrs == null) {

1
activemq-jaas/src/test/resources/log4j.properties
View File

@ -21,6 +21,7 @@
log4j.rootLogger=INFO, out, stdout log4j.rootLogger=INFO, out, stdout
log4j.logger.org.apache.activemq=INFO log4j.logger.org.apache.activemq=INFO
#log4j.logger.org.apache.activemq.jaas.LDAPLoginModule=DEBUG
# CONSOLE appender not used by default # CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout=org.apache.log4j.ConsoleAppender