bbot 2.1.1__tar.gz → 2.1.1.5119rc0__tar.gz

{bbot-2.1.1 → bbot-2.1.1.5119rc0}/PKG-INFO

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

{bbot-2.1.1 → bbot-2.1.1.5119rc0}/bbot/__init__.py

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

{bbot-2.1.1 → bbot-2.1.1.5119rc0}/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-2.1.1 → bbot-2.1.1.5119rc0}/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-2.1.1 → bbot-2.1.1.5119rc0}/pyproject.toml

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