Skip to content
Snippets Groups Projects
Commit 89eef6f9 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4044 skip proxy setting when not configured

parent c926ce60
No related branches found
No related tags found
No related merge requests found
...@@ -92,7 +92,7 @@ public class OzgCloudFormDataHttpClient { ...@@ -92,7 +92,7 @@ public class OzgCloudFormDataHttpClient {
ProxyConfig getProxyConfig() { ProxyConfig getProxyConfig() {
var proxyConfig = config.getProxyConfig(); var proxyConfig = config.getProxyConfig();
if (nonNull(proxyConfig.getHost())) { if (isNoneBlank(proxyConfig.getHost())) {
return proxyConfig; return proxyConfig;
} }
if (isNull(systemProxyConfig)) { if (isNull(systemProxyConfig)) {
...@@ -188,8 +188,10 @@ public class OzgCloudFormDataHttpClient { ...@@ -188,8 +188,10 @@ public class OzgCloudFormDataHttpClient {
HttpClientContext createContext() { HttpClientContext createContext() {
var clientContext = HttpClientContext.create(); var clientContext = HttpClientContext.create();
if (nonNull(getProxyConfig())) {
clientContext.setCredentialsProvider(getCredentialsProvider()); clientContext.setCredentialsProvider(getCredentialsProvider());
clientContext.setAuthCache(createAuthCache()); clientContext.setAuthCache(createAuthCache());
}
return clientContext; return clientContext;
} }
......
...@@ -45,12 +45,12 @@ public class PluginBundleProperties implements IBundleProperties { ...@@ -45,12 +45,12 @@ public class PluginBundleProperties implements IBundleProperties {
@Override @Override
public Map<String, IBundleConfigParam> getConfigProperties(IPluginResourceHelper resHelper, Locale currentLocale) { public Map<String, IBundleConfigParam> getConfigProperties(IPluginResourceHelper resHelper, Locale currentLocale) {
var configMap = new LinkedHashMap<String, IBundleConfigParam>(); var configMap = new LinkedHashMap<String, IBundleConfigParam>();
configMap.put(KEY_EINGANGSADAPTER_URL, new BundleConfigParam("Eingangsadapter URL", "", MANDATORY)); configMap.put(KEY_EINGANGSADAPTER_URL, new BundleConfigParam(KEY_EINGANGSADAPTER_URL, "", MANDATORY));
configMap.put("proxy", new BundleConfigGroupItem("Konfiguration für den Proxy", "")); configMap.put("proxy", new BundleConfigGroupItem("Konfiguration für den Proxy", ""));
configMap.put(KEY_PROXY_HOST, new BundleConfigParam("proxyHost", "", NOT_MANDATORY)); configMap.put(KEY_PROXY_HOST, new BundleConfigParam(KEY_PROXY_HOST, "", NOT_MANDATORY));
configMap.put(KEY_PROXY_PORT, new BundleConfigParam("proxyPort", "", NOT_MANDATORY)); configMap.put(KEY_PROXY_PORT, new BundleConfigParam(KEY_PROXY_PORT, "", NOT_MANDATORY));
configMap.put(KEY_PROXY_USER, new BundleConfigParam("proxyUser", "", NOT_MANDATORY)); configMap.put(KEY_PROXY_USER, new BundleConfigParam(KEY_PROXY_USER, "", NOT_MANDATORY));
configMap.put(KEY_PROXY_PASSWORD, new BundleConfigParam("proxyPassword", "", NOT_MANDATORY, CRYPTIC_VALUE)); configMap.put(KEY_PROXY_PASSWORD, new BundleConfigParam(KEY_PROXY_PASSWORD, "", NOT_MANDATORY, CRYPTIC_VALUE));
return Collections.unmodifiableMap(configMap); return Collections.unmodifiableMap(configMap);
} }
} }
...@@ -439,6 +439,16 @@ class OzgCloudFormDataHttpClientTest { ...@@ -439,6 +439,16 @@ class OzgCloudFormDataHttpClientTest {
assertThat(result.getAuthCache()).isEqualTo(authCache); assertThat(result.getAuthCache()).isEqualTo(authCache);
} }
@Test
void shouldReturnEmptyContext() {
doReturn(null).when(client).getProxyConfig();
client.createContext();
verify(client, never()).getCredentialsProvider();
verify(client, never()).createAuthCache();
}
} }
} }
......
...@@ -27,7 +27,7 @@ public class ProxyConfigTestFactory { ...@@ -27,7 +27,7 @@ public class ProxyConfigTestFactory {
public static final Integer PROXY_PORT = Integer.parseInt(PropertiesTestFactory.PROXY_PORT); public static final Integer PROXY_PORT = Integer.parseInt(PropertiesTestFactory.PROXY_PORT);
public static ProxyConfig createEmpty() { public static ProxyConfig createEmpty() {
return ProxyConfig.builder().build(); return createBuilder().host("").port(null).user("").password("").build();
} }
public static ProxyConfig create() { public static ProxyConfig create() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment