Merge remote-tracking branch 'origin/master' into andrei/ruby-erb-support

Author: Tebogo Selahle

build.sbt

@@ -2,7 +2,7 @@ name                     := "joern"
 ThisBuild / organization := "io.joern"
 ThisBuild / scalaVersion := "3.6.4"
 
-val cpgVersion = "1.7.43"
+val cpgVersion = "1.7.46"
 
 lazy val joerncli          = Projects.joerncli
 lazy val querydb           = Projects.querydb

console/src/main/scala/io/joern/console/cpgcreation/CpgGenerator.scala

@@ -43,8 +43,7 @@ abstract class CpgGenerator() {
            |""".stripMargin
       )
 
-      val exitValue = ExternalCommand.run(cmd).exitCode
-      assert(exitValue == 0, s"Error running shell command: exitValue=$exitValue; $cmd")
+      ExternalCommand.run(cmd, additionalContext = cmd.toString).logIfFailed().verifySuccess()
     }
 
   protected lazy val maxMemoryParameter = {

joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/C2Cpg.scala

@@ -19,7 +19,9 @@ import scala.util.control.NonFatal
 import scala.util.Try
 import scala.util.matching.Regex
 
-class C2Cpg extends X2CpgFrontend[Config] {
+class C2Cpg extends X2CpgFrontend {
+  final override type ConfigType = Config
+  override val defaultConfig = Config()
 
   private val logger = LoggerFactory.getLogger(classOf[C2Cpg])
 

joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/Main.scala

@@ -17,46 +17,50 @@ final case class Config(
   includePathsAutoDiscovery: Boolean = false,
   skipFunctionBodies: Boolean = false,
   withPreprocessedFiles: Boolean = false,
-  compilationDatabaseFilename: Option[String] = None
+  compilationDatabaseFilename: Option[String] = None,
+  override val genericConfig: X2CpgConfig.GenericConfig = X2CpgConfig.GenericConfig()
 ) extends X2CpgConfig[Config] {
+
+  override def withGenericConfig(value: X2CpgConfig.GenericConfig): Config = copy(genericConfig = value)
+
   def withIncludePaths(includePaths: Set[String]): Config = {
-    this.copy(includePaths = includePaths).withInheritedFields(this)
+    this.copy(includePaths = includePaths)
   }
 
   def withDefines(defines: Set[String]): Config = {
-    this.copy(defines = defines).withInheritedFields(this)
+    this.copy(defines = defines)
   }
 
   def withIncludeComments(value: Boolean): Config = {
-    this.copy(includeComments = value).withInheritedFields(this)
+    this.copy(includeComments = value)
   }
 
   def withLogProblems(value: Boolean): Config = {
-    this.copy(logProblems = value).withInheritedFields(this)
+    this.copy(logProblems = value)
   }
 
   def withLogPreprocessor(value: Boolean): Config = {
-    this.copy(logPreprocessor = value).withInheritedFields(this)
+    this.copy(logPreprocessor = value)
   }
 
   def withPrintIfDefsOnly(value: Boolean): Config = {
-    this.copy(printIfDefsOnly = value).withInheritedFields(this)
+    this.copy(printIfDefsOnly = value)
   }
 
   def withIncludePathsAutoDiscovery(value: Boolean): Config = {
-    this.copy(includePathsAutoDiscovery = value).withInheritedFields(this)
+    this.copy(includePathsAutoDiscovery = value)
   }
 
   def withSkipFunctionBodies(value: Boolean): Config = {
-    this.copy(skipFunctionBodies = value).withInheritedFields(this)
+    this.copy(skipFunctionBodies = value)
   }
 
   def withPreprocessedFiles(value: Boolean): Config = {
-    this.copy(withPreprocessedFiles = value).withInheritedFields(this)
+    this.copy(withPreprocessedFiles = value)
   }
 
   def withCompilationDatabase(value: String): Config = {
-    this.copy(compilationDatabaseFilename = Option(value)).withInheritedFields(this)
+    this.copy(compilationDatabaseFilename = Option(value))
   }
 }
 
@@ -116,16 +120,13 @@ private object Frontend {
 
 }
 
-object Main extends X2CpgMain(cmdLineParser, new C2Cpg()) with FrontendHTTPServer[Config, C2Cpg] {
+object Main extends X2CpgMain(new C2Cpg(), cmdLineParser) {
 
-  override def run(config: Config, c2cpg: C2Cpg): Unit = {
+  override def run(config: frontend.ConfigType): Unit = {
     config match {
-      case c if c.serverMode      => startup(); config.serverTimeoutSeconds.foreach(serveUntilTimeout)
-      case c if c.printIfDefsOnly => c2cpg.printIfDefsOnly(config)
-      case _                      => c2cpg.run(config)
+      case c: Config if c.printIfDefsOnly => frontend.asInstanceOf[C2Cpg].printIfDefsOnly(c)
+      case _                              => super.run(config)
     }
   }
 
-  override protected def newDefaultConfig(): Config = Config()
-
 }

joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/config/ConfigTests.scala

@@ -39,7 +39,7 @@ class ConfigTests extends AnyWordSpec with Matchers with Inside {
       s.takeRight(n)
     }
 
-    inside(X2Cpg.parseCommandLine(args, parser, Config())) { case Some(config) =>
+    inside(X2Cpg.parseCommandLine(args, parser, Main.frontend.defaultConfig)) { case Some(config: Config) =>
       config.inputPath.endsWith("INPUT") shouldBe true
       config.outputPath shouldBe "OUTPUT"
       config.ignoredFiles.map(getSuffix(_, 13)).toSet shouldBe Set("1EXCLUDE_FILE", "2EXCLUDE_FILE")

joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/io/C2CpgHTTPServerTests.scala

@@ -38,13 +38,11 @@ class C2CpgHTTPServerTests extends AnyWordSpec with Matchers with BeforeAndAfter
   }
 
   override def beforeAll(): Unit = {
-    // Start server
-    port = io.joern.c2cpg.Main.startup()
+    port = io.joern.c2cpg.Main.server.startup()
   }
 
   override def afterAll(): Unit = {
-    // Stop server
-    io.joern.c2cpg.Main.stop()
+    io.joern.c2cpg.Main.server.stop()
   }
 
   "Using c2cpg in server mode" should {

joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/passes/FullNameUniquenessPassTests.scala

@@ -123,7 +123,7 @@ class FullNameUniquenessPassTests extends C2CpgSuite {
       )
       cpg.call
         .map(c =>
-          s"${c.name} in ${c.file.map(_.name).head} -> CALL -> ${c.methodFullName} in ${c.callOut.filename.head}"
+          s"${c.name} in ${c.file.map(_.name).head} -> CALL -> ${c.methodFullName} in ${c.staticCallOut.filename.head}"
         )
         .sorted
         .l shouldBe List(

joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/testfixtures/AstC2CpgFrontend.scala

@@ -14,6 +14,8 @@ import io.shiftleft.codepropertygraph.generated.Cpg
 import io.shiftleft.semanticcpg.utils.FileUtil
 
 trait AstC2CpgFrontend extends LanguageFrontend {
+  override type ConfigType = Config
+
   def execute(sourceCodePath: java.io.File): Cpg = {
     val cpgOutFile = FileUtil.newTemporaryFile(suffix = "cpg.bin")
     FileUtil.deleteOnExit(cpgOutFile)

joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/testfixtures/C2CpgFrontend.scala

@@ -7,6 +7,8 @@ import io.shiftleft.codepropertygraph.generated.Cpg
 import io.shiftleft.semanticcpg.utils.FileUtil
 
 trait C2CpgFrontend extends LanguageFrontend {
+  override type ConfigType = Config
+
   def execute(sourceCodePath: java.io.File): Cpg = {
     val cpgOutFile = FileUtil.newTemporaryFile(suffix = "cpg.bin")
     FileUtil.deleteOnExit(cpgOutFile)

joern-cli/frontends/csharpsrc2cpg/src/main/scala/io/joern/csharpsrc2cpg/CSharpSrc2Cpg.scala

@@ -31,9 +31,11 @@ import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, Future}
 import scala.util.{Failure, Success, Try}
 
-class CSharpSrc2Cpg extends X2CpgFrontend[Config] {
+class CSharpSrc2Cpg extends X2CpgFrontend {
+  override type ConfigType = Config
+  override val defaultConfig: Config = Config()
 
-  private val logger         = LoggerFactory.getLogger(getClass)
+  private val logger         = LoggerFactory.getLogger(classOf[CSharpSrc2Cpg])
   private val report: Report = new Report()
 
   override def createCpg(config: Config): Try[Cpg] = {