Merge branch '4.2.x' into 4.3.x

Author: ryanjbaxter

docs/modules/ROOT/partials/_configprops.adoc

@@ -135,8 +135,10 @@
 |spring.cloud.gateway.loadbalancer.use404 | `+++false+++` | 
 |spring.cloud.gateway.metrics |  | 
 |spring.cloud.gateway.metrics.enabled | `+++false+++` | Enables the collection of metrics data.
+|spring.cloud.gateway.metrics.path-tags.enabled | `+++false+++` | Enables the gateway path tag provider.
 |spring.cloud.gateway.metrics.prefix | `+++spring.cloud.gateway+++` | The prefix of all metrics emitted by gateway.
 |spring.cloud.gateway.metrics.tags |  | Tags map that added to metrics.
+|spring.cloud.gateway.metrics.tags.path.enabled | `+++false+++` | Enables the gateway path tag provider.
 |spring.cloud.gateway.mvc.form-filter.enabled | `+++true+++` | Enables the form-filter.
 |spring.cloud.gateway.mvc.forwarded-request-headers-filter.enabled | `+++true+++` | Enables the forwarded-request-headers-filter.
 |spring.cloud.gateway.mvc.http-client.connect-timeout |  | The HttpClient connect timeout.

spring-cloud-gateway-server-mvc/pom.xml

@@ -155,6 +155,11 @@
 			<artifactId>rabbitmq</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 
 	<profiles>

spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/common/MvcUtils.java

@@ -33,6 +33,8 @@
 import java.util.Map;
 import java.util.Optional;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -123,6 +125,21 @@ public static <T> Optional<T> cacheAndReadBody(ServerRequest request, Class<T> t
 		return readBody(request, rawBody, toClass);
 	}
 
+	/**
+	 * Unwraps an HttpServletRequest to get to the innermost request. This is necessary to
+	 * ensure attributes are set on the actual request object rather than on wrapper
+	 * instances that may not propagate attribute changes.
+	 * @param request the request to unwrap
+	 * @return the innermost HttpServletRequest
+	 */
+	private static HttpServletRequest unwrapRequest(HttpServletRequest request) {
+		HttpServletRequest unwrapped = request;
+		while (unwrapped instanceof HttpServletRequestWrapper wrapper) {
+			unwrapped = (HttpServletRequest) wrapper.getRequest();
+		}
+		return unwrapped;
+	}
+
 	public static ByteArrayInputStream cacheBody(ServerRequest request) {
 		try {
 			byte[] bytes = StreamUtils.copyToByteArray(request.servletRequest().getInputStream());
@@ -183,7 +200,12 @@ public static <T> T getAttribute(ServerRequest request, String key) {
 		if (request.attributes().containsKey(key)) {
 			return (T) request.attributes().get(key);
 		}
-		return (T) getGatewayAttributes(request).get(key);
+		T gatewayAttr = (T) getGatewayAttributes(request).get(key);
+		if (gatewayAttr != null) {
+			return gatewayAttr;
+		}
+		// Fallback to servlet request attributes for compatibility with request wrappers
+		return (T) request.servletRequest().getAttribute(key);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -207,8 +229,13 @@ public static Map<String, Object> getUriTemplateVariables(ServerRequest request)
 	}
 
 	public static void putAttribute(ServerRequest request, String key, Object value) {
+		// Also set on the unwrapped servlet request to ensure persistence through
+		// wrappers like Spring's AttributesPreservingRequest
+		HttpServletRequest unwrapped = unwrapRequest((HttpServletRequest) request.servletRequest());
 		request.attributes().put(key, value);
 		getGatewayAttributes(request).put(key, value);
+		unwrapped.setAttribute(key, value);
+
 	}
 
 	@SuppressWarnings("unchecked")

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java

@@ -1032,7 +1032,7 @@ void logsArtifactDeprecatedWarning(CapturedOutput output) {
 	@EnableAutoConfiguration
 	@LoadBalancerClient(name = "httpbin", configuration = TestLoadBalancerConfig.Httpbin.class)
 	@Import(PermitAllSecurityConfiguration.class)
-	protected static class TestConfiguration extends WebMvcConfigurationSupport {
+	protected static class TestConfiguration {
 
 		@Bean
 		StaticPortController staticPortController() {
@@ -1049,26 +1049,6 @@ EventController eventController() {
 			return new EventController();
 		}
 
-		// TODO This is needed to work around
-		// https://github.com/spring-cloud/spring-cloud-gateway/issues/3816
-		// which results from Spring Security being on the classpath. Once we can address
-		// this issue we should
-		// remove this bean and no longer extend WebMvcConfigurationSupport in this
-		// configuration class
-		@Bean
-		@Lazy
-		@Override
-		public HandlerMappingIntrospector mvcHandlerMappingIntrospector() {
-			return new HandlerMappingIntrospector() {
-				@Override
-				public Filter createCacheFilter() {
-					return (request, response, chain) -> {
-						chain.doFilter(request, response);
-					};
-				}
-			};
-		}
-
 		@Bean
 		public AsyncProxyManager<String> caffeineProxyManager() {
 			Caffeine<String, RemoteBucketState> builder = (Caffeine) Caffeine.newBuilder().maximumSize(100);

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcPropertiesBeanDefinitionRegistrarTests.java

@@ -32,6 +32,7 @@
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.cloud.context.refresh.ContextRefresher;
+import org.springframework.cloud.gateway.server.mvc.PermitAllSecurityConfiguration;
 import org.springframework.cloud.gateway.server.mvc.common.MvcUtils;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinTestcontainers;
 import org.springframework.cloud.gateway.server.mvc.test.PermitAllSecurityConfiguration;

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/AfterFilterFunctionsTests.java

@@ -25,6 +25,7 @@
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.gateway.server.mvc.PermitAllSecurityConfiguration;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinTestcontainers;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinUriResolver;
 import org.springframework.cloud.gateway.server.mvc.test.PermitAllSecurityConfiguration;

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BodyFilterFunctionsTests.java

@@ -24,6 +24,7 @@
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.gateway.server.mvc.PermitAllSecurityConfiguration;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinTestcontainers;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinUriResolver;
 import org.springframework.cloud.gateway.server.mvc.test.PermitAllSecurityConfiguration;

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/RetryFilterFunctionTests.java

@@ -30,6 +30,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.cloud.gateway.server.mvc.PermitAllSecurityConfiguration;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinTestcontainers;
 import org.springframework.cloud.gateway.server.mvc.test.LocalServerPortUriResolver;
 import org.springframework.cloud.gateway.server.mvc.test.PermitAllSecurityConfiguration;

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/StripPrefixStaticPortTests.java

@@ -26,6 +26,7 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.cloud.gateway.server.mvc.PermitAllSecurityConfiguration;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinTestcontainers;
 import org.springframework.cloud.gateway.server.mvc.test.PermitAllSecurityConfiguration;
 import org.springframework.cloud.gateway.server.mvc.test.TestLoadBalancerConfig;

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/WeightRequestPredicateIntegrationTests.java

@@ -24,6 +24,7 @@
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.gateway.server.mvc.PermitAllSecurityConfiguration;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinTestcontainers;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinUriResolver;
 import org.springframework.cloud.gateway.server.mvc.test.PermitAllSecurityConfiguration;