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

Merge branch '2.1.x' into 2.2.x

Browse Source 
Closes gh-19112
This commit is contained in:
Stephane Nicoll
2019-11-25 13:59:45 +01:00
parent 36f4d2f061 d386ee0984
commit a4ca1d02b3
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,7 +189,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;
}
@@ -390,7 +390,7 @@ public class RabbitProperties {
return isEnabled();
}
Address address = RabbitProperties.this.parsedAddresses.get(0);
return address.secureConnection;
return address.determineSslEnabled(isEnabled());
}
public void setEnabled(boolean enabled) {
@@ -989,14 +989,14 @@ public class RabbitProperties {
private String virtualHost;
private boolean secureConnection;
private Boolean secureConnection;
private Address(String input) {
private Address(String input, boolean sslEnabled) {
input = input.trim();
input = trimPrefix(input);
input = parseUsernameAndPassword(input);
input = parseVirtualHost(input);
parseHostAndPort(input);
parseHostAndPort(input, sslEnabled);
}
private String trimPrefix(String input) {
@@ -1005,7 +1005,8 @@ public class RabbitProperties {
return input.substring(PREFIX_AMQP_SECURE.length());
}
if (input.startsWith(PREFIX_AMQP)) {
input = input.substring(PREFIX_AMQP.length());
this.secureConnection = false;
return input.substring(PREFIX_AMQP.length());
}
return input;
}
@@ -1036,11 +1037,11 @@ public class RabbitProperties {
return input;
}
private void parseHostAndPort(String input) {
private void parseHostAndPort(String input, boolean sslEnabled) {
int portIndex = input.indexOf(':');
if (portIndex == -1) {
this.host = input;
this.port = (this.secureConnection) ? DEFAULT_PORT_SECURE : DEFAULT_PORT;
this.port = (determineSslEnabled(sslEnabled)) ? DEFAULT_PORT_SECURE : DEFAULT_PORT;
}
else {
this.host = input.substring(0, portIndex);
@@ -1048,6 +1049,10 @@ public class RabbitProperties {
}
}
private boolean determineSslEnabled(boolean sslEnabled) {
return (this.secureConnection != null) ? this.secureConnection : sslEnabled;
}
}
}

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

@@ -102,6 +102,14 @@ class RabbitPropertiesTests {
assertThat(this.properties.determinePort()).isEqualTo(5671);
}
@Test
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
void virtualHostDefaultsToNull() {
assertThat(this.properties.getVirtualHost()).isNull();
@@ -241,6 +249,20 @@ class RabbitPropertiesTests {
assertThat(this.properties.getSsl().determineEnabled()).isTrue();
}
@Test
void sslDetermineEnabledIsTrueWhenAddressHasNoProtocolAndSslIsEnabled() {
this.properties.getSsl().setEnabled(true);
this.properties.setAddresses("root:password@otherhost");
assertThat(this.properties.getSsl().determineEnabled()).isTrue();
}
@Test
void sslDetermineEnabledIsFalseWhenAddressHasNoProtocolAndSslIsDisabled() {
this.properties.getSsl().setEnabled(false);
this.properties.setAddresses("root:password@otherhost");
assertThat(this.properties.getSsl().determineEnabled()).isFalse();
}
@Test
void determineSslUsingAmqpReturnsStateOfFirstAddress() {
this.properties.setAddresses("amqp://root:password@otherhost,amqps://root:password2@otherhost2");