Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use ssl.enabled flag when RabbitMQ address has no protocol

Browse Source 
See gh-19109
This commit is contained in:
cbono
2019-11-24 19:45:03 -06:00
committed by Stephane Nicoll
parent a38e6b4f49
commit 2210236f82
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View File

@@ -188,7 +188,7 @@ public class RabbitProperties {
private List<Address> parseAddresses(String addresses) {
List<Address> parsedAddresses = new ArrayList<>();
for (String address : StringUtils.commaDelimitedListToStringArray(addresses)) {
parsedAddresses.add(new Address(address));
parsedAddresses.add(new Address(address, getSsl().isEnabled()));
}
return parsedAddresses;
}
@@ -968,21 +968,24 @@ public class RabbitProperties {
private boolean secureConnection;
private Address(String input) {
private Address(String input, boolean sslEnabled) {
input = input.trim();
input = trimPrefix(input);
input = trimPrefix(input, sslEnabled);
input = parseUsernameAndPassword(input);
input = parseVirtualHost(input);
parseHostAndPort(input);
}
private String trimPrefix(String input) {
private String trimPrefix(String input, boolean sslEnabled) {
if (input.startsWith(PREFIX_AMQP_SECURE)) {
this.secureConnection = true;
return input.substring(PREFIX_AMQP_SECURE.length());
}
if (input.startsWith(PREFIX_AMQP)) {
input = input.substring(PREFIX_AMQP.length());
return input.substring(PREFIX_AMQP.length());
}
if (sslEnabled) {
this.secureConnection = true;
}
return input;
}

29
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java
View File

@@ -101,6 +101,21 @@ public class RabbitPropertiesTests {
assertThat(this.properties.determinePort()).isEqualTo(5671);
}
@Test
public void determinePortReturnsDefaultAmqpsPortWhenFirstAddressHasNoExplicitPort() {
this.properties.setPort(1234);
this.properties.setAddresses("rabbit1.example.com,rabbit2.example.com:2345");
assertThat(this.properties.determinePort()).isEqualTo(5672);
}
@Test
public void determinePortReturnsDefaultAmqpsPortWhenFirstAddressHasNoExplicitPortButSslEnabled() {
this.properties.getSsl().setEnabled(true);
this.properties.setPort(1234);
this.properties.setAddresses("rabbit1.example.com,rabbit2.example.com:2345");
assertThat(this.properties.determinePort()).isEqualTo(5671);
}
@Test
public void virtualHostDefaultsToNull() {
assertThat(this.properties.getVirtualHost()).isNull();
@@ -240,6 +255,20 @@ public class RabbitPropertiesTests {
assertThat(this.properties.getSsl().determineEnabled()).isTrue();
}
@Test
public void determineSslUsingAddressWithoutAmpqsDefersToSslFlagProperty() {
this.properties.getSsl().setEnabled(true);
this.properties.setAddresses("root:password@otherhost");
assertThat(this.properties.getSsl().determineEnabled()).isTrue();
}
@Test
public void determineSslUsingAddressWithoutAmpqDefersToSslFlagProperty() {
this.properties.getSsl().setEnabled(false);
this.properties.setAddresses("root:password@otherhost");
assertThat(this.properties.getSsl().determineEnabled()).isFalse();
}
@Test
public void determineSslUsingAmqpReturnsStateOfFirstAddress() {
this.properties.setAddresses("amqp://root:password@otherhost,amqps://root:password2@otherhost2");