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

Match trailing slash in actuator endpoints

Browse Source 
Fixes gh-11024
This commit is contained in:
Madhura Bhave
2017-12-28 13:13:23 -08:00
parent c29fe05708
commit be9291a365
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java
View File

@@ -149,7 +149,7 @@ public abstract class AbstractWebMvcEndpointHandlerMapping
private PatternsRequestCondition patternsRequestConditionForPattern(String path) {
String[] patterns = new String[] { this.endpointMapping.createSubPath(path) };
return new PatternsRequestCondition(patterns, null, null, false, false);
return new PatternsRequestCondition(patterns, null, null, false, true);
}
private String[] toStringArray(Collection<String> collection) {

7
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/AbstractWebEndpointIntegrationTests.java
View File

@@ -122,6 +122,13 @@ public abstract class AbstractWebEndpointIntegrationTests<T extends Configurable
(client) -> client.get().uri("").exchange().expectStatus().isNotFound());
}
@Test
public void operationWithTrailingSlashShouldMatch() {
load(TestEndpointConfiguration.class,
(client) -> client.get().uri("/test/").exchange().expectStatus().isOk()
.expectBody().jsonPath("All").isEqualTo(true));
}
@Test
public void readOperationWithSingleQueryParameters() {
load(QueryEndpointConfiguration.class,