From 9e23d48efb4146a61c3178665003791da5f35073 Mon Sep 17 00:00:00 2001
From: ilandn <ilandayans@gmail.com>
Date: Mon, 12 Dec 2022 10:44:50 -0600
Subject: [PATCH] bugid: FSA vars workspace variable fix CR_by: n/a

---
 src/main/java/com/checkmarx/jenkins/CxScanBuilder.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
index 91414ee7..d629eae0 100644
--- a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
+++ b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
@@ -849,21 +849,21 @@ private void setJvmVars(EnvVars env) {
             }
         }
     }
-    private Map<String, String> getAllFsaVars(EnvVars env) {
+    private Map<String, String> getAllFsaVars(EnvVars env, String workspacePath) {
         Map<String, String> sumFsaVars = new HashMap<>();
         // As job environment variable
         for (Map.Entry<String, String> entry : env.entrySet()) {
             if (entry.getKey().contains("CX_") ||
                     entry.getKey().contains("FSA_")) {
                 if (StringUtils.isNotEmpty(entry.getValue())) {
-                    sumFsaVars.put(entry.getKey(), entry.getValue());
+                    sumFsaVars.put(entry.getKey().trim(), entry.getValue().trim());
                 }
             }
         }
         // As custom field - for pipeline jobs
         String fsaVars = dependencyScanConfig != null ? dependencyScanConfig.fsaVariables : "";
         if (StringUtils.isNotEmpty(fsaVars)) {
-            fsaVars = fsaVars.contains("${WORKSPACE}") ? fsaVars.replace("${WORKSPACE}", env.get("WORKSPACE")) : fsaVars;
+            fsaVars = fsaVars.contains("${WORKSPACE}") ? fsaVars.replace("${WORKSPACE}", workspacePath) : fsaVars;
             try {
                 String[] vars = fsaVars.replaceAll("[\\n\\r]", "").trim().split(",");
                 for (String var : vars) {
@@ -910,7 +910,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @Nonnul
         final DescriptorImpl descriptor = getDescriptor();
         EnvVars env = run.getEnvironment(listener);
         setJvmVars(env);
-        Map<String, String> fsaVars = getAllFsaVars(env);
+        Map<String, String> fsaVars = getAllFsaVars(env, workspace.getRemote());
         CxScanConfig config = resolveConfiguration(run, descriptor, env, log);
 
         if (configAsCode) {