check For Threshold Error (#264)

checkmarx-ltd · Jul 23, 2024 · 086842f · 086842f
1 parent d52ba76
commit 086842f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/com/cx/restclient/configuration/CxScanConfig.java b/src/main/java/com/cx/restclient/configuration/CxScanConfig.java
@@ -103,7 +103,8 @@ public void setprojectCustomFields(String projectCustomFields) {
     private Boolean osaRunInstall = false;
     private Boolean osaThresholdsEnabled = false;
     private Boolean osaFailOnError = false;
-    private Integer osaHighThreshold;
+    private Integer osaCriticalThreshold;
+	private Integer osaHighThreshold;
     private Integer osaMediumThreshold;
     private Integer osaLowThreshold;
     private Properties osaFsaConfig; //for MAVEN
@@ -638,6 +639,14 @@ public Boolean isOsaFailOnError() {
     public void setOsaFailOnError(Boolean osaFailOnError) {
         this.osaFailOnError = osaFailOnError;
     }
+
+    public Integer getOsaCriticalThreshold() {
+		return osaCriticalThreshold;
+	}
+
+	public void setOsaCriticalThreshold(Integer osaCriticalThreshold) {
+		this.osaCriticalThreshold = osaCriticalThreshold;
+	}
 
     public Integer getOsaHighThreshold() {
         return osaHighThreshold;
@@ -684,7 +693,7 @@ public boolean isSASTThresholdEffectivelyEnabled() {
     public boolean isOSAThresholdEffectivelyEnabled() {
         return (isOsaEnabled() || isAstScaEnabled()) &&
                 getOsaThresholdsEnabled() &&
-                (getOsaHighThreshold() != null || getOsaMediumThreshold() != null || getOsaLowThreshold() != null);
+                (getOsaCriticalThreshold() != null || getOsaHighThreshold() != null || getOsaMediumThreshold() != null || getOsaLowThreshold() != null);
     }
 
     public void setOsaDependenciesJson(String osaDependenciesJson) {

diff --git a/src/main/java/com/cx/restclient/dto/scansummary/ScanSummary.java b/src/main/java/com/cx/restclient/dto/scansummary/ScanSummary.java
@@ -127,6 +127,9 @@ private void addDependencyScanThresholdErrors(CxScanConfig config, OSAResults os
             }
 
             if (hasSummary) {
+            	if (scaResults != null) {
+            	checkForThresholdError(totalCritical, config.getOsaCriticalThreshold(), errorSource, Severity.CRITICAL);
+            	}
                 checkForThresholdError(totalHigh, config.getOsaHighThreshold(), errorSource, Severity.HIGH);
                 checkForThresholdError(totalMedium, config.getOsaMediumThreshold(), errorSource, Severity.MEDIUM);
                 checkForThresholdError(totalLow, config.getOsaLowThreshold(), errorSource, Severity.LOW);