bbot 2.1.2.5217rc0__tar.gz → 2.1.2.5221rc0__tar.gz

{bbot-2.1.2.5217rc0 → bbot-2.1.2.5221rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bbot
-Version: 2.1.2.5217rc0
+Version: 2.1.2.5221rc0
 Summary: OSINT automation for hackers.
 Home-page: https://github.com/blacklanternsecurity/bbot
 License: GPL-3.0

{bbot-2.1.2.5217rc0 → bbot-2.1.2.5221rc0}/bbot/__init__.py

@@ -1,4 +1,4 @@
 # version placeholder (replaced by poetry-dynamic-versioning)
-__version__ = "v2.1.2.5217rc"
+__version__ = "v2.1.2.5221rc"
 
 from .scanner import Scanner, Preset

{bbot-2.1.2.5217rc0 → bbot-2.1.2.5221rc0}/bbot/core/helpers/depsinstaller/installer.py

@@ -350,6 +350,7 @@ class DepsInstaller:
             "make": "make",
             "gcc": "gcc",
             "bash": "bash",
+            "which": "which",
         }
         for command, package_name in core_deps.items():
             if not self.parent_helper.which(command):

{bbot-2.1.2.5217rc0 → bbot-2.1.2.5221rc0}/bbot/core/shared_deps.py

@@ -159,6 +159,39 @@ DEP_MASSCAN = [
     },
 ]
 
+DEP_JAVA = [
+    {
+        "name": "Check if Java is installed",
+        "command": "which java",
+        "register": "java_installed",
+        "ignore_errors": True,
+    },
+    {
+        "name": "Install latest JRE (Debian)",
+        "package": {"name": ["default-jre"], "state": "present"},
+        "become": True,
+        "when": "ansible_facts['os_family'] == 'Debian' and java_installed.rc != 0",
+    },
+    {
+        "name": "Install latest JRE (Arch)",
+        "package": {"name": ["jre-openjdk"], "state": "present"},
+        "become": True,
+        "when": "ansible_facts['os_family'] == 'Archlinux' and java_installed.rc != 0",
+    },
+    {
+        "name": "Install latest JRE (Fedora)",
+        "package": {"name": ["which", "java-latest-openjdk-headless"], "state": "present"},
+        "become": True,
+        "when": "ansible_facts['os_family'] == 'RedHat' and java_installed.rc != 0",
+    },
+    {
+        "name": "Install latest JRE (Alpine)",
+        "package": {"name": ["openjdk11"], "state": "present"},
+        "become": True,
+        "when": "ansible_facts['os_family'] == 'Alpine' and java_installed.rc != 0",
+    },
+]
+
 # shared module dependencies -- ffuf, massdns, chromium, etc.
 SHARED_DEPS = {}
 for var, val in list(locals().items()):

{bbot-2.1.2.5217rc0 → bbot-2.1.2.5221rc0}/bbot/modules/jadx.py

@@ -18,31 +18,8 @@ class jadx(BaseModule):
     options_desc = {
         "threads": "Maximum jadx threads for extracting apk's, default: 4",
     }
+    deps_common = ["java"]
     deps_ansible = [
-        {
-            "name": "Install latest JRE (Debian)",
-            "package": {"name": ["default-jre"], "state": "present"},
-            "become": True,
-            "when": "ansible_facts['os_family'] == 'Debian'",
-        },
-        {
-            "name": "Install latest JRE (Arch)",
-            "package": {"name": ["jre-openjdk"], "state": "present"},
-            "become": True,
-            "when": "ansible_facts['os_family'] == 'Archlinux'",
-        },
-        {
-            "name": "Install latest JRE (Fedora)",
-            "package": {"name": ["which", "java-latest-openjdk-headless"], "state": "present"},
-            "become": True,
-            "when": "ansible_facts['os_family'] == 'RedHat'",
-        },
-        {
-            "name": "Install latest JRE (Alpine)",
-            "package": {"name": ["openjdk11"], "state": "present"},
-            "become": True,
-            "when": "ansible_facts['os_family'] == 'Alpine'",
-        },
         {
             "name": "Create jadx directory",
             "file": {"path": "#{BBOT_TOOLS}/jadx", "state": "directory", "mode": "0755"},
@@ -102,10 +79,9 @@ class jadx(BaseModule):
         try:
             output = await self.run_process(command, check=True)
         except CalledProcessError as e:
-            self.warning(f"Error decompiling {path}. STDERR: {repr(e.stderr)}")
+            self.warning(f"Error decompiling {path}. STDOUT: {e.stdout} STDERR: {repr(e.stderr)}")
             return False
-        if not Path(output_dir / "resources").exists() and not Path(output_dir / "sources").exists():
-            self.warning(f"JADX was unable to decompile {path}.")
-            self.warning(output)
+        if not (output_dir / "resources").exists() and not (output_dir / "sources").exists():
+            self.warning(f"JADX was unable to decompile {path}: (STDOUT: {output.stdout} STDERR: {output.stderr})")
             return False
         return True

{bbot-2.1.2.5217rc0 → bbot-2.1.2.5221rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bbot"
-version = "v2.1.2.5217rc"
+version = "v2.1.2.5221rc"
 description = "OSINT automation for hackers."
 authors = [
     "TheTechromancer",