Set MetaData root (#178)

ShiftLeftSecurity · Jun 27, 2022 · 956d140 · 956d140
1 parent f37ad8b
commit 956d140
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
-val cpgVersion   = "1.3.545"
-val joernVersion = "1.1.895"
+val cpgVersion   = "1.3.549"
+val joernVersion = "1.1.911"
 
 val gitCommitString = SettingKey[String]("gitSha")
 

diff --git a/src/main/scala/io/shiftleft/js2cpg/core/Js2Cpg.scala b/src/main/scala/io/shiftleft/js2cpg/core/Js2Cpg.scala
@@ -201,7 +201,7 @@ class Js2Cpg {
       .createAndApply()
     new CallLinkerPass(cpg).createAndApply()
 
-    new JsMetaDataPass(cpg, metaDataKeyPool, hash).createAndApply()
+    new JsMetaDataPass(cpg, metaDataKeyPool, hash, config.srcDir).createAndApply()
     new BuiltinTypesPass(cpg, builtinTypesKeyPool).createAndApply()
     new DependenciesPass(cpg, config, dependenciesKeyPool)
       .createAndApply()

diff --git a/src/main/scala/io/shiftleft/js2cpg/cpg/passes/JsMetaDataPass.scala b/src/main/scala/io/shiftleft/js2cpg/cpg/passes/JsMetaDataPass.scala
@@ -1,18 +1,21 @@
 package io.shiftleft.js2cpg.cpg.passes
 
+import better.files.File
 import io.shiftleft.codepropertygraph.Cpg
 import io.shiftleft.codepropertygraph.generated.Languages
 import io.shiftleft.codepropertygraph.generated.nodes.NewMetaData
 import io.shiftleft.passes.{KeyPool, SimpleCpgPass}
 import org.slf4j.LoggerFactory
 
-class JsMetaDataPass(cpg: Cpg, keyPool: KeyPool, hash: String) extends SimpleCpgPass(cpg, keyPool = Some(keyPool)) {
+class JsMetaDataPass(cpg: Cpg, keyPool: KeyPool, hash: String, root: String)
+    extends SimpleCpgPass(cpg, keyPool = Some(keyPool)) {
 
   private val logger = LoggerFactory.getLogger(getClass)
 
   override def run(diffGraph: DiffGraphBuilder): Unit = {
     logger.debug("Generating meta-data.")
-    val metaNode = NewMetaData().language(Languages.JAVASCRIPT).hash(hash)
+    val absolutePathToRoot = File(root).path.toAbsolutePath.toString
+    val metaNode           = NewMetaData().language(Languages.JAVASCRIPT).hash(hash).root(absolutePathToRoot)
     diffGraph.addNode(metaNode)
   }
 

diff --git a/src/test/scala/io/shiftleft/js2cpg/cpg/passes/JsMetaDataPassTest.scala b/src/test/scala/io/shiftleft/js2cpg/cpg/passes/JsMetaDataPassTest.scala
@@ -13,7 +13,7 @@ class JsMetaDataPassTest extends AbstractPassTest {
     val cpg               = Cpg.emptyCpg
     val jsMetaDataKeyPool = new IntervalKeyPool(1, 100)
 
-    new JsMetaDataPass(cpg, jsMetaDataKeyPool, "somehash").createAndApply()
+    new JsMetaDataPass(cpg, jsMetaDataKeyPool, "somehash", ".").createAndApply()
 
     "create exactly 1 node" in {
       cpg.graph.V.asScala.size shouldBe 1