bbot 2.5.0.6773rc0__tar.gz → 2.5.0.6782rc0__tar.gz

{bbot-2.5.0.6773rc0 → bbot-2.5.0.6782rc0}/PKG-INFO

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

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

{bbot-2.5.0.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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,6 +888,7 @@ class Scanner:
                 await mod._cleanup()
             with contextlib.suppress(Exception):
                 self.home.rmdir()
+            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.6773rc0 → bbot-2.5.0.6782rc0}/bbot/test/test_step_1/test_helpers.py

@@ -954,3 +954,22 @@ 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 = scan.home / "temp"
+
+    # temp dir should exist
+    assert temp_dir.exists()
+
+    events = [e async for e in scan.async_start()]
+    assert events
+
+    # temp dir should be removed
+    assert not temp_dir.exists()

{bbot-2.5.0.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/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.6773rc0 → bbot-2.5.0.6782rc0}/pyproject.toml

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