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

Merge branch '3.1.x' 

Closes gh-36294
This commit is contained in:
Andy Wilkinson 2023-07-10 13:52:57 +01:00
parent 3b2551619f 0d06747b41
commit 07be2990a2
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/PropertiesMongoConnectionDetails.java
View File

@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.mongo; package org.springframework.boot.autoconfigure.mongo;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -46,10 +48,10 @@ public class PropertiesMongoConnectionDetails implements MongoConnectionDetails
} }
StringBuilder builder = new StringBuilder("mongodb://"); StringBuilder builder = new StringBuilder("mongodb://");
if (this.properties.getUsername() != null) { if (this.properties.getUsername() != null) {
builder.append(this.properties.getUsername()); builder.append(encode(this.properties.getUsername()));
builder.append(":"); builder.append(":");
if (this.properties.getPassword() != null) { if (this.properties.getPassword() != null) {
builder.append(this.properties.getPassword()); builder.append(encode(this.properties.getPassword()));
} }
builder.append("@"); builder.append("@");
} }
@ -71,6 +73,14 @@ public class PropertiesMongoConnectionDetails implements MongoConnectionDetails
return new ConnectionString(builder.toString()); return new ConnectionString(builder.toString());
} }
private String encode(String input) {
return URLEncoder.encode(input, StandardCharsets.UTF_8);
}
private char[] encode(char[] input) {
return URLEncoder.encode(new String(input), StandardCharsets.UTF_8).toCharArray();
}
@Override @Override
public GridFs getGridFs() { public GridFs getGridFs() {
return GridFs.of(PropertiesMongoConnectionDetails.this.properties.getGridfs().getDatabase(), return GridFs.of(PropertiesMongoConnectionDetails.this.properties.getGridfs().getDatabase(),

12
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
View File

@ -154,6 +154,18 @@ class MongoAutoConfigurationTests {
}); });
} }
@Test
void configuresCredentialsFromPropertiesWithSpecialCharacters() {
this.contextRunner
.withPropertyValues("spring.data.mongodb.username=us:er", "spring.data.mongodb.password=sec@ret")
.run((context) -> {
MongoCredential credential = getSettings(context).getCredential();
assertThat(credential.getUserName()).isEqualTo("us:er");
assertThat(credential.getPassword()).isEqualTo("sec@ret".toCharArray());
assertThat(credential.getSource()).isEqualTo("test");
});
}
@Test @Test
void doesNotConfigureCredentialsWithoutUsernameInUri() { void doesNotConfigureCredentialsWithoutUsernameInUri() {
this.contextRunner.withPropertyValues("spring.data.mongodb.uri=mongodb://localhost/mydb?authSource=authdb") this.contextRunner.withPropertyValues("spring.data.mongodb.uri=mongodb://localhost/mydb?authSource=authdb")