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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
CX_BASE_URI: ${{ secrets.CX_BASE_URI }}
CX_TENANT: ${{ secrets.CX_TENANT }}
CX_SCAN_ID: ${{ secrets.CX_SCAN_ID }}
CX_APIKEY: ${{ secrets.CX_APIKEY }}
run: mvn -B test --file pom.xml
cx-scan:
runs-on: ubuntu-latest
Expand Down
74 changes: 74 additions & 0 deletions src/main/java/com/checkmarx/ast/codebashing/CodeBashing.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package com.checkmarx.ast.codebashing;

import com.checkmarx.ast.predicate.Predicate;
import com.checkmarx.ast.wrapper.CxBaseObject;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.type.TypeFactory;
import lombok.EqualsAndHashCode;
import lombok.Value;
import org.apache.commons.lang3.StringUtils;

import java.io.IOException;
import java.util.List;
import java.util.Map;

@Value
@JsonDeserialize()
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class CodeBashing {
String path;
String cweId;
String language;
String queryName;

@JsonCreator
public CodeBashing(@JsonProperty("path") String path,
@JsonProperty("cwe_id") String cweId,
@JsonProperty("lang") String language,
@JsonProperty("cxQueryName") String queryName) {
this.path=path;
this.cweId=cweId;
this.language=language;
this.queryName=queryName;
}

public static <T> T fromLine(String line) {
return parse(line, TypeFactory.defaultInstance().constructType(Predicate.class));
}

public static <T> List<T> listFromLine(String line) {
return parse(line, TypeFactory.defaultInstance().constructCollectionType(List.class, CodeBashing.class));
}

protected static <T> T parse(String line, JavaType type) {
T result = null;
try {
if (!StringUtils.isBlank(line) && isValidJSON(line)) {
result = new ObjectMapper().readValue(line, type);

}
} catch (IOException e) {
e.printStackTrace();
}
return result;
}

private static boolean isValidJSON(final String json) {
try {
final ObjectMapper mapper = new ObjectMapper();
mapper.readTree(json);
return true;
} catch (IOException e) {
return false;
}
}

}

8 changes: 4 additions & 4 deletions src/main/java/com/checkmarx/ast/wrapper/CxConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ void validate() throws InvalidCLIConfigException {
List<String> toArguments() {
List<String> commands = new ArrayList<>();

if (StringUtils.isNotBlank(getClientId()) && StringUtils.isNotBlank(getClientSecret())) {
if (StringUtils.isNotBlank(getApiKey())) {
commands.add(CxConstants.API_KEY);
commands.add(getApiKey());
} else if (StringUtils.isNotBlank(getClientId()) && StringUtils.isNotBlank(getClientSecret())) {
commands.add(CxConstants.CLIENT_ID);
commands.add(getClientId());
commands.add(CxConstants.CLIENT_SECRET);
commands.add(getClientSecret());
} else if (StringUtils.isNotBlank(getApiKey())) {
commands.add(CxConstants.API_KEY);
commands.add(getApiKey());
}

if (StringUtils.isNotBlank(getTenant())) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/checkmarx/ast/wrapper/CxConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,8 @@ public final class CxConstants {
static final String REPORT_FORMAT = "--report-format";
static final String OUTPUT_NAME = "--output-name";
static final String OUTPUT_PATH = "--output-path";
static final String SUB_CMD_CODE_BASHING = "codebashing";
static final String CWE_ID = "--cwe-id";
static final String LANGUAGE = "--language";
static final String VULNERABILITY_TYPE = "--vulnerabity-type";
}
18 changes: 18 additions & 0 deletions src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.checkmarx.ast.wrapper;

import com.checkmarx.ast.codebashing.CodeBashing;
import com.checkmarx.ast.predicate.Predicate;
import com.checkmarx.ast.project.Project;
import com.checkmarx.ast.results.ReportFormat;
Expand Down Expand Up @@ -201,6 +202,23 @@ public List<String> projectBranches(@NonNull UUID projectId, String filter)
line -> CxBaseObject.parse(line, BRANCHES_TYPE));
}

public List<CodeBashing> codeBashingList(@NonNull String cweId,@NonNull String language,@NonNull String queryName) throws IOException, InterruptedException, CxException {
this.logger.info("Fetching the codebashing link");

List<String> arguments = new ArrayList<>();
arguments.add(CxConstants.CMD_RESULT);
arguments.add(CxConstants.SUB_CMD_CODE_BASHING);
arguments.add(CxConstants.LANGUAGE);
arguments.add(language);
arguments.add(CxConstants.VULNERABILITY_TYPE);
arguments.add(queryName);
arguments.add(CxConstants.CWE_ID);
arguments.add(cweId);
arguments.addAll(jsonArguments());

return Execution.executeCommand(withConfigArguments(arguments), logger, CodeBashing::listFromLine);
}

public ResultsSummary resultsSummary(@NonNull UUID scanId) throws IOException, InterruptedException, CxException {
return new ObjectMapper()
.readerFor(ResultsSummary.class)
Expand Down
13 changes: 12 additions & 1 deletion src/test/java/com/checkmarx/ast/ResultTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.checkmarx.ast;

import com.checkmarx.ast.codebashing.CodeBashing;
import com.checkmarx.ast.results.ReportFormat;
import com.checkmarx.ast.results.Results;
import com.checkmarx.ast.results.ResultsSummary;
Expand All @@ -11,7 +12,9 @@
import java.util.UUID;

class ResultTest extends BaseTest {

private static String CWE_ID = "79";
private static String LANGUAGE = "PHP";
private static String QUERY_NAME = "Reflected XSS All Clients";
@Test
void testResultsHTML() throws Exception {
List<Scan> scanList = wrapper.scanList();
Expand Down Expand Up @@ -48,4 +51,12 @@ void testResultsStructure() throws Exception {
results.getResults().stream().filter(result -> "sast".equalsIgnoreCase(result.getType())).findFirst();
Assertions.assertEquals(results.getTotalCount(), results.getResults().size());
}

@Test()
void testResultsCodeBashing() throws Exception {
List<CodeBashing> codeBashingList = wrapper.codeBashingList(CWE_ID,LANGUAGE,QUERY_NAME);
Assertions.assertTrue(codeBashingList.size() > 0);
String path = codeBashingList.get(0).getPath();
Assertions.assertTrue(path.length() > 0);
}
}