You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/06/21 10:08:49 UTC
qpid-broker-j git commit: NO-JIRA: [AMQP 1.0 Protocol Tests] Do not
hard code credentials
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 813ecbbc1 -> 704fd7a30
NO-JIRA: [AMQP 1.0 Protocol Tests] Do not hard code credentials
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/704fd7a3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/704fd7a3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/704fd7a3
Branch: refs/heads/master
Commit: 704fd7a300305901f9fd5ff825abc51e18fb842f
Parents: 813ecbb
Author: Lorenz Quack <lq...@apache.org>
Authored: Wed Jun 21 11:06:25 2017 +0100
Committer: Lorenz Quack <lq...@apache.org>
Committed: Wed Jun 21 11:06:25 2017 +0100
----------------------------------------------------------------------
.../apache/qpid/tests/protocol/v1_0/BrokerAdmin.java | 3 +++
.../protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java | 12 ++++++++++++
.../protocol/v1_0/ExternalQpidBrokerAdminImpl.java | 12 ++++++++++++
.../v1_0/transport/security/sasl/SaslTest.java | 13 ++++++++++---
4 files changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/704fd7a3/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java
index 9af7cf7..c03dda3 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java
@@ -48,6 +48,9 @@ public interface BrokerAdmin extends Pluggable
boolean isSASLSupported();
boolean isSASLMechanismSupported(String mechanismName);
+ String getValidUsername();
+ String getValidPassword();
+
enum PortType
{
ANONYMOUS_AMQP,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/704fd7a3/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java
index baaa172..5c78c86 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java
@@ -342,6 +342,18 @@ public class EmbeddedBrokerPerClassAdminImpl implements BrokerAdmin
}
@Override
+ public String getValidUsername()
+ {
+ return "guest";
+ }
+
+ @Override
+ public String getValidPassword()
+ {
+ return "guest";
+ }
+
+ @Override
public String getType()
{
return "EMBEDDED_BROKER_PER_CLASS";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/704fd7a3/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java
index bcd0d21..f714e93 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java
@@ -119,6 +119,18 @@ public class ExternalQpidBrokerAdminImpl implements BrokerAdmin
}
@Override
+ public String getValidUsername()
+ {
+ return "guest";
+ }
+
+ @Override
+ public String getValidPassword()
+ {
+ return "guest";
+ }
+
+ @Override
public String getType()
{
return "EXTERNAL_BROKER";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/704fd7a3/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java
index ce1768d..bc89d96 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java
@@ -58,6 +58,8 @@ public class SaslTest extends ProtocolTestBase
private static final byte[] SASL_AMQP_HEADER_BYTES = "AMQP\3\1\0\0".getBytes(StandardCharsets.UTF_8);
private static final byte[] AMQP_HEADER_BYTES = "AMQP\0\1\0\0".getBytes(StandardCharsets.UTF_8);
+ private String _username;
+ private String _password;
@Before
public void setUp()
@@ -65,6 +67,8 @@ public class SaslTest extends ProtocolTestBase
assumeThat(getBrokerAdmin().isSASLSupported(), is(true));
assumeThat(getBrokerAdmin().isSASLMechanismSupported(PLAIN.toString()), is(true));
assumeThat(getBrokerAdmin().isSASLMechanismSupported(CRAM_MD5.toString()), is(true));
+ _username = getBrokerAdmin().getValidUsername();
+ _password = getBrokerAdmin().getValidPassword();
}
@Test
@@ -84,8 +88,9 @@ public class SaslTest extends ProtocolTestBase
SaslMechanisms saslMechanismsResponse = interaction.consumeResponse().getLatestResponse(SaslMechanisms.class);
assertThat(Arrays.asList(saslMechanismsResponse.getSaslServerMechanisms()), hasItem(PLAIN));
+ final Binary initialResponse = new Binary(String.format("\0%s\0%s", _username, _password).getBytes(StandardCharsets.US_ASCII));
SaslOutcome saslOutcome = interaction.saslMechanism(PLAIN)
- .saslInitialResponse(new Binary("\0guest\0guest".getBytes(StandardCharsets.US_ASCII)))
+ .saslInitialResponse(initialResponse)
.saslInit().consumeResponse()
.getLatestResponse(SaslOutcome.class);
assertThat(saslOutcome.getCode(), equalTo(SaslCode.OK));
@@ -121,7 +126,7 @@ public class SaslTest extends ProtocolTestBase
.getLatestResponse(SaslChallenge.class);
assertThat(saslChallenge.getChallenge(), is(notNullValue()));
- byte[] response = generateCramMD5ClientResponse("guest", "guest",
+ byte[] response = generateCramMD5ClientResponse(_username, _password,
saslChallenge.getChallenge().getArray());
final SaslOutcome saslOutcome = interaction.saslResponseResponse(new Binary(response))
@@ -156,8 +161,10 @@ public class SaslTest extends ProtocolTestBase
SaslMechanisms saslMechanismsResponse = interaction.consumeResponse().getLatestResponse(SaslMechanisms.class);
assertThat(Arrays.asList(saslMechanismsResponse.getSaslServerMechanisms()), hasItem(PLAIN));
+ final Binary initialResponse =
+ new Binary(String.format("\0%s\0badpassword", _username).getBytes(StandardCharsets.US_ASCII));
SaslOutcome saslOutcome = interaction.saslMechanism(PLAIN)
- .saslInitialResponse(new Binary("\0guest\0badpassword".getBytes(StandardCharsets.US_ASCII)))
+ .saslInitialResponse(initialResponse)
.saslInit().consumeResponse()
.getLatestResponse(SaslOutcome.class);
assertThat(saslOutcome.getCode(), equalTo(SaslCode.AUTH));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org