Fixing issue when setting nonProxyHosts (#12071)

wso2 · Aug 7, 2023 · 09ac714 · 09ac714
1 parent 32761fa
commit 09ac714
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/...n.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/internal/APIManagerComponent.java b/...n.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/internal/APIManagerComponent.java
@@ -1025,9 +1025,7 @@ void populateHttpClientConfiguration() {
             int proxyPort = Integer.parseInt(configuration.getFirstProperty(APIConstants.PROXY_PORT));
             String proxyUsername = configuration.getFirstProperty(APIConstants.PROXY_USERNAME);
             String proxyPassword = configuration.getFirstProperty(APIConstants.PROXY_PASSWORD);
-            String nonProxyHostsString = configuration.getFirstProperty(APIConstants.NON_PROXY_HOSTS);
-            String[] nonProxyHosts = configuration.getFirstProperty(nonProxyHostsString) != null ?
-                    nonProxyHostsString.split("\\|") : null;
+            String[] nonProxyHosts = getNonProxyHostsListByNonProxyHostsStringConfiguration(configuration);
             String proxyProtocol = configuration.getFirstProperty(APIConstants.PROXY_PROTOCOL);
             builder = builder.withProxy(proxyHost, proxyPort, proxyUsername, proxyPassword, proxyProtocol,
                     nonProxyHosts);
@@ -1071,6 +1069,18 @@ public boolean verify(String urlHostName, SSLSession session) {
         configuration.setHttpClientConfiguration(builder.withConnectionParams(maxTotal, defaultMaxPerRoute)
                 .withSSLContext(sslContext, hostnameVerifier).build());
     }
+
+    /**
+     * Populate list of NonProxyHosts for given nonProxyHostsString through APIManagerConfiguration
+     *
+     * @param config APIManagerConfiguration
+     * @return String array of proxy list
+     */
+    String[] getNonProxyHostsListByNonProxyHostsStringConfiguration(APIManagerConfiguration config) {
+        String nonProxyHostsString = config.getFirstProperty(APIConstants.NON_PROXY_HOSTS);
+        return nonProxyHostsString != null ? nonProxyHostsString.split("\\|") : null;
+    }
+
     @Reference(
             name = "apim.workflow.task.service",
             service = org.wso2.carbon.apimgt.api.model.WorkflowTaskService.class,

diff --git a/...imgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/internal/APIManagerComponentTest.java b/...imgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/internal/APIManagerComponentTest.java
@@ -27,6 +27,7 @@
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
+import org.wso2.carbon.apimgt.impl.APIConstants;
 import org.wso2.carbon.apimgt.impl.APIManagerConfiguration;
 import org.wso2.carbon.apimgt.impl.APIManagerConfigurationService;
 import org.wso2.carbon.apimgt.impl.dao.ApiMgtDAO;
@@ -133,6 +134,22 @@ public void testShouldActivateWhenAllPrerequisitesMet() throws Exception {
         }
     }
 
+    @Test
+    public void testShouldReturnNotNullValueForNotNullNonProxyHostsString() {
+
+        APIManagerConfiguration configuration = Mockito.mock(APIManagerConfiguration.class);
+        Registry registry = Mockito.mock(Registry.class);
+        APIManagerComponent apiManagerComponent = new APIManagerComponentWrapper(registry);
+        Mockito.when(configuration.getFirstProperty(APIConstants.NON_PROXY_HOSTS)).thenReturn("localhost");
+
+        try {
+            Assert.assertNotNull(
+                    apiManagerComponent.getNonProxyHostsListByNonProxyHostsStringConfiguration(configuration));
+        } catch (Exception ex) {
+            Assert.fail("Unexpected exception was thrown");
+        }
+    }
+
     @Test
     public void testShouldNotContinueWhenConfigurationUnAvailable() throws Exception {
         PowerMockito.mockStatic(APIUtil.class);
@@ -154,10 +171,8 @@ public void testShouldNotContinueWhenConfigurationUnAvailable() throws Exception
         }
     }
 
-
-
     @AfterClass
     public static void destroy() {
         System.clearProperty("carbon.home");
     }
-}
+}