root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '2.5.x' 

See gh-28135
This commit is contained in:
Andy Wilkinson 2021-10-01 11:32:59 +01:00
parent 86a4425162 d238566920
commit bddfe9ef6e
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1152,14 +1152,15 @@ public class RabbitProperties {
} }
private void parseHostAndPort(String input, boolean sslEnabled) { private void parseHostAndPort(String input, boolean sslEnabled) {
int portIndex = input.lastIndexOf(':'); int bracketIndex = input.lastIndexOf(']');
if (portIndex == -1) { int colonIndex = input.lastIndexOf(':');
if (colonIndex == -1 || colonIndex < bracketIndex) {
this.host = input; this.host = input;
this.port = (determineSslEnabled(sslEnabled)) ? DEFAULT_PORT_SECURE : DEFAULT_PORT; this.port = (determineSslEnabled(sslEnabled)) ? DEFAULT_PORT_SECURE : DEFAULT_PORT;
} }
else { else {
this.host = input.substring(0, portIndex); this.host = input.substring(0, colonIndex);
this.port = Integer.parseInt(input.substring(portIndex + 1)); this.port = Integer.parseInt(input.substring(colonIndex + 1));
} }
} }

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

@ -242,7 +242,14 @@ class RabbitPropertiesTests {
@Test @Test
void ipv6Address() { void ipv6Address() {
this.properties.setAddresses("amqp://foo:bar@[aaaa:bbbb:cccc::d]:5672"); this.properties.setAddresses("amqp://foo:bar@[aaaa:bbbb:cccc::d]:1234");
assertThat(this.properties.determineHost()).isEqualTo("[aaaa:bbbb:cccc::d]");
assertThat(this.properties.determinePort()).isEqualTo(1234);
}
@Test
void ipv6AddressDefaultPort() {
this.properties.setAddresses("amqp://foo:bar@[aaaa:bbbb:cccc::d]");
assertThat(this.properties.determineHost()).isEqualTo("[aaaa:bbbb:cccc::d]"); assertThat(this.properties.determineHost()).isEqualTo("[aaaa:bbbb:cccc::d]");
assertThat(this.properties.determinePort()).isEqualTo(5672); assertThat(this.properties.determinePort()).isEqualTo(5672);
} }