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 2018/03/14 15:22:02 UTC
qpid-jms git commit: QPIDJMS-367: fix c&p error,
tweak mech order handling and add related test
Repository: qpid-jms
Updated Branches:
refs/heads/master 3d2ec9c5f -> 8edb7e91e
QPIDJMS-367: fix c&p error, tweak mech order handling and add related test
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8edb7e91
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8edb7e91
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8edb7e91
Branch: refs/heads/master
Commit: 8edb7e91e84677029f099508ef0a7be0ef68dada
Parents: 3d2ec9c
Author: Robbie Gemmell <ro...@apache.org>
Authored: Wed Mar 14 15:17:29 2018 +0000
Committer: Robbie Gemmell <ro...@apache.org>
Committed: Wed Mar 14 15:17:29 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/sasl/Mechanism.java | 15 ++++++++-------
.../org/apache/qpid/jms/sasl/XOauth2Mechanism.java | 2 +-
.../qpid/jms/integration/SaslIntegrationTest.java | 13 +++++++++++--
3 files changed, 20 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8edb7e91/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 7f8c47e..d3c4c82 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
@@ -33,13 +33,14 @@ public interface Mechanism extends Comparable<Mechanism> {
*/
public enum PRIORITY {
LOWEST(0),
- LOWER(1),
- LOW(2),
- MEDIUM(3),
- HIGH(4),
- HIGHER(5),
- HIGHER_STILL(6),
- HIGHEST(7);
+ LOWER_STILL(1),
+ LOWER(2),
+ LOW(3),
+ MEDIUM(4),
+ HIGH(5),
+ HIGHER(6),
+ HIGHER_STILL(7),
+ HIGHEST(8);
private final int value;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8edb7e91/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/XOauth2Mechanism.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/XOauth2Mechanism.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/XOauth2Mechanism.java
index ad2e424..380b2f6 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/XOauth2Mechanism.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/XOauth2Mechanism.java
@@ -31,7 +31,7 @@ public class XOauth2Mechanism extends AbstractMechanism {
@Override
public int getPriority() {
- return PRIORITY.LOWEST.getValue();
+ return PRIORITY.LOWER_STILL.getValue();
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8edb7e91/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 59fb2e7..165ee22 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
@@ -32,6 +32,9 @@ import org.slf4j.LoggerFactory;
import java.net.URLDecoder;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.JMSException;
@@ -55,6 +58,7 @@ public class SaslIntegrationTest extends QpidJmsTestCase {
private static final Symbol SCRAM_SHA_1 = Symbol.valueOf("SCRAM-SHA-1");
private static final Symbol SCRAM_SHA_256 = Symbol.valueOf("SCRAM-SHA-256");
private static final Symbol EXTERNAL = Symbol.valueOf("EXTERNAL");
+ private static final Symbol XOAUTH2 = Symbol.valueOf("XOAUTH2");
private static final String BROKER_JKS_KEYSTORE = "src/test/resources/broker-jks.keystore";
private static final String BROKER_JKS_TRUSTSTORE = "src/test/resources/broker-jks.truststore";
@@ -126,12 +130,11 @@ public class SaslIntegrationTest extends QpidJmsTestCase {
}
}
-
@Test(timeout = 20000)
public void testSaslXOauth2Connection() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- // Expect a PLAIN connection
+ // Expect a XOAUTH2 connection
String user = "user";
String pass = "eyB1c2VyPSJ1c2VyIiB9";
@@ -255,6 +258,12 @@ public class SaslIntegrationTest extends QpidJmsTestCase {
doMechanismSelectedTestImpl("username", "password", SCRAM_SHA_256, new Symbol[] {SCRAM_SHA_256, SCRAM_SHA_1, CRAM_MD5, PLAIN, ANONYMOUS}, false);
}
+ @Test(timeout = 20000)
+ public void testXoauth2SelectedWhenCredentialsPresent() throws Exception {
+ String token = Base64.getEncoder().encodeToString("token".getBytes(StandardCharsets.US_ASCII));
+ doMechanismSelectedTestImpl("username", token, XOAUTH2, new Symbol[] {XOAUTH2, ANONYMOUS}, false);
+ }
+
private void doMechanismSelectedTestImpl(String username, String password, Symbol clientSelectedMech, Symbol[] serverMechs, boolean wait) throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org