Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/main/java/com/checkmarx/ast/results/result/Data.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ public class Data {
List<Node> nodes;
List<PackageData> packageData;
ScaPackageData scaPackageData;
// Secret Detection specific fields
String ruleName;
String ruleDescription;
String remediation;

public Data(@JsonProperty("queryId") String queryId,
@JsonProperty("queryName") String queryName,
Expand All @@ -47,7 +51,10 @@ public Data(@JsonProperty("queryId") String queryId,
@JsonProperty("line") int line,
@JsonProperty("nodes") List<Node> nodes,
@JsonProperty("packageData") List<PackageData> packageData,
@JsonProperty("scaPackageData") ScaPackageData scaPackageData) {
@JsonProperty("scaPackageData") ScaPackageData scaPackageData,
@JsonProperty("ruleName") String ruleName,
@JsonProperty("ruleDescription") String ruleDescription,
@JsonProperty("remediation") String remediation) {
this.queryId = queryId;
this.queryName = queryName;
this.group = group;
Expand All @@ -64,5 +71,8 @@ public Data(@JsonProperty("queryId") String queryId,
this.nodes = nodes;
this.packageData = packageData;
this.scaPackageData = scaPackageData;
this.ruleName = ruleName;
this.ruleDescription = ruleDescription;
this.remediation = remediation;
}
}
13 changes: 12 additions & 1 deletion src/main/java/com/checkmarx/ast/results/result/Result.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.checkmarx.ast.results.result;

import com.checkmarx.ast.wrapper.CxConstants;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down Expand Up @@ -53,7 +54,7 @@ public Result(@JsonProperty("type") String type,
@JsonProperty("comments") Comments comments,
@JsonProperty("vulnerabilityDetails") VulnerabilityDetails vulnerabilityDetails,
@JsonProperty("scaType") String scaType) {
this.type = type;
this.type = normalizeType(type);
this.scaType=scaType;
this.label = label;
this.id = id;
Expand All @@ -74,4 +75,14 @@ public Result(@JsonProperty("type") String type,
this.comments = comments;
this.vulnerabilityDetails = vulnerabilityDetails;
}

/**
* Normalizes special-case types coming from JSON into internal constants.
*/
private static String normalizeType(String rawType) {
if ("sscs-secret-detection".equals(rawType)) {
return CxConstants.SECRET_DETECTION;
}
return rawType; // leave other engine types unchanged
}
}
1 change: 1 addition & 0 deletions src/main/java/com/checkmarx/ast/wrapper/CxConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public final class CxConstants {
public static final String AGENT = "--agent";
public static final String SAST = "sast";
public static final String DEBUG = "--debug";
public static final String SECRET_DETECTION = "scs";
static final String CLIENT_ID = "--client-id";
static final String CLIENT_SECRET = "--client-secret";
static final String API_KEY = "--apikey";
Expand Down