Skip to content

updated and fixed kiuwan reader #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davewichers merged 2 commits into from
Nov 18, 2019
Merged

updated and fixed kiuwan reader #85

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f9ffeb
fix kiuwan reader
mcprol Nov 10, 2019
f4c7303
read analysis metadata from threadfix report
mcprol Nov 18, 2019
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
19 changes: 15 additions & 4 deletions src/main/java/org/owasp/benchmark/score/parsers/KiuwanReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,24 @@ public TestResults parse( File f ) throws Exception {
// String resultsFormatVersion = obj.getString( "version" ); // Note: no threadfix version info included in format.

JSONArray findings = obj.getJSONArray("findings");

String source = obj.getString("source");

TestResults tr = new TestResults( "Kiuwan", true, TestResults.ToolType.SAST);
TestResults tr = new TestResults(source, true, TestResults.ToolType.SAST);
// Scan time is not included in the threadfix schema. But scan time is provided on their web site next to results
tr.setTime(f); // This grabs the scan time out of the filename, if provided
// e.g., Benchmark_1.2_Kiuwan-660.threadfix, means the scan took 660 seconds.

// Set the version of Kiuwan used to do the scan (Can't because that info isn't provided)
// It is provided on their web site. Looks like: Engine version master.p561.q11382.a1870.i501
// tr.setToolVersion(driver.getString("version"));
// We will use the created date. format: "created":"2019-11-05T21:24:49Z"
String created = obj.getString("created");
if (null != created) {
created = created.replace("-", "");
created = created.replace(":", "");
created = created.trim();
tr.setToolVersion(created);
}

//System.out.println("Found: " + findings.length() + " findings.");
for (int i = 0; i < findings.length(); i++)
Expand All @@ -68,8 +77,10 @@ public TestResults parse( File f ) throws Exception {
private TestCaseResult parseKiuwanFinding(JSONObject finding) {
try {
TestCaseResult tcr = new TestCaseResult();
JSONObject staticDetails = finding.getJSONObject("staticDetails");
String filename = staticDetails.getJSONArray("dataFlow").getJSONObject(0).getString("file");
JSONObject staticDetails = finding.getJSONObject("staticDetails");
JSONArray dataFlow = staticDetails.getJSONArray("dataFlow");
int propagationPathLength = dataFlow.length()-1;
String filename = dataFlow.getJSONObject(propagationPathLength).getString("file");
filename = filename.substring( filename.lastIndexOf( '/' ) );
if ( filename.contains( BenchmarkScore.BENCHMARKTESTNAME ) ) {
String testNumber = filename.substring( BenchmarkScore.BENCHMARKTESTNAME.length() + 1, filename.length() - 5 );
Expand Down