purl as a name tag

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
AppThreat · Oct 11, 2023 · d281cbf · d281cbf
1 parent e38c52a
commit d281cbf
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name                     := "chen"
 ThisBuild / organization := "io.appthreat"
-ThisBuild / version      := "0.0.12"
+ThisBuild / version      := "0.0.13"
 ThisBuild / scalaVersion := "3.3.1"
 
 val cpgVersion = "1.4.22"

diff --git a/dataflowengineoss/src/main/scala/io/appthreat/dataflowengineoss/language/Path.scala b/dataflowengineoss/src/main/scala/io/appthreat/dataflowengineoss/language/Path.scala
@@ -35,7 +35,7 @@ object Path {
   lazy val maxTrackedWidth = sys.env.get("CHEN_DATAFLOW_TRACKED_WIDTH").map(_.toInt).getOrElse(DefaultMaxTrackedWidth)
 
   private def tagAsString(tag: Iterator[Tag]) =
-    if (tag.nonEmpty) tag.filterNot(_.name == "purl").name.mkString(", ") else ""
+    if (tag.nonEmpty) tag.name.mkString(", ") else ""
 
   implicit val show: Show[Path] = { path =>
     var caption = ""
@@ -65,6 +65,7 @@ object Path {
       var tags: String = tagAsString(astNode.tag)
       if (fileLocation == "#") fileLocation = "N/A"
       astNode match {
+        case _: MethodReturn =>
         case methodParameterIn: MethodParameterIn =>
           val methodName = methodParameterIn.method.name
           if (tags.isEmpty && methodParameterIn.method.tag.nonEmpty) {
@@ -172,7 +173,7 @@ object Path {
       {
         val end_section         = row.head == "call"
         val trow: Array[String] = row.tail
-        if (trow(3) != "RET" && !trow(4).startsWith("<operator>.fieldAccess")) {
+        if (!trow(4).startsWith("<operator>.fieldAccess")) {
           val tagsStr: String = if (trow(4).nonEmpty) s"Tags: ${trow(4)}" else ""
           val methodStr       = s"${trow(1)}\n${tagsStr}"
           table.add_row(trow(0), methodStr.stripMargin, trow(2), trow(3), end_section = end_section)

diff --git a/platform/frontends/x2cpg/src/main/scala/io/appthreat/x2cpg/passes/taggers/CdxPass.scala b/platform/frontends/x2cpg/src/main/scala/io/appthreat/x2cpg/passes/taggers/CdxPass.scala
@@ -36,10 +36,10 @@ class CdxPass(cpg: Cpg) extends CpgPass(cpg) {
           val nsstr = ns.hcursor.downField("value").as[String].getOrElse("")
           nsstr.split("\n").filterNot(_.contains("test")).filterNot(_.contains("mock")).foreach { (pkg: String) =>
             val bpkg = pkg.takeWhile(_ != '$')
-            cpg.call.typeFullNameExact(bpkg).newTagNodePair(PURL_TYPE, compPurl).store()(dstGraph)
-            cpg.method.parameter.typeFullNameExact(bpkg).newTagNodePair(PURL_TYPE, compPurl).store()(dstGraph)
+            cpg.call.typeFullNameExact(bpkg).newTagNode(compPurl).store()(dstGraph)
+            cpg.method.parameter.typeFullNameExact(bpkg).newTagNode(compPurl).store()(dstGraph)
             if (!containsRegex(bpkg))
-              cpg.method.fullName(s"${Pattern.quote(bpkg)}.*").newTagNodePair(PURL_TYPE, compPurl).store()(dstGraph)
+              cpg.method.fullName(s"${Pattern.quote(bpkg)}.*").newTagNode(compPurl).store()(dstGraph)
             if (compType != "library") {
               cpg.call.typeFullNameExact(bpkg).newTagNode(compType).store()(dstGraph)
               cpg.call.typeFullNameExact(bpkg).receiver.newTagNode(s"$compType-value").store()(dstGraph)

diff --git a/platform/src/main/scala/io/appthreat/chencli/ChenExport.scala b/platform/src/main/scala/io/appthreat/chencli/ChenExport.scala
@@ -71,7 +71,7 @@ object ChenExport {
   }
 
   private def parseConfig(args: Array[String]): Option[Config] = {
-    new scopt.OptionParser[Config]("joern-export") {
+    new scopt.OptionParser[Config]("chen-export") {
       head("Dump intermediate graph representations (or entire graph) of code in a given export format")
       help("help")
       arg[String]("cpg")

diff --git a/platform/src/main/scala/io/appthreat/chencli/ChenFlow.scala b/platform/src/main/scala/io/appthreat/chencli/ChenFlow.scala
@@ -57,7 +57,7 @@ object ChenFlow {
   }
 
   private def parseConfig(args: Array[String]): Option[FlowConfig] = {
-    new scopt.OptionParser[FlowConfig]("joern-flow") {
+    new scopt.OptionParser[FlowConfig]("chen-flow") {
       head("Find flows")
       help("help")
 

diff --git a/platform/src/main/scala/io/appthreat/chencli/ChenParse.scala b/platform/src/main/scala/io/appthreat/chencli/ChenParse.scala
@@ -26,7 +26,7 @@ object ChenParse {
     }
   }
 
-  val optionParser = new scopt.OptionParser[ParserConfig]("joern-parse") {
+  val optionParser = new scopt.OptionParser[ParserConfig]("chen-parse") {
     arg[String]("input")
       .optional()
       .text("source file or directory containing source files")

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "appthreat-chen"
-version = "0.0.12"
+version = "0.0.13"
 description = "Code Hierarchy Exploration Net (chen)"
 authors = ["Team AppThreat <cloud@appthreat.com>"]
 license = "Apache-2.0"