Skip to content

Commit a804607

Browse files
committed
Remove default credentials
ANONYMOUS is the default and username/password must be provided as soon as PLAIN is used.
1 parent 6340ee0 commit a804607

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

src/main/java/com/rabbitmq/client/amqp/impl/DefaultConnectionSettings.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,14 @@ abstract class DefaultConnectionSettings<T> implements ConnectionSettings<T> {
4848
SASL_MECHANISM_ANONYMOUS,
4949
SASL_MECHANISM_EXTERNAL);
5050

51-
static final String DEFAULT_USERNAME = "guest";
52-
static final String DEFAULT_PASSWORD = DEFAULT_USERNAME;
5351
static final String DEFAULT_HOST = "localhost";
5452
static final int DEFAULT_PORT = 5672;
5553
static final int DEFAULT_TLS_PORT = 5671;
5654
static final String DEFAULT_VIRTUAL_HOST = "/";
5755

5856
private String host = DEFAULT_HOST;
5957
private int port = DEFAULT_PORT;
60-
private CredentialsProvider credentialsProvider =
61-
new DefaultUsernamePasswordCredentialsProvider(DEFAULT_USERNAME, DEFAULT_PASSWORD);
58+
private CredentialsProvider credentialsProvider;
6259
private String virtualHost = DEFAULT_VIRTUAL_HOST;
6360
private List<URI> uris = Collections.emptyList();
6461
private Duration idleTimeout = Duration.ofMillis(ConnectionOptions.DEFAULT_IDLE_TIMEOUT);
@@ -173,14 +170,7 @@ public T saslMechanism(String mechanism) {
173170
SASL_MECHANISMS.stream().map(n -> "'" + n + "'").collect(Collectors.joining(", "))));
174171
}
175172
this.saslMechanism = mechanism;
176-
if (SASL_MECHANISM_ANONYMOUS.equals(mechanism)) {
177-
this.credentialsProvider = null;
178-
} else if (SASL_MECHANISM_PLAIN.equals(mechanism)) {
179-
this.credentialsProvider =
180-
new DefaultUsernamePasswordCredentialsProvider(DEFAULT_USERNAME, DEFAULT_PASSWORD);
181-
} else if (SASL_MECHANISM_EXTERNAL.equals(mechanism)) {
182-
this.credentialsProvider = null;
183-
}
173+
this.credentialsProvider = null;
184174
return this.toReturn();
185175
}
186176

src/test/java/com/rabbitmq/client/amqp/impl/ConnectionSettingsTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
package com.rabbitmq.client.amqp.impl;
1919

2020
import static com.rabbitmq.client.amqp.ConnectionSettings.SASL_MECHANISM_PLAIN;
21-
import static com.rabbitmq.client.amqp.impl.DefaultConnectionSettings.DEFAULT_PASSWORD;
22-
import static com.rabbitmq.client.amqp.impl.DefaultConnectionSettings.DEFAULT_USERNAME;
2321

2422
import com.rabbitmq.client.amqp.DefaultUsernamePasswordCredentialsProvider;
2523
import com.rabbitmq.client.amqp.Environment;
@@ -50,6 +48,7 @@ void environmentCredentialsProviderShouldNotBeUsedIfOneSetForConnection() {
5048
try (Environment environment =
5149
TestUtils.environmentBuilder()
5250
.connectionSettings()
51+
.saslMechanism(SASL_MECHANISM_PLAIN)
5352
.credentialsProvider(new LatchCredentialsProvider(environmentUsernameReturnedLatch))
5453
.environmentBuilder()
5554
.build()) {
@@ -69,7 +68,7 @@ private static class LatchCredentialsProvider extends DefaultUsernamePasswordCre
6968
private final CountDownLatch latch;
7069

7170
public LatchCredentialsProvider(CountDownLatch latch) {
72-
super(DEFAULT_USERNAME, DEFAULT_PASSWORD);
71+
super("guest", "guest");
7372
this.latch = latch;
7473
}
7574

0 commit comments

Comments
 (0)