You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/03/31 16:49:21 UTC
[2/3] qpid-jms git commit: QPIDJMS-33: update handling of other
mechanisms to restore behaviour of not sending any initial response
QPIDJMS-33: update handling of other mechanisms to restore behaviour of not sending any initial response
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/475a6440
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/475a6440
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/475a6440
Branch: refs/heads/master
Commit: 475a64401467d7e681aeb0a2c200e519c13ae22b
Parents: 9f89a8f
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Mar 31 12:37:35 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Mar 31 12:39:48 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/sasl/AnonymousMechanism.java | 2 +-
.../main/java/org/apache/qpid/jms/sasl/CramMD5Mechanism.java | 2 +-
.../src/main/java/org/apache/qpid/jms/sasl/Mechanism.java | 6 +++++-
.../org/apache/qpid/jms/integration/SaslIntegrationTest.java | 8 +++++---
.../java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java | 1 +
5 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/475a6440/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java
index 903a5fe..c8d23da 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java
@@ -23,7 +23,7 @@ public class AnonymousMechanism extends AbstractMechanism {
@Override
public byte[] getInitialResponse() {
- return EMPTY;
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/475a6440/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/CramMD5Mechanism.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/CramMD5Mechanism.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/CramMD5Mechanism.java
index cc462d5..448e01e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/CramMD5Mechanism.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/CramMD5Mechanism.java
@@ -47,7 +47,7 @@ public class CramMD5Mechanism extends AbstractMechanism {
@Override
public byte[] getInitialResponse() {
- return EMPTY;
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/475a6440/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java
index 2474b82..07dc495 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java
@@ -61,7 +61,11 @@ public interface Mechanism extends Comparable<Mechanism> {
String getName();
/**
- * @return the response buffer used to answer the initial SASL cycle.
+ * Create an initial response based on selected mechanism.
+ *
+ * May be null if there is no initial response.
+ *
+ * @return the initial response, or null if there isn't one.
* @throws SaslException if an error occurs computing the response.
*/
byte[] getInitialResponse() throws SaslException;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/475a6440/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java
index 710e128..03cc6b6 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java
@@ -59,12 +59,15 @@ public class SaslIntegrationTest extends QpidJmsTestCase {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
// Expect a PLAIN connection
- testPeer.expectPlainConnect("guest", "guest", null, null);
+ String user = "user";
+ String pass = "qwerty123456";
+
+ testPeer.expectPlainConnect(user, pass, null, null);
// Each connection creates a session for managing temporary destinations etc
testPeer.expectBegin(true);
ConnectionFactory factory = new JmsConnectionFactory("amqp://localhost:" + testPeer.getServerPort());
- Connection connection = factory.createConnection("guest", "guest");
+ Connection connection = factory.createConnection(user, pass);
// Set a clientID to provoke the actual AMQP connection process to occur.
connection.setClientID("clientName");
@@ -79,7 +82,6 @@ public class SaslIntegrationTest extends QpidJmsTestCase {
@Test(timeout = 5000)
public void testSaslAnonymousConnection() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
-
// Expect an ANOYMOUS connection
testPeer.expectAnonymousConnect(true);
// Each connection creates a session for managing temporary destinations etc
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/475a6440/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
index d25c540..21c8f8b 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
@@ -316,6 +316,7 @@ public class TestAmqpPeer implements AutoCloseable
addHandler(new SaslInitMatcher()
.withMechanism(equalTo(Symbol.valueOf("ANONYMOUS")))
+ .withInitialResponse(nullValue())
.onSuccess(new AmqpPeerRunnable()
{
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org