feat(http): support HTTP-Proxy connections on client level

2 files changed, 75 insertions, 2 deletions

diff --git a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java
index 7f0240ef..243205c9 100644
--- a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java
+++ b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java
@@ -20,6 +20,7 @@ import java.security.cert.X509Certificate;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.hc.client5.http.ClientProtocolException;
+import org.apache.hc.client5.http.HttpHostConnectException;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
@@ -42,6 +43,7 @@ import org.springframework.test.annotation.DirtiesContext.MethodMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.impl.credential.EaafKeyStoreFactory;
 import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration;
@@ -52,8 +54,10 @@ import at.gv.egiz.eaaf.core.impl.http.HttpClientConfiguration;
 import at.gv.egiz.eaaf.core.impl.http.HttpUtils;
 import at.gv.egiz.eaaf.core.impl.http.IHttpClientFactory;
 import at.gv.egiz.eaaf.core.impl.utils.StreamUtils;
+import at.gv.egiz.eaaf.core.test.dummy.DummyAuthConfigMap;
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
+import lombok.SneakyThrows;
 import okhttp3.HttpUrl;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
@@ -67,8 +71,14 @@ import okhttp3.tls.HeldCertificate;
 @DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
 public class HttpClientFactoryTest {
 
-  @Autowired private EaafKeyStoreFactory keyStoreFactory;
-  @Autowired private IHttpClientFactory httpClientFactory;
+  @Autowired
+  EaafKeyStoreFactory keyStoreFactory;
+
+  @Autowired
+  IHttpClientFactory httpClientFactory;
+
+  @Autowired
+  DummyAuthConfigMap basicConfig;
 
   private MockWebServer mockWebServer = null;
   private HttpUrl mockServerUrl;
@@ -100,6 +110,8 @@ public class HttpClientFactoryTest {
    */
   @Before
   public void setup() {
+    basicConfig.putConfigValue("client.http.connection.proxy.host", "localhost");
+    basicConfig.putConfigValue("client.http.connection.proxy.port", "8080");
 
   }
 
@@ -170,6 +182,64 @@ public class HttpClientFactoryTest {
   }
 
   @Test
+  @SneakyThrows
+  public void clientWithHttpProxyModeWrongPort() throws EaafException {
+    basicConfig.putConfigValue("client.http.connection.proxy.port", "8081");
+
+    final HttpClientConfiguration config = new HttpClientConfiguration("jUnit-withProxy");
+    config.setEnableHttpProxyMode(true);
+
+    final CloseableHttpClient client = httpClientFactory.getHttpClient(config);
+    Assert.assertNotNull("httpClient", client);
+
+    mockWebServer = new MockWebServer();
+    mockServerUrl = mockWebServer.url("/sp/junit");
+    mockWebServer.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    final HttpUriRequest httpGet1 = new HttpGet(mockServerUrl.url().toString());
+    assertThrows(HttpHostConnectException.class, () -> client.execute(httpGet1));
+
+  }
+
+  @Test
+  @SneakyThrows
+  public void clientWithHttpProxyMode() throws EaafException {
+    final HttpClientConfiguration config = new HttpClientConfiguration("jUnit-withProxy");
+    config.setEnableHttpProxyMode(true);
+
+    final CloseableHttpClient client = httpClientFactory.getHttpClient(config);
+    Assert.assertNotNull("httpClient", client);
+
+    MockWebServer mockProxy = new MockWebServer();
+    mockProxy.start(8080);
+    mockProxy.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    mockWebServer = new MockWebServer();
+    mockServerUrl = mockWebServer.url("/sp/junit");
+    mockWebServer.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    final HttpUriRequest httpGet1 = new HttpGet(mockServerUrl.url().toString());
+    final CloseableHttpResponse httpResp1 = client.execute(httpGet1);
+    Assert.assertEquals("http statusCode", 200, httpResp1.getCode());
+
+    mockProxy.close();
+
+  }
+
+  @Test
+  public void clientWithHttpProxyModeMissingHost() throws EaafException {
+    basicConfig.removeConfigValue("client.http.connection.proxy.host");
+
+    final HttpClientConfiguration config = new HttpClientConfiguration("jUnit-withProxy");
+    config.setEnableHttpProxyMode(true);
+    assertThrows(EaafConfigurationException.class, () -> httpClientFactory.getHttpClient(config));
+
+  }
+
+  @Test
   public void getCustomClientUnknownAuthMethod() throws EaafException {
     final HttpClientConfiguration config = new HttpClientConfiguration("jUnit");
     config.setAuthMode(RandomStringUtils.randomAlphabetic(5));
diff --git a/eaaf_core_utils/src/test/resources/data/config1.properties b/eaaf_core_utils/src/test/resources/data/config1.properties
index 1bcc1fb3..ec5e45a7 100644
--- a/eaaf_core_utils/src/test/resources/data/config1.properties
+++ b/eaaf_core_utils/src/test/resources/data/config1.properties
@@ -9,6 +9,9 @@ client.http.connection.timeout.socket=2
 client.http.connection.timeout.connection=2
 client.http.connection.timeout.request=2
 
+client.http.connection.proxy.host=localhost
+client.http.connection.proxy.port=8080
+
 core.pendingrequestid.maxlifetime=180
 core.pendingrequestid.digist.type=passphrase
 core.pendingrequestid.digist.secret=pendingReqIdSecret