Added undefined to Proxy setup #3260

mercedes-benz · Jul 2, 2024 · 13b0354 · 13b0354
1 parent fd20b6e
commit 13b0354
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/...c/main/java/com/mercedesbenz/sechub/wrapper/prepare/PrepareWrapperPreparationService.java b/...c/main/java/com/mercedesbenz/sechub/wrapper/prepare/PrepareWrapperPreparationService.java
@@ -54,6 +54,7 @@ public AdapterExecutionResult startPreparation() throws IOException {
         }
 
         LOG.info("Start preparation with following modules: {}", modules);
+        setUpSystemProperties(context);
 
         for (PrepareWrapperModule module : modules) {
             if (!module.isEnabled()) {
@@ -64,7 +65,6 @@ public AdapterExecutionResult startPreparation() throws IOException {
             if (module.isResponsibleToPrepare(context)) {
                 LOG.debug("Module: {} is responsible and will be used to prepare", module);
 
-                setUpSystemProperties(context);
                 module.prepare(context);
 
                 PrepareResult result = new PrepareResult(PrepareStatus.OK);

diff --git a/...are/src/main/java/com/mercedesbenz/sechub/wrapper/prepare/PrepareWrapperProxySupport.java b/...are/src/main/java/com/mercedesbenz/sechub/wrapper/prepare/PrepareWrapperProxySupport.java
@@ -9,10 +9,12 @@
 @Component
 public class PrepareWrapperProxySupport {
 
-    @Value("${" + KEY_PDS_HTTPS_PROXY + "}")
+    private final static String UNDEFINED = "";
+
+    @Value("${" + KEY_PDS_HTTPS_PROXY + ":" + UNDEFINED +"}")
     String httpsProxy;
 
-    @Value("${" + KEY_PDS_NO_PROXY + "}")
+    @Value("${" + KEY_PDS_NO_PROXY + ":" + UNDEFINED +"}")
     String noProxy;
 
     @Value("${" + KEY_PDS_PREPARE_PROXY_ENABLED + ":false}")
@@ -59,7 +61,12 @@ private String resolveHostname() {
     }
 
     private String resolvePort() {
-        String port = httpsProxy.split(":")[1];
+        String [] splitProxy = httpsProxy.split(":");
+        if (splitProxy.length < 2) {
+            throw new IllegalStateException(
+                    "No port number is set. Please set the environment variable: " + KEY_PDS_HTTPS_PROXY + " with the format: <hostname>:<port>");
+        }
+        String port = splitProxy[1];
         assertPort(port);
         return port;
     }