Support for jimple

Signed-off-by: Prabhu Subramanian <[email protected]>

Dockerfile

@@ -4,7 +4,7 @@ LABEL maintainer="appthreat" \
       org.opencontainers.image.authors="Team AppThreat <[email protected]>" \
       org.opencontainers.image.source="https://github.com/appthreat/cpggen" \
       org.opencontainers.image.url="https://github.com/appthreat/cpggen" \
-      org.opencontainers.image.version="1.0.9" \
+      org.opencontainers.image.version="1.0.10" \
       org.opencontainers.image.vendor="AppThreat" \
       org.opencontainers.image.licenses="Apache-2.0" \
       org.opencontainers.image.title="cpggen" \

Dockerfile-alma8

@@ -4,7 +4,7 @@ LABEL maintainer="appthreat" \
       org.opencontainers.image.authors="Team AppThreat <[email protected]>" \
       org.opencontainers.image.source="https://github.com/appthreat/cpggen" \
       org.opencontainers.image.url="https://github.com/appthreat/cpggen" \
-      org.opencontainers.image.version="1.0.9" \
+      org.opencontainers.image.version="1.0.10" \
       org.opencontainers.image.vendor="AppThreat" \
       org.opencontainers.image.licenses="Apache-2.0" \
       org.opencontainers.image.title="cpggen" \

Dockerfile-oss

@@ -4,7 +4,7 @@ LABEL maintainer="appthreat" \
       org.opencontainers.image.authors="Team AppThreat <[email protected]>" \
       org.opencontainers.image.source="https://github.com/appthreat/cpggen" \
       org.opencontainers.image.url="https://github.com/appthreat/cpggen" \
-      org.opencontainers.image.version="1.0.9" \
+      org.opencontainers.image.version="1.0.10" \
       org.opencontainers.image.vendor="AppThreat" \
       org.opencontainers.image.licenses="Apache-2.0" \
       org.opencontainers.image.title="cpggen" \

README.md

@@ -31,15 +31,15 @@ Download the executable binary for your operating system from the [releases page
 - cdxgen with Node.js 18 - Generates SBoM
 
 ```bash
-curl -LO https://github.com/AppThreat/cpggen/releases/download/v1.0.9/cpggen-linux-amd64
+curl -LO https://github.com/AppThreat/cpggen/releases/download/v1.0.10/cpggen-linux-amd64
 chmod +x cpggen-linux-amd64
 ./cpggen-linux-amd64 --help
 ```
 
 On Windows,
 
 ```powershell
-curl -LO https://github.com/appthreat/cpggen/releases/download/v1.0.9/cpggen.exe
+curl -LO https://github.com/appthreat/cpggen/releases/download/v1.0.10/cpggen.exe
 .\cpggen.exe --help
 ```
 

cpggen/executor.py

@@ -124,6 +124,7 @@ def get(configName, default_value=None):
     "java": "%(joern_home)sjavasrc2cpg%(only_bat_ext)s -J-Xmx%(memory)s -o %(cpg_out)s %(src)s",
     "java-with-deps": "%(joern_home)sjavasrc2cpg%(only_bat_ext)s -J-Xmx%(memory)s -o %(cpg_out)s %(src)s --fetch-dependencies --inference-jar-paths %(home_dir)s/.m2",
     "java-with-gradle-deps": "%(joern_home)sjavasrc2cpg%(only_bat_ext)s -J-Xmx%(memory)s -o %(cpg_out)s %(src)s --fetch-dependencies --inference-jar-paths %(home_dir)s/.gradle/caches/modules-2/files-2.1",
+    "jimple": "%(joern_home)sjimple2cpg%(only_bat_ext)s%(android_jar)s -J-Xmx%(memory)s -o %(cpg_out)s %(src)s",
     "binary": "%(joern_home)sghidra2cpg%(only_bat_ext)s -J-Xmx%(memory)s -o %(cpg_out)s %(src)s",
     "js": "%(joern_home)sjssrc2cpg%(bin_ext)s -J-Xmx%(memory)s -o %(cpg_out)s %(src)s",
     "ts": "%(joern_home)sjssrc2cpg%(bin_ext)s -J-Xmx%(memory)s -o %(cpg_out)s %(src)s",
@@ -578,6 +579,7 @@ def exec_tool(
                     bin_ext=bin_ext,
                     exe_ext=exe_ext,
                     only_bat_ext=only_bat_ext,
+                    android_jar=os.getenv("JIMPLE_ANDROID_JAR", ""),
                     os_path_sep=os.path.sep,
                     **extra_args,
                 )

cpggen/utils.py

@@ -318,6 +318,7 @@ def detect_project_type(src_dir):
     :param src_dir: Source directory
     :return List of detected types
     """
+    is_java_like = False
     home_dir = str(Path.home())
     maven_cache = os.path.join(home_dir, ".m2")
     gradle_cache = os.path.join(home_dir, ".gradle", "caches", "modules-2", "files-2.1")
@@ -344,6 +345,7 @@ def detect_project_type(src_dir):
         or find_files(src_dir, ".gradle", False, True)
         or find_files(src_dir, ".java", False, True)
     ):
+        is_java_like = True
         if os.getenv("SHIFTLEFT_ACCESS_TOKEN"):
             project_types.append("jar")
         else:
@@ -395,6 +397,12 @@ def detect_project_type(src_dir):
         project_types.append("llvm")
     if is_exe(src_dir):
         project_types.append("binary")
+    # Directory contains just a bunch of jar then try jimple
+    if not is_java_like and find_files(src_dir, ".jar", False, True):
+        if os.getenv("SHIFTLEFT_ACCESS_TOKEN"):
+            project_types.append("jar")
+        else:
+            project_types.append("jimple")
     return project_types
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cpggen"
-version = "1.0.9"
+version = "1.0.10"
 description = "Generate CPG for multiple languages for use with joern"
 authors = ["Team AppThreat <[email protected]>"]
 license = "Apache-2.0"