bbot 2.5.0.6719rc0__py3-none-any.whl → 2.5.0.6730rc0__py3-none-any.whl

bbot/__init__.py

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

bbot/core/helpers/depsinstaller/installer.py

@@ -196,7 +196,7 @@ class DepsInstaller:
         deps_common = preloaded["deps"]["common"]
         if deps_common:
             for dep_common in deps_common:
-                if self.setup_status.get(dep_common, False) is True:
+                if self.setup_status.get(dep_common, False) is True and self.deps_behavior != "force_install":
                     log.debug(
                         f'Skipping installation of dependency "{dep_common}" for module "{module}" since it is already installed'
                     )

bbot/core/helpers/misc.py

@@ -1309,7 +1309,7 @@ def make_netloc(host, port=None):
     return f"{host}:{port}"
 
 
-def which(*executables):
+def which(*executables, path=None):
     """Finds the full path of the first available executable from a list of executables.
 
     Args:
@@ -1325,7 +1325,7 @@ def which(*executables):
     import shutil
 
     for e in executables:
-        location = shutil.which(e)
+        location = shutil.which(e, path=path)
         if location:
             return location
 

bbot/core/shared_deps.py

@@ -108,6 +108,24 @@ DEP_CHROMIUM = [
         "when": "ansible_facts['os_family'] == 'Debian'",
         "ignore_errors": True,
     },
+    {
+        "name": "Get latest Chromium version (Darwin x86_64)",
+        "uri": {
+            "url": "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Mac%2FLAST_CHANGE?alt=media",
+            "return_content": True,
+        },
+        "register": "chromium_version_darwin_x86_64",
+        "when": "ansible_facts['os_family'] == 'Darwin' and ansible_facts['architecture'] == 'x86_64'",
+    },
+    {
+        "name": "Get latest Chromium version (Darwin arm64)",
+        "uri": {
+            "url": "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Mac_Arm%2FLAST_CHANGE?alt=media",
+            "return_content": True,
+        },
+        "register": "chromium_version_darwin_arm64",
+        "when": "ansible_facts['os_family'] == 'Darwin' and ansible_facts['architecture'] == 'arm64'",
+    },
     {
         "name": "Download Chromium (Debian)",
         "unarchive": {
@@ -119,6 +137,26 @@ DEP_CHROMIUM = [
         "when": "ansible_facts['os_family'] == 'Debian'",
         "ignore_errors": True,
     },
+    {
+        "name": "Download Chromium (Darwin x86_64)",
+        "unarchive": {
+            "src": "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Mac%2F{{ chromium_version_darwin_x86_64.content }}%2Fchrome-mac.zip?alt=media",
+            "remote_src": True,
+            "dest": "#{BBOT_TOOLS}",
+            "creates": "#{BBOT_TOOLS}/chrome-mac",
+        },
+        "when": "ansible_facts['os_family'] == 'Darwin' and ansible_facts['architecture'] == 'x86_64'",
+    },
+    {
+        "name": "Download Chromium (Darwin arm64)",
+        "unarchive": {
+            "src": "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Mac_Arm%2F{{ chromium_version_darwin_arm64.content }}%2Fchrome-mac.zip?alt=media",
+            "remote_src": True,
+            "dest": "#{BBOT_TOOLS}",
+            "creates": "#{BBOT_TOOLS}/chrome-mac",
+        },
+        "when": "ansible_facts['os_family'] == 'Darwin' and ansible_facts['architecture'] == 'arm64'",
+    },
     # Because Ubuntu is a special snowflake, we have to bend over backwards to fix the chrome sandbox
     # see https://chromium.googlesource.com/chromium/src/+/main/docs/security/apparmor-userns-restrictions.md
     {

bbot/modules/gowitness.py

@@ -2,6 +2,7 @@ import os
 import asyncio
 import aiosqlite
 import multiprocessing
+import platform
 from pathlib import Path
 from contextlib import suppress
 from shutil import copyfile, copymode
@@ -23,6 +24,7 @@ class gowitness(BaseModule):
         "output_path": "",
         "social": False,
         "idle_timeout": 1800,
+        "chrome_path": "",
     }
     options_desc = {
         "version": "Gowitness version",
@@ -33,6 +35,7 @@ class gowitness(BaseModule):
         "output_path": "Where to save screenshots",
         "social": "Whether to screenshot social media webpages",
         "idle_timeout": "Skip the current gowitness batch if it stalls for longer than this many seconds",
+        "chrome_path": "Path to chrome executable",
     }
     deps_common = ["chromium"]
     deps_pip = ["aiosqlite"]
@@ -67,29 +70,54 @@ class gowitness(BaseModule):
             self.base_path = Path(output_path) / "gowitness"
         else:
             self.base_path = self.scan.home / "gowitness"
+
         self.chrome_path = None
-        custom_chrome_path = self.helpers.tools_dir / "chrome-linux" / "chrome"
-        if custom_chrome_path.is_file():
-            self.chrome_path = custom_chrome_path
+        config_chrome_path = self.config.get("chrome_path")
+        if config_chrome_path:
+            config_chrome_path = Path(config_chrome_path)
+            if not config_chrome_path.is_file():
+                return False, f"Could not find custom Chrome path at {config_chrome_path}"
+            self.chrome_path = config_chrome_path
+        else:
+            if platform.system() == "Darwin":
+                bbot_chrome_path = (
+                    self.helpers.tools_dir / "chrome-mac" / "Chromium.app" / "Contents" / "MacOS" / "Chromium"
+                )
+            else:
+                bbot_chrome_path = self.helpers.tools_dir / "chrome-linux" / "chrome"
+            if bbot_chrome_path.is_file():
+                self.chrome_path = bbot_chrome_path
+
+        # make sure our chrome path works
+        chrome_test_pass = False
+        if self.chrome_path and self.chrome_path.is_file():
+            chrome_test_proc = await self.run_process([str(self.chrome_path), "--version"])
+            if getattr(chrome_test_proc, "returncode", 1) == 0:
+                self.verbose(f"Found chrome executable at {self.chrome_path}")
+                chrome_test_pass = True
+
+        if not chrome_test_pass:
+            # last resort - try to find a working chrome install
+            for binary in ("Google Chrome", "chrome", "chromium", "chromium-browser"):
+                binary_path = self.helpers.which(binary)
+                if binary_path and Path(binary_path).is_file():
+                    chrome_test_proc = await self.run_process([str(binary_path), "--version"])
+                    if getattr(chrome_test_proc, "returncode", 1) == 0:
+                        self.verbose(f"Found chrome executable at {binary_path}")
+                        chrome_test_pass = True
+                        break
+
+        if not chrome_test_pass:
+            return (
+                False,
+                "Failed to set up Google chrome. Please install manually and set `chrome_path`, or try again with --force-deps.",
+            )
 
         # fix ubuntu-specific sandbox bug
         chrome_devel_sandbox = self.helpers.tools_dir / "chrome-linux" / "chrome_sandbox"
         if chrome_devel_sandbox.is_file():
             os.environ["CHROME_DEVEL_SANDBOX"] = str(chrome_devel_sandbox)
 
-        # make sure we have a working chrome install
-        chrome_test_pass = False
-        for binary in ("chrome", "chromium", "chromium-browser", custom_chrome_path):
-            binary_path = self.helpers.which(binary)
-            if binary_path and Path(binary_path).is_file():
-                chrome_test_proc = await self.run_process([binary_path, "--version"])
-                if getattr(chrome_test_proc, "returncode", 1) == 0:
-                    self.verbose(f"Found chrome executable at {binary_path}")
-                    chrome_test_pass = True
-                    break
-        if not chrome_test_pass:
-            return False, "Failed to set up Google chrome. Please install manually or try again with --force-deps."
-
         self.db_path = self.base_path / "gowitness.sqlite3"
         self.screenshot_path = self.base_path / "screenshots"
         self.command = self.construct_command()

bbot/modules/trufflehog.py

@@ -14,7 +14,7 @@ class trufflehog(BaseModule):
     }
 
     options = {
-        "version": "3.88.34",
+        "version": "3.89.0",
         "config": "",
         "only_verified": True,
         "concurrency": 8,

{bbot-2.5.0.6719rc0.dist-info → bbot-2.5.0.6730rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bbot
-Version: 2.5.0.6719rc0
+Version: 2.5.0.6730rc0
 Summary: OSINT automation for hackers.
 License: GPL-3.0
 Keywords: python,cli,automation,osint,threat-intel,intelligence,neo4j,scanner,python-library,hacking,recursion,pentesting,recon,command-line-tool,bugbounty,subdomains,security-tools,subdomain-scanner,osint-framework,attack-surface,subdomain-enumeration,osint-tool

{bbot-2.5.0.6719rc0.dist-info → bbot-2.5.0.6730rc0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bbot/__init__.py,sha256=FMEKOd7NciU5-Upvm6cWBUHB7ba5VOQQd5iHMtR9kgs,163
+bbot/__init__.py,sha256=WqBatiW2cL1ucLF3Om8PN3W_CWUYJOzUTd07U4kF1_M,163
 bbot/cli.py,sha256=1QJbANVw9Q3GFM92H2QRV2ds5756ulm08CDZwzwPpeI,11888
 bbot/core/__init__.py,sha256=l255GJE_DvUnWvrRb0J5lG-iMztJ8zVvoweDOfegGtI,46
 bbot/core/config/__init__.py,sha256=zYNw2Me6tsEr8hOOkLb4BQ97GB7Kis2k--G81S8vofU,342
@@ -16,7 +16,7 @@ bbot/core/helpers/bloom.py,sha256=gk02rO6x3F5MICa7ZUDsinRudwoGAifsbiyiMCwd0Gs,27
 bbot/core/helpers/cache.py,sha256=1aMr3HVD45cDtHEG5xlznDUCywRgO9oRFidscrs_5sA,1537
 bbot/core/helpers/command.py,sha256=UBJa2RInEJtGjZ5e24PUQxPu1aTCIFkcCrrB0ERLdGI,12810
 bbot/core/helpers/depsinstaller/__init__.py,sha256=C2jF_ymSPIO68F649csYQql37ppPfUjFc8eq8LhgDkQ,66
-bbot/core/helpers/depsinstaller/installer.py,sha256=0sEut_B1rJKEnlTJvtk6nsWv1_1hJsbDRsVzylidmYc,19774
+bbot/core/helpers/depsinstaller/installer.py,sha256=i5FPcASDV4OPTUAT_txnbj2mmLr4z7-sigDPNiMUjWo,19816
 bbot/core/helpers/depsinstaller/sudo_askpass.py,sha256=yGa2OQv30RO75QkMuG1iruKqb7amQxRVRRcHmvIeGhk,1276
 bbot/core/helpers/diff.py,sha256=X9MnHfz3IjWhD2grYTHzVPYoiWI9ZqjJul2Bp_BRGcE,10841
 bbot/core/helpers/dns/__init__.py,sha256=SboBeh4o81Xd4mAKhV10QzoRPDH4g28xC5PZVqVmJ28,35
@@ -29,7 +29,7 @@ bbot/core/helpers/files.py,sha256=9tVr3973QvX8l6o3TweD5_MCZiQpuJVffbzW0U7Z30U,57
 bbot/core/helpers/helper.py,sha256=u-q_Ka9pY1atvC-FChxYpURM7b3_0gaCNIHSG__Wi74,8538
 bbot/core/helpers/interactsh.py,sha256=VBYYH6-rWBofRsgemndK6iZNmyifOps8vgQOw2mac4k,12624
 bbot/core/helpers/libmagic.py,sha256=QMHyxjgDLb2jyjBvK1MQ-xt6WkGXhKcHu9ZP1li-sik,3460
-bbot/core/helpers/misc.py,sha256=vJOF827mJbq-u7eyk1Tc3NAILSEGdUm1Q1lYs3YKLwU,88735
+bbot/core/helpers/misc.py,sha256=hi5iyzpLc6oFk5XrWQN7leuRDyuZtdWuKVBxTUpQ_RY,88757
 bbot/core/helpers/names_generator.py,sha256=N74pgt1vEJ8deBzV6eL5HiOEOG_6M7r0_MjbyxnPxfM,10516
 bbot/core/helpers/ntlm.py,sha256=P2Xj4-GPos2iAzw4dfk0FJp6oGyycGhu2x6sLDVjYjs,2573
 bbot/core/helpers/process.py,sha256=00uRpLMFi3Pt3uT8qXwAIhsXdoa7h-ifoXh0sGYgwqs,1702
@@ -48,7 +48,7 @@ bbot/core/helpers/wordcloud.py,sha256=QM8Z1N01_hXrRFKQjvRL-IzOOC7ZMKjuSBID3u77Sx
 bbot/core/helpers/yara_helper.py,sha256=ypwC_H_ovJp9BpOwqgPkIdZEwqWfvqrRdKlwzBLfm8Q,1592
 bbot/core/modules.py,sha256=G4rRVF1bQzp62kwpgxwMa_FTV4-huWwtcd6HpW9jQf0,31970
 bbot/core/multiprocess.py,sha256=ocQHanskJ09gHwe7RZmwNdZyCOQyeyUoIHCtLbtvXUk,1771
-bbot/core/shared_deps.py,sha256=mCMZeKSt46trzVqQDPGfXfEWg0Zw5YjiJx4BnsIRgHM,7640
+bbot/core/shared_deps.py,sha256=NeJmyakKxQQjN-H3rYGwGuHeVxDiVM_KnDfeVEeIbf4,9498
 bbot/db/sql/models.py,sha256=SrUdDOBCICzXJBY29p0VvILhMQ1JCuh725bqvIYogX0,4884
 bbot/defaults.yml,sha256=TTxtlnyE9vPihXjkGMDbBpNRlGa48GhRXS23iFsKUAg,7830
 bbot/errors.py,sha256=xwQcD26nU9oc7-o0kv5jmEDTInmi8_W8eKAgQZZxdVM,953
@@ -112,7 +112,7 @@ bbot/modules/github_usersearch.py,sha256=G8knkQBJsn7EKcMhcEaFPiB_Y5S96e2VaseBubs
 bbot/modules/github_workflows.py,sha256=xKntAFDeGuE4MqbEmhJyYXKbzoSh9tWYlHNlnF37PYA,10040
 bbot/modules/gitlab.py,sha256=9oWWpBijeHCjuFBfWW4HvNqt7bvJvrBgBjaaz_UPPnE,5964
 bbot/modules/google_playstore.py,sha256=N4QjzQag_bgDXfX17rytBiiWA-SQtYI2N0J_ZNEOdv0,3701
-bbot/modules/gowitness.py,sha256=vcyZl87xJVHWTuRY032d2dORg3ykVKPIBwD2HzSxvYA,11784
+bbot/modules/gowitness.py,sha256=o4nIBbHVX9tYVW9CpwTsaftWDZu41nhxS0KEp4FoiBs,13003
 bbot/modules/hackertarget.py,sha256=IsKs9PtxUHdLJKZydlRdW_loBE2KphQYi3lKDAd4odc,1029
 bbot/modules/host_header.py,sha256=uDjwidMdeNPMRfzQ2YW4REEGsZqnGOZHbOS6GgdNd9s,7686
 bbot/modules/httpx.py,sha256=z0sgnfLqIXyiadM0rKQK2p86lka7rC4pGCfTVUqU5Lk,8118
@@ -206,7 +206,7 @@ bbot/modules/templates/sql.py,sha256=o-CdyyoJvHJdJBKkj3CIGXYxUta4w2AB_2Vr-k7cDDU
 bbot/modules/templates/subdomain_enum.py,sha256=epyKSly08jqaINV_AMMWbNafIeQjJqvd3aj63KD0Mck,8402
 bbot/modules/templates/webhook.py,sha256=uGFmcJ81GzGN1UI2k2O7nQF_fyh4ehLDEg2NSXaPnhk,3373
 bbot/modules/trickest.py,sha256=MRgLW0YiDWzlWdAjyqfPPLFb-a51r-Ffn_dphiJI_gA,1550
-bbot/modules/trufflehog.py,sha256=TA8TVj9he12I9TtVvHdH_WJwDqLK97mATwtkuSi3l2g,8703
+bbot/modules/trufflehog.py,sha256=63gfyljjo5iymhr0BbKo-35Pj00h_T5wLg8Eon6SPlM,8702
 bbot/modules/url_manipulation.py,sha256=4J3oFkqTSJPPmbKEKAHJg2Q2w4QNKtQhiN03ZJq5VtI,4326
 bbot/modules/urlscan.py,sha256=-w_3Bm6smyG2GLQyIbnMUkKmeQVauo-V6F4_kJDYG7s,3740
 bbot/modules/vhost.py,sha256=cirOe0HR4M0TEBN8JdXo2l0s2flc8ZSdxggGm79blT8,5459
@@ -449,8 +449,8 @@ bbot/wordlists/raft-small-extensions-lowercase_CLEANED.txt,sha256=ZSIVebs7ptMvHx
 bbot/wordlists/top_open_ports_nmap.txt,sha256=LmdFYkfapSxn1pVuQC2LkOIY2hMLgG-Xts7DVtYzweM,42727
 bbot/wordlists/valid_url_schemes.txt,sha256=0B_VAr9Dv7aYhwi6JSBDU-3M76vNtzN0qEC_RNLo7HE,3310
 bbot/wordlists/wordninja_dns.txt.gz,sha256=DYHvvfW0TvzrVwyprqODAk4tGOxv5ezNmCPSdPuDUnQ,570241
-bbot-2.5.0.6719rc0.dist-info/LICENSE,sha256=GzeCzK17hhQQDNow0_r0L8OfLpeTKQjFQwBQU7ZUymg,32473
-bbot-2.5.0.6719rc0.dist-info/METADATA,sha256=GjrkRjRG81KdmlYH76ToKPJWXj9nIDscPrnqMN4cIgo,18308
-bbot-2.5.0.6719rc0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bbot-2.5.0.6719rc0.dist-info/entry_points.txt,sha256=cWjvcU_lLrzzJgjcjF7yeGuRA_eDS8pQ-kmPUAyOBfo,38
-bbot-2.5.0.6719rc0.dist-info/RECORD,,
+bbot-2.5.0.6730rc0.dist-info/LICENSE,sha256=GzeCzK17hhQQDNow0_r0L8OfLpeTKQjFQwBQU7ZUymg,32473
+bbot-2.5.0.6730rc0.dist-info/METADATA,sha256=EiOc-7dymmDaTYCIFEe0xNDokNbPgrWLetRAq8ORtDo,18308
+bbot-2.5.0.6730rc0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bbot-2.5.0.6730rc0.dist-info/entry_points.txt,sha256=cWjvcU_lLrzzJgjcjF7yeGuRA_eDS8pQ-kmPUAyOBfo,38
+bbot-2.5.0.6730rc0.dist-info/RECORD,,