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

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2018-04-09 17:59:53 +01:00
parent 8b1a101cb6 cd0e4fe945
commit 8d5b9f37d5
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -8,7 +8,8 @@
"key", "key",
"token", "token",
".*credentials.*", ".*credentials.*",
"vcap_services" "vcap_services",
"sun.java.command"
] ]
}, },
{ {
@ -19,7 +20,8 @@
"key", "key",
"token", "token",
".*credentials.*", ".*credentials.*",
"vcap_services" "vcap_services",
"sun.java.command"
] ]
}, },
{ {

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -38,7 +38,8 @@ public class Sanitizer {
private Pattern[] keysToSanitize; private Pattern[] keysToSanitize;
public Sanitizer() { public Sanitizer() {
this("password", "secret", "key", "token", ".*credentials.*", "vcap_services"); this("password", "secret", "key", "token", ".*credentials.*", "vcap_services",
"sun.java.command");
} }
public Sanitizer(String... keysToSanitize) { public Sanitizer(String... keysToSanitize) {

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -39,6 +39,8 @@ public class SanitizerTests {
assertThat(sanitizer.sanitize("token", "secret")).isEqualTo("******"); assertThat(sanitizer.sanitize("token", "secret")).isEqualTo("******");
assertThat(sanitizer.sanitize("sometoken", "secret")).isEqualTo("******"); assertThat(sanitizer.sanitize("sometoken", "secret")).isEqualTo("******");
assertThat(sanitizer.sanitize("find", "secret")).isEqualTo("secret"); assertThat(sanitizer.sanitize("find", "secret")).isEqualTo("secret");
assertThat(sanitizer.sanitize("sun.java.command",
"--spring.redis.password=pa55w0rd")).isEqualTo("******");
} }
@Test @Test

7
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/env/EnvironmentEndpointTests.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -112,6 +112,11 @@ public class EnvironmentEndpointTests {
.isEqualTo("******"); .isEqualTo("******");
assertThat(systemProperties.get("VCAP_SERVICES").getValue()) assertThat(systemProperties.get("VCAP_SERVICES").getValue())
.isEqualTo("******"); .isEqualTo("******");
PropertyValueDescriptor command = systemProperties
.get("sun.java.command");
if (command != null) {
assertThat(command.getValue()).isEqualTo("******");
}
return null; return null;
}); });
} }