[pysrc2cpg] Handle Import Resolution when Root is File (joernio#3795)

This fixes a bug where `root` is always assumed to be a directory in `ImportResolverPass`.
Privado-Inc · Nov 6, 2023 · 17a3c7a · 17a3c7a
1 parent 824716d
commit 17a3c7a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/joern-cli/frontends/pysrc2cpg/src/main/scala/io/joern/pysrc2cpg/ImportResolverPass.scala b/joern-cli/frontends/pysrc2cpg/src/main/scala/io/joern/pysrc2cpg/ImportResolverPass.scala
@@ -12,7 +12,9 @@ import java.util.regex.{Matcher, Pattern}
 
 class ImportResolverPass(cpg: Cpg) extends XImportResolverPass(cpg) {
 
-  private lazy val root = cpg.metaData.root.headOption.getOrElse("").stripSuffix(JFile.separator)
+  private lazy val root = BFile(cpg.metaData.root.headOption.getOrElse("").stripSuffix(JFile.separator)) match
+    case f if f.isDirectory => f.pathAsString
+    case f                  => f.parent.pathAsString
 
   override protected def optionalResolveImport(
     fileName: String,