Avoid replacing single quote in special flags that may contain single quote (AST-116875) (#122)

cx-umesh-waghode · web-flow · commit 685b4af186c6 · 2025-10-17T16:49:39.000+05:30
* Avoid replacing single quote in special flags that may contain single quote
diff --git a/src/main/wrapper/ExecutionService.ts b/src/main/wrapper/ExecutionService.ts
@@ -26,6 +26,7 @@ import CxAsca from "../asca/CxAsca";
 
 let skipValue = false;
 const fileSourceFlag = "--file-source"
+const scaResolverParamsFlag = "--sca-resolver-params"
 
 function isJsonString(s: string) {
     try {
@@ -53,12 +54,12 @@ function transform(n:string) {
         return r;
     }
     // If the current string is "--file-source", set the flag
-    if (n === fileSourceFlag) {
+    if (n === fileSourceFlag || n === "-s" || n === scaResolverParamsFlag) {
         skipValue = true;
     }
 
     let r = "";
-    if(n) r = n.replace(/"/g, "").replace("/[, ]/g",",");
+    if(n) r = n.replace(/"'/g, "").replace("/[, ]/g",",");
     return r;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import CxAsca from "../asca/CxAsca";`
`26`	`26`
`27`	`27`	`let skipValue = false;`
`28`	`28`	`const fileSourceFlag = "--file-source"`
	`29`	`+const scaResolverParamsFlag = "--sca-resolver-params"`
`29`	`30`
`30`	`31`	`function isJsonString(s: string) {`
`31`	`32`	`try {`
`@@ -53,12 +54,12 @@ function transform(n:string) {`
`53`	`54`	`return r;`
`54`	`55`	`}`
`55`	`56`	`// If the current string is "--file-source", set the flag`
`56`		`- if (n === fileSourceFlag) {`
	`57`	`+ if (n === fileSourceFlag \|\| n === "-s" \|\| n === scaResolverParamsFlag) {`
`57`	`58`	`skipValue = true;`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`let r = "";`
`61`		`- if(n) r = n.replace(/"/g, "").replace("/[, ]/g",",");`
	`62`	`+ if(n) r = n.replace(/"'/g, "").replace("/[, ]/g",",");`
`62`	`63`	`return r;`
`63`	`64`	`}`
`64`	`65`