bbot 2.1.1__py3-none-any.whl → 2.1.1.5103rc0__py3-none-any.whl

bbot/__init__.py

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

bbot/core/config/logger.py

@@ -1,11 +1,9 @@
 import sys
-import atexit
 import logging
 from copy import copy
 import multiprocessing
 import logging.handlers
 from pathlib import Path
-from contextlib import suppress
 
 from ..helpers.misc import mkdir, error_and_exit
 from ...logger import colorize, loglevel_mapping
@@ -72,36 +70,9 @@ class BBOTLogger:
             # Start the QueueListener
             self.listener = logging.handlers.QueueListener(self.queue, *self.log_handlers.values())
             self.listener.start()
-            atexit.register(self.cleanup_logging)
 
         self.log_level = logging.INFO
 
-    def cleanup_logging(self):
-        # Close the queue handler
-        with suppress(Exception):
-            self.queue_handler.close()
-
-        # Clean root logger
-        root_logger = logging.getLogger()
-        for handler in list(root_logger.handlers):
-            with suppress(Exception):
-                root_logger.removeHandler(handler)
-            with suppress(Exception):
-                handler.close()
-
-        # Clean all other loggers
-        for logger in logging.Logger.manager.loggerDict.values():
-            if hasattr(logger, "handlers"):  # Logger, not PlaceHolder
-                for handler in list(logger.handlers):
-                    with suppress(Exception):
-                        logger.removeHandler(handler)
-                    with suppress(Exception):
-                        handler.close()
-
-        # Stop queue listener
-        with suppress(Exception):
-            self.listener.stop()
-
     def setup_queue_handler(self, logging_queue=None, log_level=logging.DEBUG):
         if logging_queue is None:
             logging_queue = self.queue

bbot/modules/gowitness.py

@@ -1,5 +1,5 @@
 import asyncio
-import aiosqlite
+import sqlite3
 import multiprocessing
 from pathlib import Path
 from contextlib import suppress
@@ -34,7 +34,6 @@ class gowitness(BaseModule):
         "idle_timeout": "Skip the current gowitness batch if it stalls for longer than this many seconds",
     }
     deps_common = ["chromium"]
-    deps_pip = ["aiosqlite"]
     deps_ansible = [
         {
             "name": "Download gowitness",
@@ -137,8 +136,7 @@ class gowitness(BaseModule):
             return
 
         # emit web screenshots
-        new_screenshots = await self.get_new_screenshots()
-        for filename, screenshot in new_screenshots.items():
+        for filename, screenshot in self.new_screenshots.items():
             url = screenshot["url"]
             final_url = screenshot["final_url"]
             filename = self.screenshot_path / screenshot["filename"]
@@ -152,8 +150,7 @@ class gowitness(BaseModule):
             )
 
         # emit URLs
-        new_network_logs = await self.get_new_network_logs()
-        for url, row in new_network_logs.items():
+        for url, row in self.new_network_logs.items():
             ip = row["ip"]
             status_code = row["status_code"]
             tags = [f"status-{status_code}", f"ip-{ip}", "spider-danger"]
@@ -171,8 +168,7 @@ class gowitness(BaseModule):
                 )
 
         # emit technologies
-        new_technologies = await self.get_new_technologies()
-        for _, row in new_technologies.items():
+        for _, row in self.new_technologies.items():
             parent_id = row["url_id"]
             parent_url = self.screenshots_taken[parent_id]
             parent_event = event_dict[parent_url]
@@ -211,53 +207,59 @@ class gowitness(BaseModule):
         command += ["--timeout", str(self.timeout)]
         return command
 
-    async def get_new_screenshots(self):
+    @property
+    def new_screenshots(self):
         screenshots = {}
         if self.db_path.is_file():
-            async with aiosqlite.connect(str(self.db_path)) as con:
-                con.row_factory = aiosqlite.Row
+            with sqlite3.connect(str(self.db_path)) as con:
+                con.row_factory = sqlite3.Row
                 con.text_factory = self.helpers.smart_decode
-                async with con.execute("SELECT * FROM urls") as cur:
-                    async for row in cur:
-                        row = dict(row)
-                        _id = row["id"]
-                        if _id not in self.screenshots_taken:
-                            self.screenshots_taken[_id] = row["url"]
-                            screenshots[_id] = row
+                cur = con.cursor()
+                res = self.cur_execute(cur, "SELECT * FROM urls")
+                for row in res:
+                    row = dict(row)
+                    _id = row["id"]
+                    if _id not in self.screenshots_taken:
+                        self.screenshots_taken[_id] = row["url"]
+                        screenshots[_id] = row
         return screenshots
 
-    async def get_new_network_logs(self):
+    @property
+    def new_network_logs(self):
         network_logs = dict()
         if self.db_path.is_file():
-            async with aiosqlite.connect(str(self.db_path)) as con:
-                con.row_factory = aiosqlite.Row
-                async with con.execute("SELECT * FROM network_logs") as cur:
-                    async for row in cur:
-                        row = dict(row)
-                        url = row["final_url"]
-                        if url not in self.connections_logged:
-                            self.connections_logged.add(url)
-                            network_logs[url] = row
+            with sqlite3.connect(str(self.db_path)) as con:
+                con.row_factory = sqlite3.Row
+                cur = con.cursor()
+                res = self.cur_execute(cur, "SELECT * FROM network_logs")
+                for row in res:
+                    row = dict(row)
+                    url = row["final_url"]
+                    if url not in self.connections_logged:
+                        self.connections_logged.add(url)
+                        network_logs[url] = row
         return network_logs
 
-    async def get_new_technologies(self):
+    @property
+    def new_technologies(self):
         technologies = dict()
         if self.db_path.is_file():
-            async with aiosqlite.connect(str(self.db_path)) as con:
-                con.row_factory = aiosqlite.Row
-                async with con.execute("SELECT * FROM technologies") as cur:
-                    async for row in cur:
-                        _id = row["id"]
-                        if _id not in self.technologies_found:
-                            self.technologies_found.add(_id)
-                            row = dict(row)
-                            technologies[_id] = row
+            with sqlite3.connect(str(self.db_path)) as con:
+                con.row_factory = sqlite3.Row
+                cur = con.cursor()
+                res = self.cur_execute(cur, "SELECT * FROM technologies")
+                for row in res:
+                    _id = row["id"]
+                    if _id not in self.technologies_found:
+                        self.technologies_found.add(_id)
+                        row = dict(row)
+                        technologies[_id] = row
         return technologies
 
-    async def cur_execute(self, cur, query):
+    def cur_execute(self, cur, query):
         try:
-            return await cur.execute(query)
-        except aiosqlite.OperationalError as e:
+            return cur.execute(query)
+        except sqlite3.OperationalError as e:
             self.warning(f"Error executing query: {query}: {e}")
             return []
 

bbot/modules/trufflehog.py

@@ -13,7 +13,7 @@ class trufflehog(BaseModule):
     }
 
     options = {
-        "version": "3.83.1",
+        "version": "3.82.11",
         "config": "",
         "only_verified": True,
         "concurrency": 8,

bbot/test/conftest.py

@@ -47,13 +47,6 @@ def assert_all_responses_were_requested() -> bool:
     return False
 
 
-@pytest.fixture(autouse=True)
-def silence_live_logging():
-    for handler in logging.getLogger().handlers:
-        if type(handler).__name__ == "_LiveLoggingStreamHandler":
-            handler.setLevel(logging.CRITICAL)
-
-
 @pytest.fixture
 def bbot_httpserver():
     server = HTTPServer(host="127.0.0.1", port=8888, threaded=True)

{bbot-2.1.1.dist-info → bbot-2.1.1.5103rc0.dist-info}/METADATA

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

{bbot-2.1.1.dist-info → bbot-2.1.1.5103rc0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-bbot/__init__.py,sha256=JBzSHYgx82_Tcg4e3kFjN1igI0ZnazzrEIl85QZ_J-c,123
+bbot/__init__.py,sha256=doq0jTZtPEY8jcNxyhisTyvCn8x9bxFjT2kkgtCA1ck,130
 bbot/cli.py,sha256=7S3a4eB-Dl8yodc5WC-927Z30CNlLl9EXimGvIVypJo,10434
 bbot/core/__init__.py,sha256=l255GJE_DvUnWvrRb0J5lG-iMztJ8zVvoweDOfegGtI,46
 bbot/core/config/__init__.py,sha256=zYNw2Me6tsEr8hOOkLb4BQ97GB7Kis2k--G81S8vofU,342
 bbot/core/config/files.py,sha256=pNrcw61UKKZeMt0rp9Ac5mUK7LdIRmcpojMxI-LwjeA,1413
-bbot/core/config/logger.py,sha256=zkD08_KNiIa8LTZkI4wiAeA4g0zVCiA7d7P5MmocXsk,10467
+bbot/core/config/logger.py,sha256=PEiEzZ6CbxtAzWe5MRWKAg2O3YtgM3Y5z7Oum8YPvlA,9441
 bbot/core/core.py,sha256=twd7-fiaaxzgcWTPwT1zbSWfAa_gHHfl7gAFvLYvFYg,6358
 bbot/core/engine.py,sha256=wGopKa2GNs61r16Pr_xtp6Si9AT6I-lE83iWhEgtxwA,29290
 bbot/core/event/__init__.py,sha256=8ut88ZUg0kbtWkOx2j3XzNr_3kTfgoM-3UdiWHFA_ag,56
@@ -105,7 +105,7 @@ bbot/modules/github_org.py,sha256=O1VBn65sYJaPWBDjssyQSnlEh6XQgLEF7gKDzWj64qc,91
 bbot/modules/github_workflows.py,sha256=GvEVEa2vp5FnpKIthyMIkMmV84Sgh9whxpCcdFY1PB0,9555
 bbot/modules/gitlab.py,sha256=9oWWpBijeHCjuFBfWW4HvNqt7bvJvrBgBjaaz_UPPnE,5964
 bbot/modules/google_playstore.py,sha256=N4QjzQag_bgDXfX17rytBiiWA-SQtYI2N0J_ZNEOdv0,3701
-bbot/modules/gowitness.py,sha256=DG23F2O4zVhY4lMSEk6uRRbQ-Jczpa6Yz_vXBICY9tA,11294
+bbot/modules/gowitness.py,sha256=VYifohEuiIWTejzxM6kxpB8vcWTaiYgwdEeoiLWjZ9g,11071
 bbot/modules/hackertarget.py,sha256=brp0khcRaSyzwjs6z89WbgULZEE8RmjLM_SxBrj3fDo,969
 bbot/modules/host_header.py,sha256=JQGqdsuvaCwFaA5_9790T1P2DKJoDUQSPjyHgh6u2tU,7694
 bbot/modules/httpx.py,sha256=wmgyRyCNg9vw_qO0pVo7I7QzGybDgt9pEdfU3QPgBMA,7588
@@ -179,7 +179,7 @@ bbot/modules/templates/shodan.py,sha256=BfI0mNPbqkykGmjMtARhmCGKmk1uq7yTlZoPgzzJ
 bbot/modules/templates/subdomain_enum.py,sha256=lT5MZF66OuzsyFFrj20wKlsZflzL9MOkPjDIbN3o65o,8375
 bbot/modules/templates/webhook.py,sha256=MYhKWrNYrsfM0a4PR6yVotudLyyCwgmy2eI-l9LvpBs,3706
 bbot/modules/trickest.py,sha256=HfAzjnawxXd9ypi3gumDHqImE5-C7uwNugo8d_b9HT0,1544
-bbot/modules/trufflehog.py,sha256=aVA1g3WvS1QifXqGMmdtjEeRA83z9C-y7s5PGnAS9Vs,8554
+bbot/modules/trufflehog.py,sha256=KMFYbjKEyoNaJDoID0SoDvbCRPaDwalMD6H2lQaI1QE,8555
 bbot/modules/unstructured.py,sha256=si3_Y__A36QOBdkIUocVXCHrmUqM0E-JSnoOeRpELYE,5311
 bbot/modules/url_manipulation.py,sha256=BI-OhlzNzP5xvwzHphL4qdehc4NiEYnL2BNK-JoEm90,4322
 bbot/modules/urlscan.py,sha256=ajhiX2sj-zZDlKU1q5rE8JTzxioj1mDLqZ9PRSQCpAw,3741
@@ -220,7 +220,7 @@ bbot/scanner/target.py,sha256=X25gpgRv5HmqQjGADiSe6b8744yOkRhAGAvKKYbXnSI,19886
 bbot/scripts/docs.py,sha256=kg2CzovmUVGJx9hBZjAjUdE1hXeIwC7Ry3CyrnE8GL8,10782
 bbot/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bbot/test/bbot_fixtures.py,sha256=J1_MfpCMXftfGHZc-dgn42ODpTmSJidoBibOltfthac,9862
-bbot/test/conftest.py,sha256=js4NAX3iiIc2CCTpWKEclkcSH4egmjMNnqBiHzK_7BA,11242
+bbot/test/conftest.py,sha256=bCLJNVqCJzdZUf1hJ8oPTi5Pu6uwWBo9KCyGlf04h8M,11020
 bbot/test/coverage.cfg,sha256=ko9RacAYsJxWJCL8aEuNtkAOtP9lexYiDbeFWe8Tp8Y,31
 bbot/test/owasp_mastg.apk,sha256=Hai_V9JmEJ-aB8Ab9xEaGXXOAfGQudkUvNOuPb75byE,66651
 bbot/test/run_tests.sh,sha256=0oprBl970NAqXS4YQa8nRUtKljPeS_WNSvd-QmO5FNY,945
@@ -395,8 +395,8 @@ bbot/wordlists/raft-small-extensions-lowercase_CLEANED.txt,sha256=ruUQwVfia1_m2u
 bbot/wordlists/top_open_ports_nmap.txt,sha256=LmdFYkfapSxn1pVuQC2LkOIY2hMLgG-Xts7DVtYzweM,42727
 bbot/wordlists/valid_url_schemes.txt,sha256=VciB-ww0y-O8Ii1wpTR6rJzGDiC2r-dhVsIJApS1ZYU,3309
 bbot/wordlists/wordninja_dns.txt.gz,sha256=DYHvvfW0TvzrVwyprqODAk4tGOxv5ezNmCPSdPuDUnQ,570241
-bbot-2.1.1.dist-info/LICENSE,sha256=GzeCzK17hhQQDNow0_r0L8OfLpeTKQjFQwBQU7ZUymg,32473
-bbot-2.1.1.dist-info/METADATA,sha256=GDNMYGz1sXOdrYJu5GcLgZR8-oPWHy6UYIK-24lcSrc,16922
-bbot-2.1.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-bbot-2.1.1.dist-info/entry_points.txt,sha256=cWjvcU_lLrzzJgjcjF7yeGuRA_eDS8pQ-kmPUAyOBfo,38
-bbot-2.1.1.dist-info/RECORD,,
+bbot-2.1.1.5103rc0.dist-info/LICENSE,sha256=GzeCzK17hhQQDNow0_r0L8OfLpeTKQjFQwBQU7ZUymg,32473
+bbot-2.1.1.5103rc0.dist-info/METADATA,sha256=PZhrVW9xHNifnEPEAkdnyhGfKpBjeHsPe2ueZkEbacQ,16930
+bbot-2.1.1.5103rc0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+bbot-2.1.1.5103rc0.dist-info/entry_points.txt,sha256=cWjvcU_lLrzzJgjcjF7yeGuRA_eDS8pQ-kmPUAyOBfo,38
+bbot-2.1.1.5103rc0.dist-info/RECORD,,