make use of undertows handling of xforward headers

Author: bechte

core-customize/hybris/bin/custom/cxdevtools/cxdevproxy/resources/cxdevproxy/config/cxdevproxy-interceptor-spring.xml

@@ -2,13 +2,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<!-- Forwarded-For Header Interceptor -->
-	<bean id="cxdevproxyInterceptorForwardedHeaders" class="me.cxdev.commerce.proxy.interceptor.ForwardedHeadersInterceptor">
-		<property name="serverHostname" value="${cxdevproxy.server.hostname}" />
-		<property name="serverProtocol" value="${cxdevproxy.server.protocol}" />
-		<property name="serverPort" value="${cxdevproxy.server.port}" />
-	</bean>
-
 	<!-- Prepared CORS Injector Interceptor, needs to be activated if needed -->
 	<bean id="cxdevproxyInterceptorCorsInjector" class="me.cxdev.commerce.proxy.interceptor.CorsInjectorInterceptor"/>
 

core-customize/hybris/bin/custom/cxdevtools/cxdevproxy/resources/cxdevproxy/rulesets/cxdevproxy-backend-rules.groovy

@@ -1,5 +1 @@
-return [
-    interceptor()
-        .constrainedBy( isMethod("GET"), pathMatches("/**/carts/current") )
-        .perform( jsonResponse('{"type": "cartWsDTO", "totalItems": 5}') )
-]
+return []

core-customize/hybris/bin/custom/cxdevtools/cxdevproxy/resources/cxdevproxy/rulesets/cxdevproxy-frontend-rules.groovy

@@ -1,3 +1 @@
-def interceptor = []
-interceptor << forwardedHeaders
-return interceptor
+return []

core-customize/hybris/bin/custom/cxdevtools/cxdevproxy/src/me/cxdev/commerce/proxy/livecycle/UndertowProxyManager.java

@@ -202,20 +202,29 @@ public void start() {
 		LOG.info("Starting embedded Undertow proxy (Protocol: {})...", this.serverProtocol);
 
 		try {
+			XnioSsl frontendSslContext = "https".equalsIgnoreCase(frontendProtocol) ? createTrustAllXnioSsl(frontendHostname) : null;
 			String frontendUrl = frontendProtocol + "://" + frontendHostname + ":" + frontendPort;
 			LoadBalancingProxyClient frontendClient = new LoadBalancingProxyClient()
-					.addHost(new URI(frontendUrl), createTrustAllXnioSsl(frontendHostname))
+					.addHost(new URI(frontendUrl), frontendSslContext)
 					.setConnectionsPerThread(20);
 
+			XnioSsl backendSslContext = "https".equalsIgnoreCase(backendProtocol) ? createTrustAllXnioSsl(backendHostname) : null;
 			String backendUrl = backendProtocol + "://" + backendHostname + ":" + backendPort;
 			LoadBalancingProxyClient backendClient = new LoadBalancingProxyClient()
-					.addHost(new URI(backendUrl), createTrustAllXnioSsl(backendHostname))
+					.addHost(new URI(backendUrl), backendSslContext)
 					.setConnectionsPerThread(20);
 
-			HttpHandler baseFrontendHandler = ProxyHandler.builder().setProxyClient(frontendClient).build();
+			HttpHandler baseFrontendHandler = ProxyHandler.builder()
+					.setProxyClient(frontendClient)
+					.setReuseXForwarded(true)
+					.build();
 			HttpHandler finalFrontendHandler = applyRules(frontendHandlersRef.get(), baseFrontendHandler);
 
-			HttpHandler baseBackendHandler = ProxyHandler.builder().setProxyClient(backendClient).setMaxRequestTime(30000).build();
+			HttpHandler baseBackendHandler = ProxyHandler.builder()
+					.setProxyClient(backendClient)
+					.setMaxRequestTime(30000)
+					.setReuseXForwarded(true)
+					.build();
 			HttpHandler finalBackendHandler = applyRules(backendHandlersRef.get(), baseBackendHandler);
 
 			List<String> activeBackendContexts = determineBackendContexts();

core-customize/hybris/bin/custom/cxdevtools/cxdevproxy/testsrc/me/cxdev/commerce/proxy/livecycle/GroovyRuleEngineServiceTest.java

@@ -54,7 +54,6 @@ void setUp() {
 
 		// Setup Spring ApplicationContext mocks with custom bean names to test the prefix stripping
 		Map<String, ProxyExchangeInterceptor> interceptors = new HashMap<>();
-		interceptors.put("cxdevproxyInterceptorForwardedHeaders", mockInterceptor);
 		interceptors.put("customInterceptorWithoutPrefix", mockInterceptor); // Edge case
 
 		Map<String, ProxyExchangeInterceptorCondition> conditions = new HashMap<>();
@@ -129,8 +128,7 @@ void testEvaluateScript_WithValidScriptAndBindings(@TempDir Path tempDir) throws
 		assertNotNull(result, "Result list should not be null");
 		assertEquals(2, result.size(), "Script should return exactly two interceptors");
 
-		// Assert that the first returned interceptor is the exact mock instance we injected,
-		// proving that 'forwardedHeaders' was successfully bound to 'cxdevproxyInterceptorForwardedHeaders'
+		// Assert that the first returned interceptor is the exact mock instance we injected
 		assertEquals(mockInterceptor, result.get(0));
 	}