bbot 2.5.0.6769rc0__tar.gz → 2.5.0.6779rc0__tar.gz

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

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

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

{bbot-2.5.0.6769rc0 → bbot-2.5.0.6779rc0}/bbot/core/helpers/command.py

@@ -123,7 +123,7 @@ async def run_live(self, *command, check=False, text=True, idle_timeout=None, **
                     proc.send_signal(SIGINT)
                     raise
                 except ValueError as e:
-                    command_str = " ".join([str(c) for c in command])
+                    command_str = " ".join(command)
                     log.warning(f"Error executing command {command_str}: {e}")
                     log.trace(traceback.format_exc())
                     continue
@@ -185,7 +185,9 @@ async def _spawn_proc(self, *command, **kwargs):
     try:
         command, kwargs = self._prepare_command_kwargs(command, kwargs)
     except SubprocessError as e:
-        log.warning(e)
+        command_str = " ".join([str(s) for s in command])
+        log.warning(f"Error running command: '{command_str}': {e}")
+        log.trace(traceback.format_exc())
         return None, None, None
     _input = kwargs.pop("input", None)
     if _input is not None:
@@ -279,6 +281,7 @@ def _prepare_command_kwargs(self, command, kwargs):
 
     if len(command) == 1 and isinstance(command[0], (list, tuple)):
         command = command[0]
+
     command = [str(s) for s in command]
 
     if not command:

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

@@ -1642,7 +1642,7 @@ def filesize(f):
     return 0
 
 
-def rm_rf(f):
+def rm_rf(f, ignore_errors=False):
     """Recursively delete a directory
 
     Args:
@@ -1653,7 +1653,7 @@ def rm_rf(f):
     """
     import shutil
 
-    shutil.rmtree(f)
+    shutil.rmtree(f, ignore_errors=ignore_errors)
 
 
 def clean_old(d, keep=10, filter=lambda x: True, key=latest_mtime, reverse=True, raise_error=False):

{bbot-2.5.0.6769rc0 → bbot-2.5.0.6779rc0}/bbot/modules/dnscommonsrv.py

@@ -8,6 +8,7 @@ class dnscommonsrv(subdomain_enum):
     flags = ["subdomain-enum", "active", "safe"]
     meta = {"description": "Check for common SRV records", "created_date": "2022-05-15", "author": "@TheTechromancer"}
     dedup_strategy = "lowest_parent"
+    deps_common = ["massdns"]
 
     options = {"max_depth": 2}
     options_desc = {"max_depth": "The maximum subdomain depth to brute-force SRV records"}

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

@@ -884,6 +884,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.clean_old_scans()
 
     def in_scope(self, *args, **kwargs):

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

@@ -954,3 +954,20 @@ async def test_parameter_validation(helpers):
             assert p in cookie_valid_params and p not in cookie_invalid_params
         else:
             assert p in cookie_invalid_params and p not in cookie_valid_params
+
+
+@pytest.mark.asyncio
+async def test_rm_temp_dir_at_exit(helpers):
+    from bbot.scanner import Scanner
+
+    scan = Scanner("127.0.0.1", modules=["httpx"])
+    await scan._prep()
+
+    # temp dir should exist
+    assert scan.helpers.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()

{bbot-2.5.0.6769rc0 → bbot-2.5.0.6779rc0}/bbot/test/test_step_2/module_tests/test_module_excavate.py

@@ -1221,7 +1221,13 @@ class TestExcavateHeaders(ModuleTestBase):
 class TestExcavateRAWTEXT(ModuleTestBase):
     targets = ["http://127.0.0.1:8888/", "test.notreal"]
     modules_overrides = ["excavate", "httpx", "filedownload", "extractous"]
-    config_overrides = {"scope": {"report_distance": 1}, "web": {"spider_distance": 2, "spider_depth": 2}}
+    config_overrides = {
+        "scope": {"report_distance": 1},
+        "web": {"spider_distance": 2, "spider_depth": 2},
+        "modules": {
+            "filedownload": {"output_folder": str(bbot_test_dir / "filedownload")},
+        },
+    }
 
     pdf_data = r"""%PDF-1.3
 %���� ReportLab Generated PDF document http://www.reportlab.com

{bbot-2.5.0.6769rc0 → bbot-2.5.0.6779rc0}/bbot/test/test_step_2/module_tests/test_module_extractous.py

@@ -2,11 +2,23 @@ import base64
 from pathlib import Path
 from .base import ModuleTestBase
 
+from ...bbot_fixtures import *
+
 
 class TestExtractous(ModuleTestBase):
     targets = ["http://127.0.0.1:8888"]
     modules_overrides = ["extractous", "filedownload", "httpx", "excavate", "speculate"]
-    config_overrides = {"web": {"spider_distance": 2, "spider_depth": 2}}
+    config_overrides = {
+        "web": {
+            "spider_distance": 2,
+            "spider_depth": 2,
+        },
+        "modules": {
+            "filedownload": {
+                "output_folder": bbot_test_dir / "filedownload",
+            },
+        },
+    }
 
     pdf_data = base64.b64decode(
         "JVBERi0xLjMKJe+/ve+/ve+/ve+/vSBSZXBvcnRMYWIgR2VuZXJhdGVkIFBERiBkb2N1bWVudCBodHRwOi8vd3d3LnJlcG9ydGxhYi5jb20KMSAwIG9iago8PAovRjEgMiAwIFIKPj4KZW5kb2JqCjIgMCBvYmoKPDwKL0Jhc2VGb250IC9IZWx2ZXRpY2EgL0VuY29kaW5nIC9XaW5BbnNpRW5jb2RpbmcgL05hbWUgL0YxIC9TdWJ0eXBlIC9UeXBlMSAvVHlwZSAvRm9udAo+PgplbmRvYmoKMyAwIG9iago8PAovQ29udGVudHMgNyAwIFIgL01lZGlhQm94IFsgMCAwIDU5NS4yNzU2IDg0MS44ODk4IF0gL1BhcmVudCA2IDAgUiAvUmVzb3VyY2VzIDw8Ci9Gb250IDEgMCBSIC9Qcm9jU2V0IFsgL1BERiAvVGV4dCAvSW1hZ2VCIC9JbWFnZUMgL0ltYWdlSSBdCj4+IC9Sb3RhdGUgMCAvVHJhbnMgPDwKCj4+IAogIC9UeXBlIC9QYWdlCj4+CmVuZG9iago0IDAgb2JqCjw8Ci9QYWdlTW9kZSAvVXNlTm9uZSAvUGFnZXMgNiAwIFIgL1R5cGUgL0NhdGFsb2cKPj4KZW5kb2JqCjUgMCBvYmoKPDwKL0F1dGhvciAoYW5vbnltb3VzKSAvQ3JlYXRpb25EYXRlIChEOjIwMjQwNjAzMTg1ODE2KzAwJzAwJykgL0NyZWF0b3IgKFJlcG9ydExhYiBQREYgTGlicmFyeSAtIHd3dy5yZXBvcnRsYWIuY29tKSAvS2V5d29yZHMgKCkgL01vZERhdGUgKEQ6MjAyNDA2MDMxODU4MTYrMDAnMDAnKSAvUHJvZHVjZXIgKFJlcG9ydExhYiBQREYgTGlicmFyeSAtIHd3dy5yZXBvcnRsYWIuY29tKSAKICAvU3ViamVjdCAodW5zcGVjaWZpZWQpIC9UaXRsZSAodW50aXRsZWQpIC9UcmFwcGVkIC9GYWxzZQo+PgplbmRvYmoKNiAwIG9iago8PAovQ291bnQgMSAvS2lkcyBbIDMgMCBSIF0gL1R5cGUgL1BhZ2VzCj4+CmVuZG9iago3IDAgb2JqCjw8Ci9GaWx0ZXIgWyAvQVNDSUk4NURlY29kZSAvRmxhdGVEZWNvZGUgXSAvTGVuZ3RoIDEwNwo+PgpzdHJlYW0KR2FwUWgwRT1GLDBVXEgzVFxwTllUXlFLaz90Yz5JUCw7VyNVMV4yM2loUEVNXz9DVzRLSVNpOTBNakdeMixGUyM8UkM1K2MsbilaOyRiSyRiIjVJWzwhXlREI2dpXSY9NVgsWzVAWUBWfj5lbmRzdHJlYW0KZW5kb2JqCnhyZWYKMCA4CjAwMDAwMDAwMDAgNjU1MzUgZiAKMDAwMDAwMDA3MyAwMDAwMCBuIAowMDAwMDAwMTA0IDAwMDAwIG4gCjAwMDAwMDAyMTEgMDAwMDAgbiAKMDAwMDAwMDQxNCAwMDAwMCBuIAowMDAwMDAwNDgyIDAwMDAwIG4gCjAwMDAwMDA3NzggMDAwMDAgbiAKMDAwMDAwMDgzNyAwMDAwMCBuIAp0cmFpbGVyCjw8Ci9JRCAKWzw4MGQ5ZjViOTY0ZmM5OTI4NDUwMWRlYjdhNmE2MzdmNz48ODBkOWY1Yjk2NGZjOTkyODQ1MDFkZWI3YTZhNjM3Zjc+XQolIFJlcG9ydExhYiBnZW5lcmF0ZWQgUERGIGRvY3VtZW50IC0tIGRpZ2VzdCAoaHR0cDovL3d3dy5yZXBvcnRsYWIuY29tKQoKL0luZm8gNSAwIFIKL1Jvb3QgNCAwIFIKL1NpemUgOAo+PgpzdGFydHhyZWYKMTAzNAolJUVPRg=="

{bbot-2.5.0.6769rc0 → bbot-2.5.0.6779rc0}/bbot/test/test_step_2/module_tests/test_module_jadx.py

@@ -2,9 +2,18 @@ from pathlib import Path
 from bbot.core.helpers.libmagic import get_magic_info
 from bbot.test.test_step_2.module_tests.base import ModuleTestBase, tempapkfile
 
+from ...bbot_fixtures import *
+
 
 class TestJadx(ModuleTestBase):
     modules_overrides = ["apkpure", "google_playstore", "speculate", "jadx"]
+    config_overrides = {
+        "modules": {
+            "apkpure": {
+                "output_folder": bbot_test_dir / "apkpure",
+            },
+        }
+    }
     apk_file = tempapkfile()
 
     async def setup_after_prep(self, module_test):

{bbot-2.5.0.6769rc0 → bbot-2.5.0.6779rc0}/bbot/test/test_step_2/module_tests/test_module_unarchive.py

@@ -3,10 +3,19 @@ import asyncio
 from pathlib import Path
 from .base import ModuleTestBase
 
+from ...bbot_fixtures import *
+
 
 class TestUnarchive(ModuleTestBase):
     targets = ["http://127.0.0.1:8888"]
     modules_overrides = ["filedownload", "httpx", "excavate", "speculate", "unarchive"]
+    config_overrides = {
+        "modules": {
+            "filedownload": {
+                "output_folder": bbot_test_dir / "filedownload",
+            },
+        }
+    }
 
     async def setup_after_prep(self, module_test):
         temp_path = Path("/tmp/.bbot_test")

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

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