fix - inheritsFrom in kotlin, when generics are used

Privado-Inc · Dec 30, 2024 · 97409d3 · 97409d3
1 parent b300d46
commit 97409d3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/joern-cli/frontends/kotlin2cpg/src/main/scala/io/joern/kotlin2cpg/ast/AstCreator.scala b/joern-cli/frontends/kotlin2cpg/src/main/scala/io/joern/kotlin2cpg/ast/AstCreator.scala
@@ -538,7 +538,7 @@ class AstCreator(fileWithMeta: KtFileWithMeta, bindingContext: BindingContext, g
   protected def fullNameByImportPath(typeRef: KtTypeReference, file: KtFile): Option[String] = {
     if (typeRef == null) { None }
     else {
-      val typeRefText = typeRef.getText.stripSuffix("?")
+      val typeRefText = typeRef.getText.split("<").headOption.getOrElse(typeRef.getText).stripSuffix("?")
       file.getImportList.getImports.asScala.collectFirst {
         case directive if directive.getImportedName != null && directive.getImportedName.toString == typeRefText =>
           directive.getImportPath.getPathStr

diff --git a/...-cli/frontends/kotlin2cpg/src/test/scala/io/joern/kotlin2cpg/querying/TypeDeclTests.scala b/...-cli/frontends/kotlin2cpg/src/test/scala/io/joern/kotlin2cpg/querying/TypeDeclTests.scala
@@ -451,4 +451,21 @@ class TypeDeclTests extends KotlinCode2CpgFixture(withOssDataflow = false) {
       firstCallOfSecondaryCtor.methodFullName shouldBe "mypkg.QClass.<init>:void()"
     }
   }
+
+  "CPG for inheritance having generics" should {
+    val cpg = code("""
+        |import org.apache.flink.streaming.api.functions.sink.RichSinkFunction
+        |
+        |class ApiSink<T>(private val apiUrl: String) : RichSinkFunction<T>() {
+        |    private var httpClient: CloseableHttpClient? = null
+        |
+        |}
+        |""".stripMargin)
+
+    "resolve base types" in {
+      cpg.typeDecl.name("ApiSink").inheritsFromTypeFullName.l shouldBe List(
+        "org.apache.flink.streaming.api.functions.sink.RichSinkFunction"
+      )
+    }
+  }
 }