Skip to content

Commit bbb4ac1

Browse files
committed
Sanitize SPRING_APPLICATION_JSON by default
Update `Sanitizer` default keys to include `SPRING_APPLICATION_JSON`. Fixes gh-28045
1 parent ec12d51 commit bbb4ac1

File tree

2 files changed

+5
-2
lines changed
  • spring-boot-project/spring-boot-actuator/src

2 files changed

+5
-2
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ public class Sanitizer {
4444

4545
private static final String[] REGEX_PARTS = { "*", "$", "^", "+" };
4646

47-
private static final Set<String> DEFAULT_KEYS_TO_SANITIZE = new LinkedHashSet<>(Arrays.asList("password", "secret",
48-
"key", "token", ".*credentials.*", "vcap_services", "sun.java.command"));
47+
private static final Set<String> DEFAULT_KEYS_TO_SANITIZE = new LinkedHashSet<>(
48+
Arrays.asList("password", "secret", "key", "token", ".*credentials.*", "vcap_services", "sun.java.command",
49+
"^spring[\\._]application[\\\\._]json$"));
4950

5051
private static final Set<String> URI_USERINFO_KEYS = new LinkedHashSet<>(
5152
Arrays.asList("uri", "uris", "address", "addresses"));

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SanitizerTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ void defaultNonUriKeys() {
4646
assertThat(sanitizer.sanitize("sometoken", "secret")).isEqualTo("******");
4747
assertThat(sanitizer.sanitize("find", "secret")).isEqualTo("secret");
4848
assertThat(sanitizer.sanitize("sun.java.command", "--spring.redis.password=pa55w0rd")).isEqualTo("******");
49+
assertThat(sanitizer.sanitize("SPRING_APPLICATION_JSON", "{password:123}")).isEqualTo("******");
50+
assertThat(sanitizer.sanitize("spring.application.json", "{password:123}")).isEqualTo("******");
4951
}
5052

5153
@ParameterizedTest(name = "key = {0}")

0 commit comments

Comments
 (0)