parser-json-sarif: introduce readToolInfo() helper

... in order to make `readScanProps()` easier to extend.
No change in behavior intended with this commit.

Author: kdudka

src/lib/parser-json-sarif.cc

@@ -26,6 +26,7 @@
 
 struct SarifTreeDecoder::Private {
     void updateCweMap(const pt::ptree *driverNode);
+    void readToolInfo(TScanProps *pScanProps, const pt::ptree *toolNode);
 
     std::string                 singleChecker = "UNKNOWN_SARIF_WARNING";
     const RE                    reCwe = RE("^CWE-([0-9]+)$");
@@ -80,35 +81,15 @@ void SarifTreeDecoder::Private::updateCweMap(const pt::ptree *driverNode)
     }
 }
 
-void SarifTreeDecoder::readScanProps(
-        TScanProps                 *pDst,
-        const pt::ptree            *root)
+void SarifTreeDecoder::Private::readToolInfo(
+        TScanProps                 *pScanProps,
+        const pt::ptree            *toolNode)
 {
-    // read external properties if available
-    const pt::ptree *iep;
-    if (findChildOf(&iep, *root, "inlineExternalProperties")
-            && (1U == iep->size()))
-    {
-        const pt::ptree *props;
-        if (findChildOf(&props, iep->begin()->second, "externalizedProperties"))
-            for (const pt::ptree::value_type &item : *props)
-                (*pDst)[item.first] = item.second.data();
-    }
-
-    // check that we have exactly one run
-    const pt::ptree *runs;
-    if (!findChildOf(&runs, *root, "runs") || (1U != runs->size()))
-        return;
-
-    // check which tool was used for the run
-    const pt::ptree *toolNode;
-    if (!findChildOf(&toolNode, runs->begin()->second, "tool"))
-        return;
     const pt::ptree *driverNode;
     if (!findChildOf(&driverNode, *toolNode, "driver"))
         return;
 
-    d->updateCweMap(driverNode);
+    this->updateCweMap(driverNode);
 
     const auto name = valueOf<std::string>(*driverNode, "name");
     auto version = valueOf<std::string>(*driverNode, "version");
@@ -117,36 +98,66 @@ void SarifTreeDecoder::readScanProps(
 
     if (name == "SnykCode") {
         // Snyk Code detected!
-        d->singleChecker = "SNYK_CODE_WARNING";
+        this->singleChecker = "SNYK_CODE_WARNING";
 
         if (!version.empty())
             // record tool version of Snyk Code
-            (*pDst)["analyzer-version-snyk-code"] = std::move(version);
+            (*pScanProps)["analyzer-version-snyk-code"] = std::move(version);
     }
     else if (name == "gitleaks") {
         // gitleaks
-        d->singleChecker = "GITLEAKS_WARNING";
+        this->singleChecker = "GITLEAKS_WARNING";
 
         if (!version.empty())
-            (*pDst)["analyzer-version-gitleaks"] = std::move(version);
+            (*pScanProps)["analyzer-version-gitleaks"] = std::move(version);
     }
     else if (name == "Semgrep OSS") {
         // semgrep
-        d->singleChecker = "SEMGREP_WARNING";
+        this->singleChecker = "SEMGREP_WARNING";
 
         if (!version.empty())
-            (*pDst)["analyzer-version-semgrep"] = std::move(version);
+            (*pScanProps)["analyzer-version-semgrep"] = std::move(version);
     }
     else if (boost::starts_with(name, "GNU C")) {
         // GCC
-        d->singleChecker = "COMPILER_WARNING";
+        this->singleChecker = "COMPILER_WARNING";
 
         boost::smatch sm;
-        if (boost::regex_match(version, sm, d->reVersion))
-            (*pDst)["analyzer-version-gcc"] = sm[/* version */ 1];
+        if (boost::regex_match(version, sm, this->reVersion))
+            (*pScanProps)["analyzer-version-gcc"] = sm[/* version */ 1];
     }
 }
 
+void SarifTreeDecoder::readScanProps(
+        TScanProps                 *pDst,
+        const pt::ptree            *root)
+{
+    // read external properties if available
+    const pt::ptree *iep;
+    if (findChildOf(&iep, *root, "inlineExternalProperties")
+            && (1U == iep->size()))
+    {
+        const pt::ptree *props;
+        if (findChildOf(&props, iep->begin()->second, "externalizedProperties"))
+            for (const pt::ptree::value_type &item : *props)
+                (*pDst)[item.first] = item.second.data();
+    }
+
+    // check that we have exactly one run
+    const pt::ptree *runs;
+    if (!findChildOf(&runs, *root, "runs")
+            || /* TODO: warn bout unsupported format */ (1U != runs->size()))
+        return;
+
+    // jump to the only run
+    const pt::ptree &run0 = runs->begin()->second;
+
+    // check which tool was used for the run
+    const pt::ptree *toolNode;
+    if (findChildOf(&toolNode, run0, "tool"))
+        d->readToolInfo(pDst, toolNode);
+}
+
 void SarifTreeDecoder::readRoot(const pt::ptree *runs)
 {
     if (1U != runs->size())