SORMAS-Foundation#3605 added proxy support for hotfix (SORMAS-Foundation#3713)

Author: vidi42

SERVER_CUSTOMIZATION.md

@@ -88,3 +88,14 @@ The following features are currently configurable:
 * **Case Follow-Up** `CASE_FOLLOWUP`: Enables the contact follow-up module for cases as well to allow a more detailed daily documentation of symptoms.
 * **Line Listing** `LINE_LISTING`: Whether or not using line listing for case entry is enabled in the specified jurisdiction for the specified disease. Configurable from the UI, no database interaction needed.
 * **Documents** `DOCUMENTS`: Enables document storage.
+
+## Proxy Settings
+Some SORMAS integrations support proxy settings:
+* **Patient diary interface**
+* **Geocoding**
+* **SORMAS 2 SORMAS**
+
+The proxy can be configured through the following system properties which can be passed as JVM arguments to the server:
+* `org.jboss.resteasy.jaxrs.client.proxy.host`
+* `org.jboss.resteasy.jaxrs.client.proxy.port`
+* `org.jboss.resteasy.jaxrs.client.proxy.scheme`

sormas-backend/src/main/java/de/symeda/sormas/backend/externaljournal/ExternalJournalService.java

@@ -13,13 +13,13 @@
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import de.symeda.sormas.backend.util.ClientHelper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.routines.EmailValidator;
@@ -99,7 +99,7 @@ private String getSymptomJournalAuthTokenInternal() {
 			throw new IllegalArgumentException("Property interface.symptomjournal.secret is not defined");
 		}
 		try {
-			Client client = ClientBuilder.newClient();
+			Client client = ClientHelper.newBuilderWithProxy().build();
 			HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic(clientId, secret);
 			client.register(feature);
 			WebTarget webTarget = client.target(authenticationUrl);
@@ -146,7 +146,7 @@ private String getPatientDiaryAuthTokenInternal() {
 		}
 
 		try {
-			Client client = ClientBuilder.newClient();
+			Client client = ClientHelper.newBuilderWithProxy().build();
 			WebTarget webTarget = client.target(authenticationUrl);
 			Invocation.Builder invocationBuilder = webTarget.request(MediaType.APPLICATION_JSON);
 			Response response = invocationBuilder.post(Entity.json(ImmutableMap.of("email", email, "password", pass)));
@@ -315,7 +315,7 @@ public PatientDiaryRegisterResult registerPatientDiaryPerson(PersonDto person) {
 
 	private Invocation.Builder getExternalDataPersonInvocationBuilder(String personUuid) {
 		String externalDataUrl = configFacade.getPatientDiaryConfig().getProbandsUrl() + "/external-data/" + personUuid;
-		Client client = ClientBuilder.newClient();
+		Client client = ClientHelper.newBuilderWithProxy().build();
 		return client.target(externalDataUrl).request(MediaType.APPLICATION_JSON).header("x-access-token", getPatientDiaryAuthToken());
 	}
 
@@ -389,7 +389,7 @@ public Optional<PatientDiaryPersonQueryResponse> queryPatientDiary(String key, S
 			String queryParam = "\"" + key + "\" = \"" + value + "\"";
 			String encodedParams = URLEncoder.encode(queryParam, StandardCharsets.UTF_8.toString());
 			String fullUrl = probandsUrl + "?q=" + encodedParams;
-			Client client = ClientBuilder.newClient();
+			Client client = ClientHelper.newBuilderWithProxy().build();
 			Response response = client.target(fullUrl).request(MediaType.APPLICATION_JSON).header("x-access-token", getPatientDiaryAuthToken()).get();
 			if (response.getStatus() == NOT_FOUND_STATUS) {
 				return Optional.empty();

sormas-backend/src/main/java/de/symeda/sormas/backend/geocoding/GeocodingService.java

@@ -29,12 +29,12 @@
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
 
+import de.symeda.sormas.backend.util.ClientHelper;
 import org.apache.commons.text.StringSubstitutor;
 import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
@@ -90,7 +90,7 @@ private GeoLatLon getLatLon(LocationQuery query, String urlTemplate) {
 			throw new IllegalArgumentException(e);
 		}
 
-		Client client = ClientBuilder.newBuilder().connectTimeout(10, TimeUnit.SECONDS).readTimeout(10, TimeUnit.SECONDS).build();
+		Client client = ClientHelper.newBuilderWithProxy().connectTimeout(10, TimeUnit.SECONDS).readTimeout(10, TimeUnit.SECONDS).build();
 		WebTarget target = client.target(targetUrl);
 		Response response = target.request(MediaType.APPLICATION_JSON_TYPE).get();
 		String responseText = readResponseAsText(response);

sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/SormasToSormasRestClient.java

@@ -19,7 +19,6 @@
 
 import javax.enterprise.inject.Alternative;
 import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.core.MediaType;
@@ -29,6 +28,7 @@
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import de.symeda.sormas.backend.util.ClientHelper;
 
 @Alternative
 public class SormasToSormasRestClient {
@@ -54,7 +54,7 @@ public Response put(String host, String endpoint, String authToken, Object entit
 	}
 
 	private Invocation.Builder buildRestClient(String host, String endpoint, String authToken) {
-		return ClientBuilder.newBuilder()
+		return ClientHelper.newBuilderWithProxy()
 			.build()
 			.target(String.format(SORMAS_REST_URL_TEMPLATE, host, endpoint))
 			.request()

sormas-backend/src/main/java/de/symeda/sormas/backend/util/ClientHelper.java

@@ -0,0 +1,54 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.backend.util;
+
+import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
+
+import javax.ws.rs.client.ClientBuilder;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Helper class for creating REST clients injects supported properties from system properties.
+ *
+ * @author Alex Vidrean
+ * @since 04-Nov-20
+ */
+public class ClientHelper {
+
+	public static final List<String> SUPPORTED_PROXY_PROPERTIES = Arrays.asList(
+		ResteasyClientBuilder.PROPERTY_PROXY_HOST,
+		ResteasyClientBuilder.PROPERTY_PROXY_PORT,
+		ResteasyClientBuilder.PROPERTY_PROXY_SCHEME);
+
+	public static ClientBuilder newBuilderWithProxy() {
+		ClientBuilder clientBuilder = ClientBuilder.newBuilder();
+
+		if (clientBuilder instanceof ResteasyClientBuilder) {
+			System.getProperties()
+				.entrySet()
+				.stream()
+				.filter(property -> SUPPORTED_PROXY_PROPERTIES.contains(property.getKey().toString()))
+				.forEach(property -> clientBuilder.property(property.getKey().toString(), property.getValue()));
+
+		}
+		return clientBuilder;
+	}
+
+}