Merge branch '2.2.x'

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

@@ -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);
 		}
 

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

@@ -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");
 		}
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java

@@ -53,6 +53,9 @@ public abstract class ApplicationContextServerWebExchangeMatcher<C> implements S
 
 	@Override
 	public final Mono<MatchResult> matches(ServerWebExchange exchange) {
+		if (ignoreApplicationContext(exchange.getApplicationContext())) {
+			return MatchResult.notMatch();
+		}
 		return matches(exchange, getContext(exchange));
 	}
 
@@ -64,6 +67,18 @@ public abstract class ApplicationContextServerWebExchangeMatcher<C> implements S
 	 */
 	protected abstract Mono<MatchResult> matches(ServerWebExchange exchange, Supplier<C> context);
 
+	/**
+	 * Returns if the {@link ApplicationContext} should be ignored and not used for
+	 * matching. If this method returns {@code true} then the context will not be used and
+	 * the {@link #matches(ServerWebExchange) matches} method will return {@code false}.
+	 * @param applicationContext the candidate application context
+	 * @return if the application context should be ignored
+	 * @since 2.2.5
+	 */
+	protected boolean ignoreApplicationContext(ApplicationContext applicationContext) {
+		return false;
+	}
+
 	protected Supplier<C> getContext(ServerWebExchange exchange) {
 		if (this.context == null) {
 			synchronized (this.contextLock) {