bbot 2.5.0.6779rc0__tar.gz → 2.5.0.6790rc0__tar.gz

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bbot
-Version: 2.5.0.6779rc0
+Version: 2.5.0.6790rc0
 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.6779rc0 → bbot-2.5.0.6790rc0}/bbot/__init__.py

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

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/core/helpers/depsinstaller/installer.py

@@ -32,6 +32,20 @@ class DepsInstaller:
         "bash": "bash",
         "which": "which",
         "tar": "tar",
+        "xz": [
+            {
+                "name": "Install xz-utils (Debian)",
+                "package": {"name": ["xz-utils"], "state": "present"},
+                "become": True,
+                "when": "ansible_facts['os_family'] == 'Debian'",
+            },
+            {
+                "name": "Install xz (Non-Debian)",
+                "package": {"name": ["xz"], "state": "present"},
+                "become": True,
+                "when": "ansible_facts['os_family'] != 'Debian'",
+            },
+        ],
         # debian why are you like this
         "7z": [
             {
@@ -53,6 +67,44 @@ class DepsInstaller:
                 "when": "ansible_facts['distribution'] == 'Fedora'",
             },
         ],
+        # to compile just about any tool, we need the openssl dev headers
+        "openssl": [
+            {
+                "name": "Install OpenSSL library and development headers (Debian/Ubuntu)",
+                "package": {"name": ["libssl-dev", "openssl"], "state": "present"},
+                "become": True,
+                "when": "ansible_facts['os_family'] == 'Debian'",
+                "ignore_errors": True,
+            },
+            {
+                "name": "Install OpenSSL library and development headers (RedHat/CentOS/Fedora)",
+                "package": {"name": ["openssl", "openssl-devel"], "state": "present"},
+                "become": True,
+                "when": "ansible_facts['os_family'] == 'RedHat' or ansible_facts['os_family'] == 'Suse' ",
+                "ignore_errors": True,
+            },
+            {
+                "name": "Install OpenSSL library and development headers (Arch)",
+                "package": {"name": ["openssl"], "state": "present"},
+                "become": True,
+                "when": "ansible_facts['os_family'] == 'Archlinux'",
+                "ignore_errors": True,
+            },
+            {
+                "name": "Install OpenSSL library and development headers (Alpine)",
+                "package": {"name": ["openssl", "openssl-dev"], "state": "present"},
+                "become": True,
+                "when": "ansible_facts['os_family'] == 'Alpine'",
+                "ignore_errors": True,
+            },
+            {
+                "name": "Install OpenSSL library and development headers (FreeBSD)",
+                "package": {"name": ["openssl"], "state": "present"},
+                "become": True,
+                "when": "ansible_facts['os_family'] == 'FreeBSD'",
+                "ignore_errors": True,
+            },
+        ],
     }
 
     def __init__(self, parent_helper):

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/core/helpers/misc.py

@@ -831,7 +831,9 @@ def rand_string(length=10, digits=True, numeric_only=False):
     return "".join(random.choice(pool) for _ in range(length))
 
 
-def truncate_string(s, n):
+def truncate_string(s: str, n: int) -> str:
+    if not isinstance(s, str):
+        raise ValueError(f"Expected string, got {type(s)}")
     if len(s) > n:
         return s[: n - 3] + "..."
     else:

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/core/helpers/web/engine.py

@@ -208,7 +208,7 @@ class HTTPEngine(EngineServer):
                 raise
             else:
                 log.warning(
-                    f"Invalid URL (possibly due to dangerous redirect) on request to : {url}: {truncate_string(e, 200)}"
+                    f"Invalid URL (possibly due to dangerous redirect) on request to : {url}: {truncate_string(str(e), 200)}"
                 )
                 log.trace(traceback.format_exc())
         except ssl.SSLError as e:

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/modules/apkpure.py

@@ -22,7 +22,7 @@ class apkpure(BaseModule):
         if output_folder:
             self.output_dir = Path(output_folder) / "apk_files"
         else:
-            self.output_dir = self.helpers.temp_dir / "apk_files"
+            self.output_dir = self.scan.temp_dir / "apk_files"
         self.helpers.mkdir(self.output_dir)
         return await super().setup()
 

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/modules/docker_pull.py

@@ -38,7 +38,7 @@ class docker_pull(BaseModule):
         if output_folder:
             self.output_dir = Path(output_folder) / "docker_images"
         else:
-            self.output_dir = self.helpers.temp_dir / "docker_images"
+            self.output_dir = self.scan.temp_dir / "docker_images"
         self.helpers.mkdir(self.output_dir)
         return await super().setup()
 

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/modules/filedownload.py

@@ -103,7 +103,7 @@ class filedownload(BaseModule):
         if output_dir:
             self.download_dir = Path(output_dir) / "filedownload"
         else:
-            self.download_dir = self.helpers.temp_dir / "filedownload"
+            self.download_dir = self.scan.temp_dir / "filedownload"
         self.helpers.mkdir(self.download_dir)
         self.mime_db_file = await self.helpers.wordlist(
             "https://raw.githubusercontent.com/jshttp/mime-db/master/db.json"

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/modules/git_clone.py

@@ -27,7 +27,7 @@ class git_clone(github):
         if output_folder:
             self.output_dir = Path(output_folder) / "git_repos"
         else:
-            self.output_dir = self.helpers.temp_dir / "git_repos"
+            self.output_dir = self.scan.temp_dir / "git_repos"
         self.helpers.mkdir(self.output_dir)
         return await super().setup()
 

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/modules/gitdumper.py

@@ -33,7 +33,7 @@ class gitdumper(BaseModule):
         if output_folder:
             self.output_dir = Path(output_folder) / "git_repos"
         else:
-            self.output_dir = self.helpers.temp_dir / "git_repos"
+            self.output_dir = self.scan.temp_dir / "git_repos"
         self.helpers.mkdir(self.output_dir)
         self.unsafe_regex = self.helpers.re.compile(r"^\s*fsmonitor|sshcommand|askpass|editor|pager", re.IGNORECASE)
         self.ref_regex = self.helpers.re.compile(r"ref: refs/heads/([a-zA-Z\d_-]+)")

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/modules/nuclei.py

@@ -282,7 +282,7 @@ class nuclei(BaseModule):
                     else:
                         self.debug("Nuclei result missing one or more required elements, not reporting. JSON: ({j})")
         finally:
-            stats_file.unlink()
+            stats_file.unlink(missing_ok=True)
 
     def log_nuclei_status(self, line):
         if self.silent:

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/modules/portscan.py

@@ -144,7 +144,7 @@ class portscan(BaseModule):
                                 emitted_hosts.add(host)
         finally:
             for file in (stats_file, target_file):
-                file.unlink()
+                file.unlink(missing_ok=True)
 
     async def make_targets(self, events, scanned_tracker):
         """

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/modules/postman_download.py

@@ -25,7 +25,7 @@ class postman_download(postman):
         if output_folder:
             self.output_dir = Path(output_folder) / "postman_workspaces"
         else:
-            self.output_dir = self.helpers.temp_dir / "postman_workspaces"
+            self.output_dir = self.scan.temp_dir / "postman_workspaces"
         self.helpers.mkdir(self.output_dir)
         return await super().setup()
 

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/modules/trufflehog.py

@@ -198,7 +198,7 @@ class trufflehog(BaseModule):
 
                     yield (decoder_name, detector_name, raw_result, rawv2_result, verified, source_metadata)
         finally:
-            stats_file.unlink()
+            stats_file.unlink(missing_ok=True)
 
     def log_trufflehog_status(self, path, line):
         try:

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/scanner/scanner.py

@@ -175,6 +175,10 @@ class Scanner:
         else:
             self.home = self.preset.bbot_home / "scans" / self.name
 
+        # scan temp dir
+        self.temp_dir = self.home / "temp"
+        self.helpers.mkdir(self.temp_dir)
+
         self._status = "NOT_STARTED"
         self._status_code = 0
 
@@ -884,7 +888,7 @@ class Scanner:
                 await mod._cleanup()
             with contextlib.suppress(Exception):
                 self.home.rmdir()
-            self.helpers.rm_rf(self.helpers.temp_dir, ignore_errors=True)
+            self.helpers.rm_rf(self.temp_dir, ignore_errors=True)
             self.helpers.clean_old_scans()
 
     def in_scope(self, *args, **kwargs):

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/bbot/test/test_step_1/test_helpers.py

@@ -963,11 +963,13 @@ async def test_rm_temp_dir_at_exit(helpers):
     scan = Scanner("127.0.0.1", modules=["httpx"])
     await scan._prep()
 
+    temp_dir = scan.home / "temp"
+
     # temp dir should exist
-    assert scan.helpers.temp_dir.exists()
+    assert temp_dir.exists()
 
     events = [e async for e in scan.async_start()]
     assert events
 
     # temp dir should be removed
-    assert not scan.helpers.temp_dir.exists()
+    assert not temp_dir.exists()

{bbot-2.5.0.6779rc0 → bbot-2.5.0.6790rc0}/pyproject.toml

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