fix slash not present in repoUrl and issues with branched project

checkmarx-ltd · Dec 7, 2021 · a89b63c · a89b63c
1 parent 3d6accb
commit a89b63c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/com/checkmarx/flow/sastscanning/ScanRequestConverter.java b/src/main/java/com/checkmarx/flow/sastscanning/ScanRequestConverter.java
@@ -235,6 +235,15 @@ public CxScanParams prepareScanParamsObject(ScanRequest request, File cxFile, St
             params.withDefaultBranch(Constants.CX_BRANCH_PREFIX.concat(request.getDefaultBranch()));
         }
 
+        if(StringUtils.isEmpty(request.getDefaultBranch()) && StringUtils.isNotEmpty(request.getMergeTargetBranch())) {
+            params.withDefaultBranch(Constants.CX_BRANCH_PREFIX.concat(request.getMergeTargetBranch()));
+        }
+
+        if(StringUtils.isEmpty(request.getDefaultBranch()) && StringUtils.isEmpty(request.getMergeTargetBranch())) {
+            params.withDefaultBranch(Constants.CX_BRANCH_PREFIX.concat(""));
+        }
+
+
         if (cxFile != null) {
             params.setSourceType(CxScanParams.Type.FILE);
             params.setFilePath(cxFile.getAbsolutePath());

diff --git a/src/main/java/com/checkmarx/flow/utils/ScanUtils.java b/src/main/java/com/checkmarx/flow/utils/ScanUtils.java
@@ -287,6 +287,9 @@ public static String getFileUrl(ScanRequest request, String filename) {
         String branch = request.getBranch();
         if(!ScanUtils.empty(request.getRepoUrl()) && !ScanUtils.empty(branch)) {
             String repoUrl = request.getRepoUrl().replace(".git", "/");
+            if(!(repoUrl.substring(repoUrl.length() - 1).equals("/"))){
+                repoUrl = repoUrl.concat("/");
+            }
             if (request.getRepoType().equals(ScanRequest.Repository.BITBUCKETSERVER)) {
                 String url = request.getAdditionalMetadata("BITBUCKET_BROWSE");
                 if(url != null && !url.isEmpty()){