fix path issues

Author: Johannes Coetzee

joern-cli/frontends/php2cpg/src/main/scala/io/joern/php2cpg/utils/PathFilter.scala

@@ -1,6 +1,6 @@
 package io.joern.php2cpg.utils
 
-import io.joern.php2cpg.utils.PathFilter.correctPath
+import io.joern.php2cpg.utils.PathFilter.standardisePath
 import org.slf4j.LoggerFactory
 
 import java.io.File
@@ -15,7 +15,15 @@ class PathFilter(excludeOverrides: Option[List[String]]) {
   private val anyDirSuffix = s"$sep.*"
 
   def dirExclude(dirName: String): Regex = {
-    s"${startOrSep}${correctPath(dirName)}${anyDirSuffix}".r
+    val path = escapeSeparators(standardisePath(dirName))
+    s"${startOrSep}$path${anyDirSuffix}".r
+  }
+
+  private def escapeSeparators(filename: String): String = {
+    if (File.separator == "/")
+      filename
+    else
+      filename.replaceAll(raw"\\", raw"\\\\")
   }
 
   private val excludeRegexes = {
@@ -35,12 +43,15 @@ object PathFilter {
     ".git"
   )
 
-  def correctPath(filename: String): String = {
-    val nameParts = filename.split("/")
-    Paths.get(nameParts.head, nameParts.tail: _*).toString
+  def standardisePath(filename: String): String = {
+    // Synthetic filename, so don't correct
+    if (filename.contains("<"))
+      filename
+    else
+      Paths.get(filename).toString
   }
 
-  def apply(excludes: Option[List[String]]) = {
+  def apply(excludes: Option[List[String]]): PathFilter = {
     new PathFilter(excludes)
   }
 }

joern-cli/frontends/php2cpg/src/test/scala/io/joern/php2cpg/querying/FileTests.scala

@@ -23,15 +23,15 @@ class FileTests extends PhpCode2CpgFixture {
 
   private def getCpg(): TestCpg = {
     val cpg = code("", fileName = testFiles.head)
-    testFiles.tail.foreach(path => cpg.moreCode("", fileName = PathFilter.correctPath(path)))
+    testFiles.tail.foreach(path => cpg.moreCode("", fileName = PathFilter.standardisePath(path)))
     cpg
   }
 
   "test, vendor, and .git directories should be filtered out by default" in {
     val cpg = getCpg()
 
     cpg.file.name.toSet shouldBe Set("a.php", "src/b.php", "src/sub/c.php", "misc/g.php", "nottests/j.php", "<unknown>")
-      .map(PathFilter.correctPath)
+      .map(PathFilter.standardisePath)
   }
 
   "custom excludes should exclude the correct directories" in {
@@ -49,6 +49,6 @@ class FileTests extends PhpCode2CpgFixture {
       "sub/tests/i.php",
       "nottests/j.php",
       "<unknown>"
-    )
+    ).map(PathFilter.standardisePath)
   }
 }