Move QueryDatabase handling into codepropertygraph (#17)

* Move `Query` to `QueryDatabase`

* Use `QueryDatabase` from `codepropertygraph`

* Set correct `codepropertygraph` version

* Update joern version

build.sbt

@@ -11,6 +11,7 @@ libraryDependencies ++= Seq(
   "com.github.scopt" %% "scopt" % "3.7.1",
   "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.13.3" % Runtime,
   "io.shiftleft" %% "semanticcpg" % Versions.cpg,
+  "io.shiftleft" %% "console" % Versions.cpg,
   "io.shiftleft" %% "dataflowengineoss" % Versions.cpg,
   "io.shiftleft" %% "fuzzyc2cpg-tests" % Versions.cpg % Test classifier "tests",
   "io.shiftleft" %% "semanticcpg-tests" % Versions.cpg % Test classifier "tests",

install.sh

@@ -4,7 +4,7 @@ set -o pipefail
 set -o nounset
 set -eu
 
-readonly JOERN_VERSION="v1.1.64"
+readonly JOERN_VERSION="v1.1.66"
 
 if [ "$(uname)" = 'Darwin' ]; then
   # get script location

project/Versions.scala

@@ -1,5 +1,5 @@
 /* Declare dependency versions in one place */
 object Versions {
-  val cpg = "1.3.25"
+  val cpg = "1.3.26"
   val overflowdb = "1.24"
 }

src/main/scala/io/joern/scanners/QueriesToJson.scala

@@ -4,6 +4,7 @@ import io.shiftleft.dataflowengineoss.queryengine.EngineContext
 import org.json4s._
 import org.json4s.native.Serialization
 import better.files.File
+import io.shiftleft.console.QueryDatabase
 
 object QueriesToJson extends App {
   implicit val engineContext: EngineContext = null

src/main/scala/io/joern/scanners/Scan.scala

@@ -1,6 +1,7 @@
 package io.joern.scanners
 
 import io.shiftleft.codepropertygraph.Cpg
+import io.shiftleft.console.{DefaultArgumentProvider, QueryDatabase}
 import io.shiftleft.dataflowengineoss.queryengine.EngineContext
 import io.shiftleft.passes.{CpgPass, DiffGraph}
 import io.shiftleft.semanticcpg.layers.{

src/main/scala/io/joern/scanners/c/CopyLoops.scala

@@ -1,6 +1,7 @@
 package io.joern.scanners.c
 
 import io.joern.scanners._
+import io.shiftleft.console._
 import io.shiftleft.semanticcpg.language._
 
 object CopyLoops extends QueryBundle {

src/main/scala/io/joern/scanners/c/HeapBasedOverflow.scala

@@ -4,6 +4,7 @@ import io.joern.scanners._
 import io.shiftleft.dataflowengineoss.queryengine.EngineContext
 import io.shiftleft.semanticcpg.language._
 import io.shiftleft.dataflowengineoss.language._
+import io.shiftleft.console._
 
 object HeapBasedOverflow extends QueryBundle {
 

src/main/scala/io/joern/scanners/c/InsecureFunctions.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.joern.scanners._
 import io.shiftleft.semanticcpg.language._
+import io.shiftleft.console._
 
 object InsecureFunctions extends QueryBundle {
 

src/main/scala/io/joern/scanners/c/IntegerTruncations.scala

@@ -1,8 +1,8 @@
 package io.joern.scanners.c
 
 import io.joern.scanners._
-import io.joern.scanners.{QueryBundle, q}
 import io.shiftleft.semanticcpg.language._
+import io.shiftleft.console._
 
 object IntegerTruncations extends QueryBundle {
 

src/main/scala/io/joern/scanners/c/Metrics.scala

@@ -1,6 +1,7 @@
 package io.joern.scanners.c
 
 import io.joern.scanners._
+import io.shiftleft.console._
 import io.shiftleft.semanticcpg.language._
 
 object Metrics extends QueryBundle {

src/main/scala/io/joern/scanners/package.scala

@@ -2,9 +2,9 @@ package io.joern
 
 import io.shiftleft.codepropertygraph.Cpg
 import io.shiftleft.codepropertygraph.generated.{NodeTypes, nodes}
+import io.shiftleft.console.Query
 import overflowdb.traversal.Traversal
 import io.shiftleft.semanticcpg.language._
-
 import overflowdb.traversal._
 
 package object scanners {
@@ -16,17 +16,14 @@ package object scanners {
 
   }
 
-  case class Query(name: String,
-                   author: String,
-                   title: String,
-                   description: String,
-                   score: Double,
-                   f: Cpg => Traversal[nodes.StoredNode]) {
-
+  implicit class QueryWrapper(q: Query) {
     def apply(cpg: Cpg): List[nodes.NewFinding] = {
-      f(cpg)
+      q.f(cpg)
         .map(
-          finding(_, title = title, description = description, score = score)
+          finding(_,
+                  title = q.title,
+                  description = q.description,
+                  score = q.score)
         )
         .l
     }

src/test/scala/io/joern/scanners/c/CopyLoopTests.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.shiftleft.codepropertygraph.generated.nodes
 import io.shiftleft.semanticcpg.language._
+import io.joern.scanners._
 
 class CopyLoopTests extends Suite {
 

src/test/scala/io/joern/scanners/c/HeapBasedOverflowTests.scala

@@ -1,6 +1,7 @@
 package io.joern.scanners.c
 
 import io.shiftleft.codepropertygraph.generated.nodes
+import io.joern.scanners._
 
 class HeapBasedOverflowTests extends Suite {
 

src/test/scala/io/joern/scanners/c/InsecureFunctionsTests.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.shiftleft.codepropertygraph.generated.nodes
 import io.shiftleft.semanticcpg.language._
+import io.joern.scanners._
 
 class InsecureFunctionsTests extends Suite {
 

src/test/scala/io/joern/scanners/c/IntegerTruncationsTests.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.shiftleft.codepropertygraph.generated.nodes
 import io.shiftleft.semanticcpg.language._
+import io.joern.scanners._
 
 class IntegerTruncationsTests extends Suite {
 

src/test/scala/io/joern/scanners/c/MetricsTests.scala

@@ -1,6 +1,7 @@
 package io.joern.scanners.c
 
 import io.shiftleft.codepropertygraph.generated.nodes
+import io.joern.scanners._
 
 class MetricsTests extends Suite {
 

src/test/scala/io/joern/scanners/c/ScanTests.scala

@@ -1,6 +1,7 @@
 package io.joern.scanners.c
 
-import io.joern.scanners.{JoernDefaultArgumentProvider, QueryDatabase}
+import io.joern.scanners.JoernDefaultArgumentProvider
+import io.shiftleft.console.QueryDatabase
 
 class ScanTests extends Suite {