bbot 2.3.2.5958rc0__tar.gz → 2.3.2.5971rc0__tar.gz

{bbot-2.3.2.5958rc0 → bbot-2.3.2.5971rc0}/PKG-INFO

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

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

{bbot-2.3.2.5958rc0 → bbot-2.3.2.5971rc0}/bbot/core/helpers/validators.py

@@ -176,6 +176,7 @@ def clean_url(url: str, url_querystring_remove=True):
         scheme = parsed.scheme
     except ValueError:
         scheme = "https"
+    port = None
     with suppress(Exception):
         port = parsed.port
     if port is None:

bbot-2.3.2.5958rc0/bbot/modules/internetdb.py → bbot-2.3.2.5971rc0/bbot/modules/shodan_idb.py

@@ -1,9 +1,12 @@
 from bbot.modules.base import BaseModule
 
 
-class internetdb(BaseModule):
+class shodan_idb(BaseModule):
     """
     Query IP in Shodan InternetDB, returning open ports, discovered technologies, and findings/vulnerabilities
+
+    InternetDB is especially nice because it doesn't require an API key
+
     API reference: https://internetdb.shodan.io/docs
 
     Example API response:
@@ -43,22 +46,15 @@ class internetdb(BaseModule):
         "created_date": "2023-12-22",
         "author": "@TheTechromancer",
     }
-    options = {"show_open_ports": False}
-    options_desc = {
-        "show_open_ports": "Display OPEN_TCP_PORT events in output, even if they didn't lead to an interesting discovery"
-    }
 
     # we get lots of 404s, that's normal
     _api_failure_abort_threshold = 9999999999
 
+    # there aren't any rate limits to speak of, so our outgoing queue can be pretty big
     _qsize = 500
 
     base_url = "https://internetdb.shodan.io"
 
-    async def setup(self):
-        self.show_open_ports = self.config.get("show_open_ports", False)
-        return True
-
     def _incoming_dedup_hash(self, event):
         return hash(self.get_ip(event))
 
@@ -115,7 +111,6 @@ class internetdb(BaseModule):
                 self.helpers.make_netloc(event.data, port),
                 "OPEN_TCP_PORT",
                 parent=event,
-                internal=(not self.show_open_ports),
                 context=f'{{module}} queried Shodan\'s InternetDB API for "{query_host}" and found {{event.type}}: {{event.data}}',
             )
         vulns = data.get("vulns", [])

{bbot-2.3.2.5958rc0 → bbot-2.3.2.5971rc0}/bbot/modules/trufflehog.py

@@ -14,7 +14,7 @@ class trufflehog(BaseModule):
     }
 
     options = {
-        "version": "3.88.12",
+        "version": "3.88.13",
         "config": "",
         "only_verified": True,
         "concurrency": 8,

bbot-2.3.2.5958rc0/bbot/test/test_step_2/module_tests/test_module_internetdb.py → bbot-2.3.2.5971rc0/bbot/test/test_step_2/module_tests/test_module_shodan_idb.py

@@ -1,7 +1,7 @@
 from .base import ModuleTestBase
 
 
-class TestInternetDB(ModuleTestBase):
+class TestShodan_IDB(ModuleTestBase):
     config_overrides = {"dns": {"minimal": False}}
 
     async def setup_before_prep(self, module_test):
@@ -36,15 +36,21 @@ class TestInternetDB(ModuleTestBase):
         )
 
     def check(self, module_test, events):
-        assert 5 == len([e for e in events if str(e.module) == "internetdb"])
+        assert 8 == len([e for e in events if str(e.module) == "shodan_idb"])
         assert 1 == len(
             [e for e in events if e.type == "DNS_NAME" and e.data == "autodiscover.blacklanternsecurity.com"]
         )
         assert 1 == len([e for e in events if e.type == "DNS_NAME" and e.data == "mail.blacklanternsecurity.com"])
-        assert 0 == len([e for e in events if e.type == "OPEN_TCP_PORT"])
-        assert 1 == len([e for e in events if e.type == "FINDING" and str(e.module) == "internetdb"])
+        assert 3 == len(
+            [
+                e
+                for e in events
+                if e.type == "OPEN_TCP_PORT" and e.host == "blacklanternsecurity.com" and str(e.module) == "shodan_idb"
+            ]
+        )
+        assert 1 == len([e for e in events if e.type == "FINDING" and str(e.module) == "shodan_idb"])
         assert 1 == len([e for e in events if e.type == "FINDING" and "CVE-2021-26857" in e.data["description"]])
-        assert 2 == len([e for e in events if e.type == "TECHNOLOGY" and str(e.module) == "internetdb"])
+        assert 2 == len([e for e in events if e.type == "TECHNOLOGY" and str(e.module) == "shodan_idb"])
         assert 1 == len(
             [
                 e

{bbot-2.3.2.5958rc0 → bbot-2.3.2.5971rc0}/bbot/test/test_step_2/module_tests/test_module_speculate.py

@@ -24,7 +24,7 @@ class TestSpeculate_Subdirectories(ModuleTestBase):
 
 class TestSpeculate_OpenPorts(ModuleTestBase):
     targets = ["evilcorp.com"]
-    modules_overrides = ["speculate", "certspotter", "internetdb"]
+    modules_overrides = ["speculate", "certspotter", "shodan_idb"]
     config_overrides = {"speculate": True}
 
     async def setup_before_prep(self, module_test):

{bbot-2.3.2.5958rc0 → bbot-2.3.2.5971rc0}/pyproject.toml

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