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

Fix tests following changes to EndpointRequest

Browse Source 
See gh-20329
This commit is contained in:
Madhura Bhave
2020-02-26 17:05:16 -08:00
parent cdae79dad9
commit ea8f2a7276
3 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java
View File

@@ -115,12 +115,41 @@ public final class EndpointRequest {
return new LinksServerWebExchangeMatcher();
}
/**
* Base class for supported request matchers.
*/
private abstract static class AbstractWebExchangeMatcher<T> extends ApplicationContextServerWebExchangeMatcher<T> {
private ManagementPortType managementPortType;
AbstractWebExchangeMatcher(Class<? extends T> contextClass) {
super(contextClass);
}
@Override
protected boolean ignoreApplicationContext(ApplicationContext applicationContext) {
if (this.managementPortType == null) {
this.managementPortType = ManagementPortType.get(applicationContext.getEnvironment());
}
if (this.managementPortType == ManagementPortType.DIFFERENT) {
if (applicationContext.getParent() == null) {
return true;
}
String managementContextId = applicationContext.getParent().getId() + ":management";
if (!managementContextId.equals(applicationContext.getId())) {
return true;
}
}
return false;
}
}
/**
* The {@link ServerWebExchangeMatcher} used to match against {@link Endpoint actuator
* endpoints}.
*/
public static final class EndpointServerWebExchangeMatcher
extends ApplicationContextServerWebExchangeMatcher<PathMappedEndpoints> {
public static final class EndpointServerWebExchangeMatcher extends AbstractWebExchangeMatcher<PathMappedEndpoints> {
private final List<Object> includes;
@@ -225,36 +254,15 @@ public final class EndpointRequest {
@Override
protected Mono<MatchResult> matches(ServerWebExchange exchange, Supplier<PathMappedEndpoints> context) {
if (!isManagementContext(exchange)) {
return MatchResult.notMatch();
}
return this.delegate.matches(exchange);
}
static boolean isManagementContext(ServerWebExchange exchange) {
ApplicationContext applicationContext = exchange.getApplicationContext();
if (managementPortType == null) {
managementPortType = ManagementPortType.get(applicationContext.getEnvironment());
}
if (managementPortType == ManagementPortType.DIFFERENT) {
if (applicationContext.getParent() == null) {
return false;
}
String managementContextId = applicationContext.getParent().getId() + ":management";
if (!managementContextId.equals(applicationContext.getId())) {
return false;
}
}
return true;
}
}
/**
* The {@link ServerWebExchangeMatcher} used to match against the links endpoint.
*/
public static final class LinksServerWebExchangeMatcher
extends ApplicationContextServerWebExchangeMatcher<WebEndpointProperties> {
public static final class LinksServerWebExchangeMatcher extends AbstractWebExchangeMatcher<WebEndpointProperties> {
private volatile ServerWebExchangeMatcher delegate;
@@ -276,9 +284,6 @@ public final class EndpointRequest {
@Override
protected Mono<MatchResult> matches(ServerWebExchange exchange, Supplier<WebEndpointProperties> context) {
if (!EndpointServerWebExchangeMatcher.isManagementContext(exchange)) {
return MatchResult.notMatch();
}
return this.delegate.matches(exchange);
}

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
View File

@@ -124,7 +124,7 @@ public final class EndpointRequest {
private volatile RequestMatcher delegate;
private static ManagementPortType managementPortType;
private ManagementPortType managementPortType;
AbstractRequestMatcher() {
super(WebApplicationContext.class);
@@ -132,10 +132,10 @@ public final class EndpointRequest {
@Override
protected boolean ignoreApplicationContext(WebApplicationContext applicationContext) {
if (managementPortType == null) {
managementPortType = ManagementPortType.get(applicationContext.getEnvironment());
if (this.managementPortType == null) {
this.managementPortType = ManagementPortType.get(applicationContext.getEnvironment());
}
return managementPortType == ManagementPortType.DIFFERENT
return this.managementPortType == ManagementPortType.DIFFERENT
&& !WebServerApplicationContext.hasServerNamespace(applicationContext, "management");
}