Merge pull request #1023 from terrestris/fix/proxy-scheme

fix: remove baseURL from request params and scheme from proxy host

Author: ahennr

shogun-lib/src/main/java/de/terrestris/shogun/lib/util/HttpUtil.java

@@ -2229,7 +2229,7 @@ private static HttpHost getSystemProxy(URI uri) throws UnknownHostException {
 
         if (proxyHost != null && proxyPort > 0) {
             log.debug("Using proxy from system properties: Host=" + proxyHost + ", Port=" + proxyPort);
-            return new HttpHost(scheme, InetAddress.getByName(proxyHost), proxyPort);
+            return new HttpHost(InetAddress.getByName(proxyHost), proxyPort);
         }
 
         log.debug("Attempting to detect system proxy via ProxySelector.");
@@ -2245,7 +2245,6 @@ private static HttpHost getSystemProxy(URI uri) throws UnknownHostException {
                 );
 
                 return new HttpHost(
-                    scheme,
                     InetAddress.getByName(address.getHostName()),
                     address.getPort()
                 );

shogun-proxy/src/main/java/de/terrestris/shogun/service/HttpProxyService.java

@@ -239,9 +239,15 @@ private URL buildUriWithParameters(URL url, Map<String, String> params) throws U
             return url;
         }
         URIBuilder uriBuilder = new URIBuilder(url.toURI());
-        for (Map.Entry<String, String> entry : params.entrySet()) {
-            uriBuilder.addParameter(entry.getKey(), entry.getValue());
-        }
+
+        params.forEach((key, value) -> {
+            if (!StringUtils.equalsIgnoreCase(key, "baseUrl")) {
+                uriBuilder.addParameter(key, value);
+            } else {
+                log.warn("Skipping baseUrl empty parameter: baseUrl ={}", value);
+            }
+        });
+
         return uriBuilder.build().toURL();
     }
 

shogun-proxy/src/test/java/de/terrestris/shogun/service/HttpProxyServiceTest.java

@@ -291,4 +291,49 @@ public void proxy_returns_400_for_erroneous_FormMultipartPost_requests() throws
             assertEquals("Returned Status matched", HttpProxyService.ERR_MSG_400_COMMON, responseEntity.getBody());
         }
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"http", "https"})
+    @DisplayName("Should use system proxy settings when forwarding request")
+    public void proxy_uses_system_proxy_settings(String scheme) throws Exception {
+        // Set system proxy properties
+        final String proxyHost = "1.2.2.4";
+        System.setProperty("%s.proxyHost".formatted(scheme), proxyHost);
+        System.setProperty("%s.proxyPort".formatted(scheme), "8888");
+
+        HttpServletRequest mockedRequest = mock(HttpServletRequest.class);
+        final String baseUrl = "%s://my-test-example.org/resource".formatted(scheme);
+        final URI baseUri = new URI(baseUrl);
+        HttpResponse mockedResponse = mock(HttpResponse.class);
+
+        final HttpHeaders headers = new HttpHeaders();
+        headers.add(HttpHeaders.CONTENT_TYPE, "text/plain");
+        HttpStatus status = HttpStatus.OK;
+
+        when(mockedResponse.getHeaders()).thenReturn(headers);
+        when(mockedResponse.getBody()).thenReturn("proxied".getBytes());
+        when(mockedResponse.getStatusCode()).thenReturn(status);
+
+        try (
+            MockedStatic<HttpUtil> httpUtilMock = mockStatic(HttpUtil.class)
+        ) {
+            httpUtilMock.when(() -> HttpUtil.isHttpGetRequest(mockedRequest)).thenReturn(true);
+            httpUtilMock.when(() -> HttpUtil.forwardGet(baseUri, mockedRequest, false)).thenAnswer(invocation -> {
+                // Assert system proxy properties are set
+                assertEquals("Proxy host does not match", proxyHost, System.getProperty("%s.proxyHost".formatted(scheme)));
+                assertEquals("Proxy port does not match", "8888", System.getProperty("%s.proxyPort".formatted(scheme)));
+                return mockedResponse;
+            });
+
+            final ResponseEntity<?> responseEntity = httpProxyService.doProxy(mockedRequest, baseUrl, null);
+            assertEquals("HttpStatus does not match", HttpStatus.OK, responseEntity.getStatusCode());
+            assertNotNull("Response body is null.", responseEntity.getBody());
+            assertEquals("Proxies request body does not match", "proxied", new String((byte[]) responseEntity.getBody()));
+        } finally {
+            // Cleanup system properties
+            System.clearProperty("%s.proxyHost".formatted(scheme));
+            System.clearProperty("%s.proxyPort".formatted(scheme));
+        }
+    }
+
 }

shogun-proxy/src/test/resources/application-proxy-test.yml

@@ -39,3 +39,4 @@ shogun-proxy:
     - localhost
     - localhost:8080
     - terrestris.de
+    - my-test-example.org