Author: orudyy
Date: Fri Nov 25 11:42:03 2016
New Revision: 1771296
URL: http://svn.apache.org/viewvc?rev=1771296&view=rev
Log:
QPID-7444: Verify that requested SASL mechanism is supported before attempting
the creation of SASL server
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java?rev=1771296&r1=1771295&r2=1771296&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
Fri Nov 25 11:42:03 2016
@@ -128,7 +128,7 @@ public class SaslServlet extends Abstrac
if(mechanism != null)
{
- if(id == null)
+ if(id == null &&
subjectCreator.getMechanisms().contains(mechanism))
{
LOGGER.debug("Creating SaslServer for mechanism: {}",
mechanism);
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java?rev=1771296&r1=1771295&r2=1771296&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java
Fri Nov 25 11:42:03 2016
@@ -35,6 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
import javax.xml.bind.DatatypeConverter;
import org.apache.qpid.server.model.AuthenticationProvider;
@@ -281,6 +282,15 @@ public class SaslRestTest extends QpidRe
assertNull("Unexpected user", response2.get("user"));
}
+ public void testRequestingAuthenticationForUnsupportedSaslMechanism()
throws Exception
+ {
+ startBrokerNow();
+ HttpURLConnection connection =
requestSasServerChallenge("UNSUPPORTED");
+ int responseCode = connection.getResponseCode();
+ connection.disconnect();
+ assertEquals("Unexpected response",
HttpServletResponse.SC_EXPECTATION_FAILED, responseCode);
+ }
+
private HttpURLConnection requestSasServerChallenge(String mechanism)
throws IOException
{
HttpURLConnection connection =
getRestTestHelper().openManagementConnection("/service/sasl", "POST");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
