bbot 2.4.2.6611rc0__tar.gz → 2.4.2.6615rc0__tar.gz

{bbot-2.4.2.6611rc0 → bbot-2.4.2.6615rc0}/PKG-INFO

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

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

{bbot-2.4.2.6611rc0 → bbot-2.4.2.6615rc0}/bbot/modules/dehashed.py

@@ -13,23 +13,23 @@ class dehashed(subdomain_enum):
         "author": "@SpamFaux",
         "auth_required": True,
     }
-    options = {"username": "", "api_key": ""}
-    options_desc = {"username": "Email Address associated with your API key", "api_key": "DeHashed API Key"}
+    options = {"api_key": ""}
+    options_desc = {"api_key": "DeHashed API Key"}
     target_only = True
 
-    base_url = "https://api.dehashed.com/search"
+    base_url = "https://api.dehashed.com/v2/search"
 
     async def setup(self):
-        self.username = self.config.get("username", "")
         self.api_key = self.config.get("api_key", "")
-        self.auth = (self.username, self.api_key)
         self.headers = {
             "Accept": "application/json",
+            "Content-Type": "application/json",
+            "Dehashed-Api-Key": self.api_key,
         }
 
         # soft-fail if we don't have the necessary information to make queries
-        if not (self.username and self.api_key):
-            return None, "No username / API key set"
+        if not self.api_key:
+            return None, "No API key set"
 
         return await super().setup()
 
@@ -38,29 +38,31 @@ class dehashed(subdomain_enum):
         async for entries in self.query(query):
             for entry in entries:
                 # we have to clean up the email field because dehashed does a poor job of it
-                email_str = entry.get("email", "").replace("\\", "")
-                found_emails = list(await self.helpers.re.extract_emails(email_str))
-                if not found_emails:
-                    self.debug(f"Invalid email from dehashed.com: {email_str}")
-                    continue
-                email = found_emails[0]
+                emails = []
+                for email in entry.get("email", []):
+                    email_str = email.replace("\\", "")
+                    found_emails = list(await self.helpers.re.extract_emails(email_str))
+                    if not found_emails:
+                        self.debug(f"Invalid email from dehashed.com: {email_str}")
+                        continue
+                    emails += found_emails
 
-                user = entry.get("username", "")
-                pw = entry.get("password", "")
-                h_pw = entry.get("hashed_password", "")
+                users = entry.get("username", [])
+                pws = entry.get("password", [])
+                h_pws = entry.get("hashed_password", [])
                 db_name = entry.get("database_name", "")
 
                 tags = []
                 if db_name:
                     tags = [f"db-{db_name}"]
-                if email:
+                for email in emails:
                     email_event = self.make_event(email, "EMAIL_ADDRESS", parent=event, tags=tags)
                     if email_event is not None:
                         await self.emit_event(
                             email_event,
                             context=f'{{module}} searched API for "{query}" and found {{event.type}}: {{event.data}}',
                         )
-                        if user:
+                        for user in users:
                             await self.emit_event(
                                 f"{email}:{user}",
                                 "USERNAME",
@@ -68,7 +70,7 @@ class dehashed(subdomain_enum):
                                 tags=tags,
                                 context=f"{{module}} found {email} with {{event.type}}: {{event.data}}",
                             )
-                        if pw:
+                        for pw in pws:
                             await self.emit_event(
                                 f"{email}:{pw}",
                                 "PASSWORD",
@@ -76,7 +78,7 @@ class dehashed(subdomain_enum):
                                 tags=tags,
                                 context=f"{{module}} found {email} with {{event.type}}: {{event.data}}",
                             )
-                        if h_pw:
+                        for h_pw in h_pws:
                             await self.emit_event(
                                 f"{email}:{h_pw}",
                                 "HASHED_PASSWORD",
@@ -86,30 +88,33 @@ class dehashed(subdomain_enum):
                             )
 
     async def query(self, domain):
-        query = f"domain:{domain}"
-        url = f"{self.base_url}?query={query}&size=10000&page=" + "{page}"
-        page = 0
-        num_entries = 0
-        agen = self.api_page_iter(url=url, auth=self.auth, headers=self.headers, _json=False)
+        url = self.base_url
+        json = {
+            "query": "",
+            "page": 1,
+            "size": 10000,  # The maximum permitted size and pagination.
+        }
+        json["query"] = f"domain:{domain}"
+        json["page"] = 1
+        max_pages = 1
+        agen = self.api_page_iter(url=url, headers=self.headers, _json=False, method="POST", json=json)
         async for result in agen:
             result_json = {}
             with suppress(Exception):
                 result_json = result.json()
             total = result_json.get("total", 0)
             entries = result_json.get("entries", [])
-            if entries is None:
-                entries = []
-            num_entries += len(entries)
-            page += 1
-            if (page >= 3) or (not entries):
-                if result is not None and result.status_code != 200:
-                    self.warning(
-                        f"Error retrieving results from dehashed.com (status code {result.status_code}): {result.text}"
-                    )
-                elif (page >= 3) and (total > num_entries):
-                    self.info(
-                        f"{domain} has {total:,} results in Dehashed. The API can only process the first 30,000 results. Please check dehashed.com to get the remaining results."
-                    )
+            json["page"] += 1
+            if result is not None and result.status_code != 200:
+                self.warning(
+                    f"Error retrieving results from dehashed.com (status code {result.status_code}): {result.text}"
+                )
+            elif (json["page"] > max_pages) and (total > (json["size"] * max_pages)):
+                self.info(
+                    f"{domain} has {total:,} results in Dehashed. The API can only process the first 10,000 results. Please check dehashed.com to get the remaining results."
+                )
+            if entries:
+                yield entries
+            if not entries or json["page"] > max_pages:
                 await agen.aclose()
                 break
-            yield entries

bbot-2.4.2.6615rc0/bbot/test/test_step_2/module_tests/test_module_dehashed.py

@@ -0,0 +1,159 @@
+from .base import ModuleTestBase
+
+
+class TestDehashed(ModuleTestBase):
+    modules_overrides = ["dehashed", "speculate"]
+    config_overrides = {
+        "scope": {"report_distance": 2},
+        "modules": {"dehashed": {"api_key": "deadbeef"}},
+    }
+
+    async def setup_before_prep(self, module_test):
+        module_test.httpx_mock.add_response(
+            url="https://api.dehashed.com/v2/search",
+            method="POST",
+            json={
+                "balance": 10000,
+                "entries": [
+                    {
+                        "id": "4363462346",
+                        "email": ["bob@blacklanternsecurity.com"],
+                        "ip_address": ["127.0.0.9"],
+                        "username": ["bob@bob.com"],
+                        "hashed_password": ["$2a$12$pVmwJ7pXEr3mE.DmCCE4fOUDdeadbeefd2KuCy/tq1ZUFyEOH2bve"],
+                        "name": ["Bob Smith"],
+                        "phone": ["+91283423839"],
+                        "database_name": "eatstreet",
+                        "raw_record": {"le_only": True, "unstructured": True},
+                    },
+                    {
+                        "id": "234623453454",
+                        "email": ["tim@blacklanternsecurity.com"],
+                        "username": ["timmy"],
+                        "password": ["TimTamSlam69"],
+                        "name": "Tim Tam",
+                        "phone": ["+123455667"],
+                        "database_name": "eatstreet",
+                    },
+                ],
+                "took": "61ms",
+                "total": 2,
+            },
+        )
+        await module_test.mock_dns(
+            {
+                "bob.com": {"A": ["127.0.0.1"]},
+                "blacklanternsecurity.com": {"A": ["127.0.0.1"]},
+            }
+        )
+
+    def check(self, module_test, events):
+        assert len(events) == 12
+        assert 1 == len([e for e in events if e.type == "DNS_NAME" and e.data == "blacklanternsecurity.com"])
+        assert 1 == len([e for e in events if e.type == "ORG_STUB" and e.data == "blacklanternsecurity"])
+        assert 1 == len(
+            [
+                e
+                for e in events
+                if e.type == "EMAIL_ADDRESS"
+                and e.data == "bob@bob.com"
+                and e.scope_distance == 1
+                and "affiliate" in e.tags
+            ]
+        )
+        assert 1 == len(
+            [
+                e
+                for e in events
+                if e.type == "DNS_NAME" and e.data == "bob.com" and e.scope_distance == 1 and "affiliate" in e.tags
+            ]
+        )
+        assert 1 == len([e for e in events if e.type == "EMAIL_ADDRESS" and e.data == "bob@blacklanternsecurity.com"])
+        assert 1 == len(
+            [
+                e
+                for e in events
+                if e.type == "USERNAME"
+                and e.data == "bob@blacklanternsecurity.com:bob@bob.com"
+                and e.parent.data == "bob@blacklanternsecurity.com"
+            ]
+        )
+        assert 1 == len([e for e in events if e.type == "EMAIL_ADDRESS" and e.data == "tim@blacklanternsecurity.com"])
+        assert 1 == len(
+            [
+                e
+                for e in events
+                if e.type == "HASHED_PASSWORD"
+                and e.data
+                == "bob@blacklanternsecurity.com:$2a$12$pVmwJ7pXEr3mE.DmCCE4fOUDdeadbeefd2KuCy/tq1ZUFyEOH2bve"
+            ]
+        )
+        assert 1 == len(
+            [e for e in events if e.type == "PASSWORD" and e.data == "tim@blacklanternsecurity.com:TimTamSlam69"]
+        )
+        assert 1 == len([e for e in events if e.type == "USERNAME" and e.data == "tim@blacklanternsecurity.com:timmy"])
+
+
+class TestDehashedBadEmail(TestDehashed):
+    async def setup_before_prep(self, module_test):
+        module_test.httpx_mock.add_response(
+            url="https://api.dehashed.com/v2/search",
+            method="POST",
+            json={
+                "balance": 10000,
+                "entries": [
+                    {
+                        "id": "EZxg4Lz-INLUt6uRXZaV",
+                        "email": ["foo.example.com"],
+                        "database_name": "Collections",
+                    },
+                ],
+                "took": "41ms",
+                "total": 1,
+            },
+        )
+
+    def check(self, module_test, events):
+        debug_log_content = open(module_test.scan.home / "debug.log").read()
+        assert "Invalid email from dehashed.com: foo.example.com" in debug_log_content
+
+
+class TestDehashedHTTPError(TestDehashed):
+    async def setup_before_prep(self, module_test):
+        module_test.httpx_mock.add_response(
+            url="https://api.dehashed.com/v2/search",
+            method="POST",
+            json={"error": "issue with request body"},
+            status_code=400,
+        )
+
+    def check(self, module_test, events):
+        scan_log_content = open(module_test.scan.home / "scan.log").read()
+        assert (
+            'Error retrieving results from dehashed.com (status code 400): {"error":"issue with request body"}'
+            in scan_log_content
+        )
+
+
+class TestDehashedTooManyResults(TestDehashed):
+    async def setup_before_prep(self, module_test):
+        module_test.httpx_mock.add_response(
+            url="https://api.dehashed.com/v2/search",
+            method="POST",
+            json={
+                "balance": 10000,
+                "entries": [
+                    {
+                        "id": "VXhNxj46SGsW4Lworh-G",
+                        "email": ["bob@bob.com"],
+                        "database_name": "Collections",
+                    },
+                ],
+                "took": "40ms",
+                "total": 10001,
+            },
+        )
+
+    def check(self, module_test, events):
+        scan_log_content = open(module_test.scan.home / "scan.log").read()
+        assert "has 10,001 results in Dehashed. The API can only process the first 10,000 results." in scan_log_content

{bbot-2.4.2.6611rc0 → bbot-2.4.2.6615rc0}/pyproject.toml

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

bbot-2.4.2.6611rc0/bbot/test/test_step_2/module_tests/test_module_dehashed.py

@@ -1,102 +0,0 @@
-from .base import ModuleTestBase
-
-dehashed_domain_response = {
-    "balance": 10000,
-    "entries": [
-        {
-            "id": "4363462346",
-            "email": "bob@blacklanternsecurity.com",
-            "ip_address": "",
-            "username": "bob@bob.com",
-            "password": "",
-            "hashed_password": "$2a$12$pVmwJ7pXEr3mE.DmCCE4fOUDdeadbeefd2KuCy/tq1ZUFyEOH2bve",
-            "name": "Bob Smith",
-            "vin": "",
-            "address": "",
-            "phone": "+91283423839",
-            "database_name": "eatstreet",
-        },
-        {
-            "id": "234623453454",
-            "email": "tim@blacklanternsecurity.com",
-            "ip_address": "",
-            "username": "timmy",
-            "password": "TimTamSlam69",
-            "hashed_password": "",
-            "name": "Tim Tam",
-            "vin": "",
-            "address": "",
-            "phone": "+123455667",
-            "database_name": "eatstreet",
-        },
-    ],
-    "success": True,
-    "took": "61µs",
-    "total": 2,
-}
-
-
-class TestDehashed(ModuleTestBase):
-    modules_overrides = ["dehashed", "speculate"]
-    config_overrides = {
-        "scope": {"report_distance": 2},
-        "modules": {"dehashed": {"username": "admin", "api_key": "deadbeef"}},
-    }
-
-    async def setup_before_prep(self, module_test):
-        module_test.httpx_mock.add_response(
-            url="https://api.dehashed.com/search?query=domain:blacklanternsecurity.com&size=10000&page=1",
-            json=dehashed_domain_response,
-        )
-        await module_test.mock_dns(
-            {
-                "bob.com": {"A": ["127.0.0.1"]},
-                "blacklanternsecurity.com": {"A": ["127.0.0.1"]},
-            }
-        )
-
-    def check(self, module_test, events):
-        assert len(events) == 12
-        assert 1 == len([e for e in events if e.type == "DNS_NAME" and e.data == "blacklanternsecurity.com"])
-        assert 1 == len([e for e in events if e.type == "ORG_STUB" and e.data == "blacklanternsecurity"])
-        assert 1 == len(
-            [
-                e
-                for e in events
-                if e.type == "EMAIL_ADDRESS"
-                and e.data == "bob@bob.com"
-                and e.scope_distance == 1
-                and "affiliate" in e.tags
-            ]
-        )
-        assert 1 == len(
-            [
-                e
-                for e in events
-                if e.type == "DNS_NAME" and e.data == "bob.com" and e.scope_distance == 1 and "affiliate" in e.tags
-            ]
-        )
-        assert 1 == len([e for e in events if e.type == "EMAIL_ADDRESS" and e.data == "bob@blacklanternsecurity.com"])
-        assert 1 == len(
-            [
-                e
-                for e in events
-                if e.type == "USERNAME"
-                and e.data == "bob@blacklanternsecurity.com:bob@bob.com"
-                and e.parent.data == "bob@blacklanternsecurity.com"
-            ]
-        )
-        assert 1 == len([e for e in events if e.type == "EMAIL_ADDRESS" and e.data == "tim@blacklanternsecurity.com"])
-        assert 1 == len(
-            [
-                e
-                for e in events
-                if e.type == "HASHED_PASSWORD"
-                and e.data
-                == "bob@blacklanternsecurity.com:$2a$12$pVmwJ7pXEr3mE.DmCCE4fOUDdeadbeefd2KuCy/tq1ZUFyEOH2bve"
-            ]
-        )
-        assert 1 == len(
-            [e for e in events if e.type == "PASSWORD" and e.data == "tim@blacklanternsecurity.com:TimTamSlam69"]
-        )
-        assert 1 == len([e for e in events if e.type == "USERNAME" and e.data == "tim@blacklanternsecurity.com:timmy"])