feat(bytecode): add return type support

archguard · Mar 28, 2022 · 270970a · 270970a
1 parent 0d36706
commit 270970a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/scan_bytecode/src/main/kotlin/org/archguard/scanner/bytecode/ByteCodeParser.kt b/scan_bytecode/src/main/kotlin/org/archguard/scanner/bytecode/ByteCodeParser.kt
@@ -130,10 +130,14 @@ class ByteCodeParser {
 
         val isInterface: Boolean = CodeConstants.ACC_INTERFACE == methodNode.access
         codeFunction.Modifiers = createModifiers(methodNode.access, METHOD_ALLOWED, isInterface, METHOD_EXCLUDED)
+        codeFunction.ReturnType = getReturnTypeFromDesc(methodNode.desc).orEmpty()
 
         return codeFunction
     }
 
+    private fun getReturnTypeFromDesc(desc: String): String? {
+        return Type.getType(desc).returnType.className
+    }
 
     private fun getDataStructureName(internalName: String): String {
         return Type.getObjectType(internalName).className

diff --git a/scan_bytecode/src/test/kotlin/org/archguard/scanner/bytecode/ByteCodeParserTest.kt b/scan_bytecode/src/test/kotlin/org/archguard/scanner/bytecode/ByteCodeParserTest.kt
@@ -16,6 +16,7 @@ internal class ByteCodeParserTest {
         assertEquals(2, ds.Functions.size)
         assertEquals("<init>", ds.Functions[0].Name)
         assertEquals("main", ds.Functions[1].Name)
+        assertEquals("void", ds.Functions[1].ReturnType)
     }
 
     @Test