Merge pull request OWASP-Benchmark#154 from darkspirit510/shiftleft-jsonl

davewichers · web-flow · commit 90e70ffc20bf · 2021-07-05T11:13:04.000-04:00
Fix ShiftLeftScan reader to parse JSONL format and add version
diff --git a/src/main/java/org/owasp/benchmark/score/parsers/ShiftLeftScanReader.java b/src/main/java/org/owasp/benchmark/score/parsers/ShiftLeftScanReader.java
@@ -35,10 +35,10 @@ public static boolean isShiftLeftScanReport(final String content) {
     }
 
     public TestSuiteResults parse(final String content) throws Exception {
-        int startOfSecondJson = content.indexOf("\n{\n");
+        String[] lines = content.split("\n");
 
-        JSONObject javaSourceAnalyzer = new JSONObject(content.substring(0, startOfSecondJson));
-        JSONObject classFileAnalyzer = new JSONObject(content.substring(startOfSecondJson));
+        JSONObject javaSourceAnalyzer = new JSONObject(lines[0]);
+        JSONObject classFileAnalyzer = new JSONObject(lines[1]);
 
         // false indicates this is an open source/free tool.
         TestSuiteResults tr =
@@ -47,9 +47,19 @@ public TestSuiteResults parse(final String content) throws Exception {
         parseAndAddResults(tr, javaSourceAnalyzer);
         parseAndAddResults(tr, classFileAnalyzer);
 
+        tr.setToolVersion(readVersion(javaSourceAnalyzer));
+
         return tr;
     }
 
+    private String readVersion(JSONObject javaSourceAnalyzer) {
+        return javaSourceAnalyzer
+                .getJSONObject("tool")
+                .getJSONObject("driver")
+                .getString("version")
+                .replace("-scan", "");
+    }
+
     private void parseAndAddResults(TestSuiteResults tr, JSONObject analyzerResults) {
         JSONArray arr = analyzerResults.getJSONArray("results");
 
