Merge pull request #405 from checkmarx-ltd/develop

Incremental Scan Issues
checkmarx-ltd · May 28, 2024 · 4dbc488 · 4dbc488
2 parents fd52d57 + 1251546
commit 4dbc488
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.github.checkmarx-ltd</groupId>
 	<artifactId>cx-spring-boot-sdk</artifactId>
-	<version>0.6.7</version>
+	<version>0.6.8</version>
 
 
 	<name>cx-spring-boot-sdk</name>

diff --git a/src/main/java/com/checkmarx/sdk/config/CxProperties.java b/src/main/java/com/checkmarx/sdk/config/CxProperties.java
@@ -100,6 +100,9 @@ public class CxProperties extends CxPropertiesBase{
     @Getter @Setter
     private Boolean overrideProjectSetting = true;
 
+    @Getter @Setter
+    private Boolean considerScanningStatus = false;
+
 
     /**
      * Maps finding state ID (as returned in CxSAST report) to state name (as specified in filter configuration).

diff --git a/src/main/java/com/checkmarx/sdk/service/CxService.java b/src/main/java/com/checkmarx/sdk/service/CxService.java
@@ -284,13 +284,20 @@ public JSONObject getScanData(String scanId) {
 
         log.info("Finding last Scan Id for project Id {}", projectId);
         try {
-            UriComponents uriComponents = UriComponentsBuilder
+
+            UriComponents uriComponents = cxProperties.getConsiderScanningStatus() ? (UriComponentsBuilder
                     .fromHttpUrl(cxProperties.getUrl())
                     .path(SCAN)
                     .queryParam("projectId", projectId.toString())
-                    .queryParam("scanStatus", SCAN_STATUS_FINISHED.toString())
-                    .queryParam("last",cxProperties.getIncrementalNumScans().toString())
-                    .build();
+                    .queryParam("last", cxProperties.getIncrementalNumScans().toString())
+                    .build()) : (UriComponentsBuilder
+                    .fromHttpUrl(cxProperties.getUrl())
+                    .path(SCAN)
+                    .queryParam("projectId", projectId.toString())
+                    .queryParam("scanStatus",
+                            SCAN_STATUS_FINISHED.toString())
+                    .queryParam("last", cxProperties.getIncrementalNumScans().toString())
+                    .build());
 
             ResponseEntity<String> response = restTemplate.exchange(uriComponents.toUri(), HttpMethod.GET, requestEntity, String.class);
 
@@ -304,7 +311,8 @@ public JSONObject getScanData(String scanId) {
                     //example: "finishedOn": "2018-06-18T01:09:12.707", Grab only first 19 digits due to inconsistency of checkmarx results
                     LocalDateTime d;
                     try {
-                        String finishedOn = dateAndTime.getString("finishedOn");
+                        String finishedOn =
+                                cxProperties.getConsiderScanningStatus() ? dateAndTime.getString("startedOn") : dateAndTime.getString("finishedOn");
                         finishedOn = finishedOn.substring(0, 19);
                         log.debug("finishedOn: {}", finishedOn);
                         d = LocalDateTime.parse(finishedOn, formatter);