spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-02 23:39:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x' into 4.0.x

Browse Source
This commit is contained in:
Brian Clozel
2026-04-03 10:56:16 +02:00
parent 6ed6686725 1841396531
commit 3aad18a774
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/web/reactive/EndpointRequest.java
+1 -1
View File
@@ -453,7 +453,7 @@ public final class EndpointRequest {
.filter(Objects::nonNull)
.map(this::getEndpointId)
.flatMap((endpointId) -> streamAdditionalPaths(endpoints, endpointId))
.map(PathPatternParserServerWebExchangeMatcher::new)
.map((path) -> new PathPatternParserServerWebExchangeMatcher(path, this.httpMethod))
.collect(Collectors.toCollection(ArrayList::new));
return (!CollectionUtils.isEmpty(delegateMatchers)) ? new OrServerWebExchangeMatcher(delegateMatchers)
: EMPTY_MATCHER;
module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/actuate/web/reactive/EndpointRequestTests.java
+11
View File
@@ -311,6 +311,17 @@ class EndpointRequestTests {
assertMatcher.matches("/additional");
}
@Test
void toAdditionalPathsWithHttpMethodShouldRespectRequestMethod() {
ServerWebExchangeMatcher matcher = EndpointRequest
.toAdditionalPaths(WebServerNamespace.SERVER, FooEndpoint.class)
.withHttpMethod(HttpMethod.POST);
RequestMatcherAssert assertMatcher = assertMatcher(matcher, new PathMappedEndpoints("",
() -> List.of(mockEndpoint(EndpointId.of("foo"), "test", WebServerNamespace.SERVER, "/additional"))));
assertMatcher.matches(HttpMethod.POST, "/additional");
assertMatcher.doesNotMatch(HttpMethod.GET, "/additional");
}
@Test
void toAdditionalPathsWithEndpointClassShouldNotMatchOtherPaths() {
ServerWebExchangeMatcher matcher = EndpointRequest.toAdditionalPaths(WebServerNamespace.SERVER,