[ALS-5065] Create proxy endpoint to enable dockerized services

- Create endpoint to proxy requests
hms-dbmi · Nov 16, 2023 · 519ecc2 · 519ecc2
1 parent 097ff66
commit 519ecc2
Show file tree

Hide file tree

Showing 5 changed files with 186 additions and 5 deletions.
diff --git a/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/PicsureRS.java b/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/PicsureRS.java
@@ -10,10 +10,7 @@
 import javax.ws.rs.core.Response;
 
 import edu.harvard.dbmi.avillach.domain.*;
-import edu.harvard.dbmi.avillach.service.FormatService;
-import edu.harvard.dbmi.avillach.service.PicsureInfoService;
-import edu.harvard.dbmi.avillach.service.PicsureQueryService;
-import edu.harvard.dbmi.avillach.service.PicsureSearchService;
+import edu.harvard.dbmi.avillach.service.*;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.info.Info;
@@ -41,6 +38,9 @@ public class PicsureRS {
 	@Inject
 	FormatService formatService;
 
+	@Inject
+	ProxyWebClient proxyWebClient;
+
 	@POST
 	@Path("/info/{resourceId}")
 	@Operation(
@@ -271,5 +271,27 @@ public QueryStatus queryMetadata(@PathParam("queryId") UUID queryId, @Context Ht
 	public Response generateContinuousBin(QueryRequest continuousData, @Context HttpHeaders headers) {
 		return formatService.format(continuousData, headers);
 	}
+
+
+	@POST
+	@Path("/proxy/{container}/{request : .+}")
+	@Operation(hidden = true)
+	public Response postProxy(
+		@PathParam("container") String containerId,
+		@PathParam("request") String request,
+		String body
+	) {
+		return proxyWebClient.postProxy(containerId, request, body);
+	}
+
+	@GET
+	@Path("/proxy/{container}/{request : .+}")
+	@Operation(hidden = true)
+	public Response getProxy(
+		@PathParam("container") String containerId,
+		@PathParam("request") String request
+	) {
+		return proxyWebClient.getProxy(containerId, request);
+	}
 
 }
diff --git a/...es/pic-sure-resource-api/src/main/java/edu/harvard/dbmi/avillach/service/IResourceRS.java b/...es/pic-sure-resource-api/src/main/java/edu/harvard/dbmi/avillach/service/IResourceRS.java
@@ -6,6 +6,7 @@
 import edu.harvard.dbmi.avillach.domain.*;
 import io.swagger.v3.oas.annotations.Operation;
 
+import java.util.Map;
 import java.util.UUID;
 
 @Path("/pic-sure")
@@ -81,4 +82,26 @@ default Response generateContinuousBin(QueryRequest continuousData) {
 		throw new NotSupportedException();
 	}
 
+
+	@POST
+	@Path("/proxy/{container}/{request : .+}")
+	@Operation(hidden = true)
+	default Response postProxy(
+		@PathParam("containerId") String containerId,
+		@PathParam("request") String request,
+		String body
+	) {
+		throw new NotSupportedException();
+	}
+
+	@GET
+	@Path("/proxy/{container}/{request : .+}")
+	@Operation(hidden = true)
+	default Response getProxy(
+		@PathParam("containerId") String containerId,
+		@PathParam("request") String request
+	) {
+		throw new NotSupportedException();
+	}
+
 }
diff --git a/...pic-sure-resource-api/src/main/java/edu/harvard/dbmi/avillach/service/ProxyWebClient.java b/...pic-sure-resource-api/src/main/java/edu/harvard/dbmi/avillach/service/ProxyWebClient.java
@@ -0,0 +1,70 @@
+package edu.harvard.dbmi.avillach.service;
+
+import edu.harvard.dbmi.avillach.util.HttpClientUtil;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.entity.StringEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+@ApplicationScoped
+public class ProxyWebClient {
+    private static final Logger LOG = LoggerFactory.getLogger(ProxyWebClient.class);
+    HttpClient client;
+
+    public ProxyWebClient() {
+        client = HttpClientUtil.getConfiguredHttpClient();
+    }
+
+    public Response postProxy(String containerId, String path, String body) {
+        try {
+            URI uri = new URIBuilder()
+                .setScheme("http")
+                .setHost(containerId)
+                .setPath(path)
+                .build();
+            HttpPost request = new HttpPost(uri);
+            request.setEntity(new StringEntity(body));
+            request.addHeader("Content-Type", "application/json");
+            return getResponse(request);
+        } catch (URISyntaxException e) {
+            LOG.warn("Failed to construct URI. Container: {} Path: {}", containerId, path);
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public Response getProxy(String containerId, String path) {
+        try {
+            URI uri = new URIBuilder()
+                .setScheme("http")
+                .setHost(containerId)
+                .setPath(path)
+                .build();
+            HttpGet request = new HttpGet(uri);
+            return getResponse(request);
+        } catch (URISyntaxException e) {
+            LOG.warn("Failed to construct URI. Container: {} Path: {}", containerId, path);
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Response getResponse(HttpRequestBase request) throws IOException {
+        HttpResponse response = client.execute(request);
+        return Response.ok(response.getEntity().getContent()).build();
+    }
+}
diff --git a/...sure-resource-api/src/test/java/edu/harvard/dbmi/avillach/service/ProxyWebClientTest.java b/...sure-resource-api/src/test/java/edu/harvard/dbmi/avillach/service/ProxyWebClientTest.java
@@ -0,0 +1,66 @@
+package edu.harvard.dbmi.avillach.service;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import javax.ws.rs.core.Response;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import static org.junit.Assert.*;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ProxyWebClientTest {
+
+    @Mock
+    private HttpClient client;
+
+    @Mock
+    private HttpResponse response;
+
+    @Mock
+    private HttpEntity entity;
+
+    @InjectMocks
+    private ProxyWebClient subject;
+
+    @Test
+    public void shouldPostToProxy() throws IOException {
+        Mockito.when(client.execute(Mockito.any(HttpPost.class)))
+            .thenReturn(response);
+        Mockito.when(response.getEntity())
+            .thenReturn(entity);
+        Mockito.when(entity.getContent())
+            .thenReturn(new ByteArrayInputStream("{}".getBytes()));
+        subject.client = client;
+
+        Response actual = subject.postProxy("foo", "/my/cool/path", "{}");
+
+        Assert.assertEquals(200, actual.getStatus());
+    }
+
+    @Test
+    public void shouldGetToProxy() throws IOException {
+        Mockito.when(client.execute(Mockito.any(HttpGet.class)))
+            .thenReturn(response);
+        Mockito.when(response.getEntity())
+            .thenReturn(entity);
+        Mockito.when(entity.getContent())
+            .thenReturn(new ByteArrayInputStream("{}".getBytes()));
+        subject.client = client;
+
+        Response actual = subject.getProxy("bar", "/my/cool/path");
+
+        Assert.assertEquals(200, actual.getStatus());
+    }
+}
diff --git a/pic-sure-util/src/main/java/edu/harvard/dbmi/avillach/util/HttpClientUtil.java b/pic-sure-util/src/main/java/edu/harvard/dbmi/avillach/util/HttpClientUtil.java
@@ -348,7 +348,7 @@ public static JsonNode simpleGetWithConfig(
 		}
 	}
 
-	private static HttpClient getConfiguredHttpClient() {
+	public static HttpClient getConfiguredHttpClient() {
 		try {
 			SSLConnectionSocketFactory.getSocketFactory();
 			SSLContext sslContext = SSLContext.getInstance("TLSv1.2");