Author: robbie
Date: Sun Mar 31 21:51:49 2013
New Revision: 1463063
URL: http://svn.apache.org/r1463063
Log:
QPID-4462: simply return the PlainSaslServer directly instead of looking up it,
bypassing the lack of previous registration
Fix suggested by Alex Rudyy
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java?rev=1463063&r1=1463062&r2=1463063&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
Sun Mar 31 21:51:49 2013
@@ -21,7 +21,6 @@ package org.apache.qpid.server.security.
import java.io.IOException;
import java.security.Principal;
-import java.util.HashMap;
import java.util.Hashtable;
import javax.naming.AuthenticationException;
@@ -37,7 +36,6 @@ import javax.security.auth.callback.Call
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.sasl.AuthorizeCallback;
-import javax.security.sasl.Sasl;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
import org.apache.log4j.Logger;
@@ -45,6 +43,7 @@ import org.apache.qpid.server.security.a
import
org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.auth.sasl.plain.PlainPasswordCallback;
+import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer;
public class SimpleLDAPAuthenticationManager implements AuthenticationManager
{
@@ -83,9 +82,7 @@ public class SimpleLDAPAuthenticationMan
{
if(PLAIN_MECHANISM.equals(mechanism))
{
- return Sasl.createSaslServer(PLAIN_MECHANISM, "AMQP", localFQDN,
- new HashMap<String, Object>(), new
PlainCallbackHandler());
-
+ return new PlainSaslServer(new SimpleLDAPPlainCallbackHandler());
}
else
{
@@ -214,7 +211,7 @@ public class SimpleLDAPAuthenticationMan
}
}
- private class PlainCallbackHandler implements CallbackHandler
+ private class SimpleLDAPPlainCallbackHandler implements CallbackHandler
{
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
