bbot 2.3.0.5384rc0__tar.gz → 2.3.0.5399rc0__tar.gz

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/PKG-INFO

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

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/__init__.py

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

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/core/helpers/bloom.py

@@ -5,14 +5,14 @@ import mmap
 
 class BloomFilter:
     """
-    Simple bloom filter implementation capable of rougly 400K lookups/s.
+    Simple bloom filter implementation capable of roughly 400K lookups/s.
 
     BBOT uses bloom filters in scenarios like DNS brute-forcing, where it's useful to keep track
     of which mutations have been tried so far.
 
     A 100-megabyte bloom filter (800M bits) can store 10M entries with a .01% false-positive rate.
     A python hash is 36 bytes. So if you wanted to store these in a set, this would take up
-    36 * 10M * 2 (key+value) == 720 megabytes. So we save rougly 7 times the space.
+    36 * 10M * 2 (key+value) == 720 megabytes. So we save roughly 7 times the space.
     """
 
     def __init__(self, size=8000000):

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/core/helpers/diff.py

@@ -94,7 +94,7 @@ class HttpCompare:
                 baseline_1_json = xmltodict.parse(baseline_1.text)
                 baseline_2_json = xmltodict.parse(baseline_2.text)
             except ExpatError:
-                log.debug(f"Cant HTML parse for {self.baseline_url}. Switching to text parsing as a backup")
+                log.debug(f"Can't HTML parse for {self.baseline_url}. Switching to text parsing as a backup")
                 baseline_1_json = baseline_1.text.split("\n")
                 baseline_2_json = baseline_2.text.split("\n")
 
@@ -203,7 +203,7 @@ class HttpCompare:
         )
 
         if subject_response is None:
-            # this can be caused by a WAF not liking the header, so we really arent interested in it
+            # this can be caused by a WAF not liking the header, so we really aren't interested in it
             return (True, "403", reflection, subject_response)
 
         if check_reflection:
@@ -225,7 +225,7 @@ class HttpCompare:
             subject_json = xmltodict.parse(subject_response.text)
 
         except ExpatError:
-            log.debug(f"Cant HTML parse for {subject.split('?')[0]}. Switching to text parsing as a backup")
+            log.debug(f"Can't HTML parse for {subject.split('?')[0]}. Switching to text parsing as a backup")
             subject_json = subject_response.text.split("\n")
 
         diff_reasons = []

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/core/helpers/regexes.py

@@ -23,7 +23,7 @@ num_regex = re.compile(r"\d+")
 _ipv4_regex = r"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?:\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}"
 ipv4_regex = re.compile(_ipv4_regex, re.I)
 
-# IPv6 is complicated, so we have accomodate alternative patterns,
+# IPv6 is complicated, so we have accommodate alternative patterns,
 # :(:[A-F0-9]{1,4}){1,7} == ::1, ::ffff:1
 # ([A-F0-9]{1,4}:){1,7}: == 2001::, 2001:db8::, 2001:db8:0:1:2:3::
 # ([A-F0-9]{1,4}:){1,6}:([A-F0-9]{1,4}) == 2001::1, 2001:db8::1, 2001:db8:0:1:2:3::1
@@ -118,7 +118,7 @@ event_type_regexes = OrderedDict(
 scan_name_regex = re.compile(r"[a-z]{3,20}_[a-z]{3,20}")
 
 
-# For use with excavate paramaters extractor
+# For use with excavate parameters extractor
 input_tag_regex = re.compile(
     r"<input[^>]+?name=[\"\']?([\.$\w]+)[\"\']?(?:[^>]*?value=[\"\']([=+\/\w]*)[\"\'])?[^>]*>"
 )

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/core/helpers/web/web.py

@@ -451,7 +451,7 @@ class WebHelper(EngineClient):
             Perform an html parse of the 'markup' argument and return a soup instance
 
             >>> email_type = soup.find(type="email")
-            Searches the soup instance for all occurances of the passed in argument
+            Searches the soup instance for all occurrences of the passed in argument
         """
         try:
             soup = BeautifulSoup(

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/defaults.yml

@@ -74,7 +74,7 @@ dns:
 
 web:
   # HTTP proxy
-  http_proxy: 
+  http_proxy:
   # Web user-agent
   user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.2151.97
   # Set the maximum number of HTTP links that can be followed in a row (0 == no spidering allowed)

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/modules/deadly/nuclei.py

@@ -227,7 +227,7 @@ class nuclei(BaseModule):
                 command.append(option)
 
         if self.scan.config.get("interactsh_disable") is True:
-            self.info("Disbling interactsh in accordance with global settings")
+            self.info("Disabling interactsh in accordance with global settings")
             command.append("-no-interactsh")
 
         if self.mode == "technology":

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/modules/dnsbimi.py

@@ -19,7 +19,7 @@
 #
 # NOTE: .svg file extensions are filtered from inclusion by default, modify "url_extension_blacklist" appropriately if you want the .svg image to be considered for download.
 #
-# NOTE: use the "filedownload" module if you to download .svg and .pem files. .pem will be downloaded by defaut, .svg will require a customised configuration for that module.
+# NOTE: use the "filedownload" module if you to download .svg and .pem files. .pem will be downloaded by default, .svg will require a customised configuration for that module.
 #
 # The domain portion of any URL_UNVERIFIED's will be extracted by the various internal modules if .svg is not filtered.
 #

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/modules/docker_pull.py

@@ -102,7 +102,7 @@ class docker_pull(BaseModule):
         url = f"{registry}/v2/{repository}/tags/list"
         r = await self.docker_api_request(url)
         if r is None or r.status_code != 200:
-            self.log.warning(f"Could not retrieve all tags for {repository} asuming tag:latest only.")
+            self.log.warning(f"Could not retrieve all tags for {repository} assuming tag:latest only.")
             self.log.debug(f"Response: {r}")
             return ["latest"]
         try:

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/modules/internal/cloudcheck.py

@@ -57,7 +57,9 @@ class CloudCheck(BaseInterceptModule):
         for provider in self.helpers.cloud.providers.values():
             provider_name = provider.name.lower()
             base_kwargs = {
-                "parent": event, "tags": [f"{provider.provider_type}-{provider_name}"], "_provider": provider_name
+                "parent": event,
+                "tags": [f"{provider.provider_type}-{provider_name}"],
+                "_provider": provider_name,
             }
             # loop through the provider's regex signatures, if any
             for event_type, sigs in provider.signatures.items():

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/modules/internal/dnsresolve.py

@@ -306,9 +306,7 @@ class DNSResolve(BaseInterceptModule):
     @property
     def emit_raw_records(self):
         if self._emit_raw_records is None:
-            watching_raw_records = any(
-                "RAW_DNS_RECORD" in m.get_watched_events() for m in self.scan.modules.values()
-            )
+            watching_raw_records = any("RAW_DNS_RECORD" in m.get_watched_events() for m in self.scan.modules.values())
             omitted_event_types = self.scan.config.get("omit_event_types", [])
             omit_raw_records = "RAW_DNS_RECORD" in omitted_event_types
             self._emit_raw_records = watching_raw_records or not omit_raw_records

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/modules/output/asset_inventory.py

@@ -259,7 +259,7 @@ class Asset:
         # ips
         self.ip_addresses = set(_make_ip_list(row.get("IP (External)", "")))
         self.ip_addresses.update(set(_make_ip_list(row.get("IP (Internal)", ""))))
-        # If user reqests a recheck dont import the following fields to force them to be rechecked
+        # If user requests a recheck dont import the following fields to force them to be rechecked
         if not self.recheck:
             # ports
             ports = [i.strip() for i in row.get("Open Ports", "").split(",")]

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/modules/portscan.py

@@ -104,7 +104,7 @@ class portscan(BaseModule):
         return True
 
     async def handle_batch(self, *events):
-        # on our first run, we automatically include all our intial scan targets
+        # on our first run, we automatically include all our initial scan targets
         if not self.scanned_initial_targets:
             self.scanned_initial_targets = True
             events = set(events)

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/modules/report/asn.py

@@ -207,7 +207,14 @@ class asn(BaseReportModule):
                     return False
                 asns_tried.add(asn)
             asns.append(
-                {"asn": asn, "subnet": subnet, "name": name, "description": description, "country": country, "emails": emails}
+                {
+                    "asn": asn,
+                    "subnet": subnet,
+                    "name": name,
+                    "description": description,
+                    "country": country,
+                    "emails": emails,
+                }
             )
         if not asns:
             self.debug(f'No results for "{ip}"')

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/modules/telerik.py

@@ -173,7 +173,7 @@ class telerik(BaseModule):
             webresource = "Telerik.Web.UI.WebResource.axd?type=rau"
             result, _ = await self.test_detector(event.data, webresource)
             if result:
-                if "RadAsyncUpload handler is registered succesfully" in result.text:
+                if "RadAsyncUpload handler is registered successfully" in result.text:
                     self.debug("Detected Telerik instance (Telerik.Web.UI.WebResource.axd?type=rau)")
 
                     probe_data = {

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/presets/kitchen-sink.yml

@@ -16,5 +16,3 @@ config:
   modules:
     baddns:
       enable_references: True
-
-

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/presets/web/dotnet-audit.yml

@@ -19,4 +19,3 @@ config:
       extensions: asp,aspx,ashx,asmx,ascx
     telerik:
       exploit_RAU_crypto: True
-

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/scanner/preset/args.py

@@ -175,7 +175,9 @@ class BBOTArgs:
     def create_parser(self, *args, **kwargs):
         kwargs.update(
             {
-                "description": "Bighuge BLS OSINT Tool", "formatter_class": argparse.RawTextHelpFormatter, "epilog": self.epilog
+                "description": "Bighuge BLS OSINT Tool",
+                "formatter_class": argparse.RawTextHelpFormatter,
+                "epilog": self.epilog,
             }
         )
         p = argparse.ArgumentParser(*args, **kwargs)

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/scanner/preset/preset.py

@@ -967,7 +967,7 @@ class Preset:
         header = ["Preset", "Category", "Description", "# Modules"]
         if include_modules:
             header.append("Modules")
-        for (loaded_preset, category, preset_path, original_file) in self.all_presets.values():
+        for loaded_preset, category, preset_path, original_file in self.all_presets.values():
             loaded_preset = loaded_preset.bake()
             num_modules = f"{len(loaded_preset.scan_modules):,}"
             row = [loaded_preset.name, category, loaded_preset.description, num_modules]

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test__module__tests.py

@@ -15,7 +15,6 @@ module_test_files = [m.name.split("test_module_")[-1].split(".")[0] for m in _mo
 
 
 def test__module__tests():
-
     preset = Preset()
 
     # make sure each module has a .py file

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test_bbot_fastapi.py

@@ -17,7 +17,6 @@ def run_bbot_multiprocess(queue):
 
 
 def test_bbot_multiprocess(bbot_httpserver):
-
     bbot_httpserver.expect_request("/").respond_with_data("test@blacklanternsecurity.com")
 
     queue = multiprocessing.Queue()
@@ -32,12 +31,10 @@ def test_bbot_multiprocess(bbot_httpserver):
 
 
 def test_bbot_fastapi(bbot_httpserver):
-
     bbot_httpserver.expect_request("/").respond_with_data("test@blacklanternsecurity.com")
     fastapi_process = start_fastapi_server()
 
     try:
-
         # wait for the server to start with a timeout of 60 seconds
         start_time = time.time()
         while True:

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test_bloom_filter.py

@@ -6,7 +6,6 @@ import random
 
 @pytest.mark.asyncio
 async def test_bloom_filter():
-
     def generate_random_strings(n, length=10):
         """Generate a list of n random strings."""
         return ["".join(random.choices(string.ascii_letters + string.digits, k=length)) for _ in range(n)]

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test_dns.py

@@ -185,7 +185,6 @@ async def test_dns_resolution(bbot_scanner):
 
 @pytest.mark.asyncio
 async def test_wildcards(bbot_scanner):
-
     scan = bbot_scanner("1.1.1.1")
     helpers = scan.helpers
 
@@ -634,7 +633,6 @@ def custom_lookup(query, rdtype):
 
 @pytest.mark.asyncio
 async def test_wildcard_deduplication(bbot_scanner):
-
     custom_lookup = """
 def custom_lookup(query, rdtype):
     if rdtype == "TXT" and query.strip(".").endswith("evilcorp.com"):
@@ -670,7 +668,6 @@ def custom_lookup(query, rdtype):
 
 @pytest.mark.asyncio
 async def test_dns_raw_records(bbot_scanner):
-
     from bbot.modules.base import BaseModule
 
     class DummyModule(BaseModule):
@@ -733,7 +730,7 @@ async def test_dns_raw_records(bbot_scanner):
     dummy_module = DummyModule(scan)
     scan.modules["dummy_module"] = dummy_module
     events = [e async for e in scan.async_start()]
-    # no raw records should be ouptut
+    # no raw records should be output
     assert 0 == len([e for e in events if e.type == "RAW_DNS_RECORD"])
     # but they should still make it to the module
     assert 1 == len(

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test_engine.py

@@ -14,7 +14,6 @@ async def test_engine():
     return_errored = False
 
     class TestEngineServer(EngineServer):
-
         CMDS = {
             0: "return_thing",
             1: "yield_stuff",
@@ -54,7 +53,6 @@ async def test_engine():
                 raise
 
     class TestEngineClient(EngineClient):
-
         SERVER_CLASS = TestEngineServer
 
         async def return_thing(self, n):

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test_events.py

@@ -9,7 +9,6 @@ from bbot.core.helpers.regexes import event_uuid_regex
 
 @pytest.mark.asyncio
 async def test_events(events, helpers):
-
     scan = Scanner()
     await scan._prep()
 
@@ -617,7 +616,6 @@ async def test_events(events, helpers):
 
 @pytest.mark.asyncio
 async def test_event_discovery_context():
-
     from bbot.modules.base import BaseModule
 
     scan = Scanner("evilcorp.com")

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test_helpers.py

@@ -857,7 +857,6 @@ def test_liststring_invalidfnchars(helpers):
 # test parameter validation
 @pytest.mark.asyncio
 async def test_parameter_validation(helpers):
-
     getparam_valid_params = {
         "name",
         "age",

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test_presets.py

@@ -16,7 +16,7 @@ from bbot.scanner import Scanner, Preset
 def test_preset_descriptions():
     # ensure very preset has a description
     preset = Preset()
-    for (loaded_preset, category, preset_path, original_filename) in preset.all_presets.values():
+    for loaded_preset, category, preset_path, original_filename in preset.all_presets.values():
         assert (
             loaded_preset.description
         ), f'Preset "{loaded_preset.name}" at {original_filename} does not have a description.'
@@ -68,7 +68,6 @@ def test_core():
 
 
 def test_preset_yaml(clean_default_config):
-
     import yaml
 
     preset1 = Preset(
@@ -171,7 +170,6 @@ exclude_flags:
 
 
 def test_preset_scope():
-
     # test target merging
     scan = Scanner("1.2.3.4", preset=Preset.from_dict({"target": ["evilcorp.com"]}))
     assert {str(h) for h in scan.preset.target.seeds.hosts} == {"1.2.3.4/32", "evilcorp.com"}
@@ -378,7 +376,6 @@ def test_preset_scope():
 
 @pytest.mark.asyncio
 async def test_preset_logging():
-
     scan = Scanner()
 
     # test individual verbosity levels
@@ -711,7 +708,6 @@ modules:
 
 
 def test_preset_include():
-
     # test recursive preset inclusion
 
     custom_preset_dir_1 = bbot_test_dir / "custom_preset_dir"
@@ -883,7 +879,6 @@ def test_preset_module_disablement(clean_default_config):
 
 
 def test_preset_require_exclude():
-
     def get_module_flags(p):
         for m in p.scan_modules:
             preloaded = p.preloaded_module(m)

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test_target.py

@@ -337,7 +337,6 @@ async def test_target(bbot_scanner):
 
 @pytest.mark.asyncio
 async def test_blacklist_regex(bbot_scanner, bbot_httpserver):
-
     from bbot.scanner.target import ScanBlacklist
 
     blacklist = ScanBlacklist("evilcorp.com")

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_1/test_web.py

@@ -6,7 +6,6 @@ from ..bbot_fixtures import *
 
 @pytest.mark.asyncio
 async def test_web_engine(bbot_scanner, bbot_httpserver, httpx_mock):
-
     from werkzeug.wrappers import Response
 
     def server_handler(request):
@@ -134,7 +133,6 @@ async def test_request_batch_cancellation(bbot_scanner, bbot_httpserver, httpx_m
 
 @pytest.mark.asyncio
 async def test_web_helpers(bbot_scanner, bbot_httpserver, httpx_mock):
-
     # json conversion
     scan = bbot_scanner("evilcorp.com")
     url = "http://www.evilcorp.com/json_test?a=b"

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_2/module_tests/test_module_baddns_direct.py

@@ -55,8 +55,8 @@ class TestBaddns_direct_cloudflare(BaseTestBaddns):
     def check(self, module_test, events):
         assert any(
             e.type == "FINDING"
-                and "Possible [AWS Bucket Takeover Detection] via direct BadDNS analysis. Indicator: [[Words: The specified bucket does not exist | Condition: and | Part: body] Matchers-Condition: and] Trigger: [self] baddns Module: [CNAME]"
-                in e.data["description"]
-                for e in events
+            and "Possible [AWS Bucket Takeover Detection] via direct BadDNS analysis. Indicator: [[Words: The specified bucket does not exist | Condition: and | Part: body] Matchers-Condition: and] Trigger: [self] baddns Module: [CNAME]"
+            in e.data["description"]
+            for e in events
         ), "Failed to emit FINDING"
         assert any("baddns-cname" in e.tags for e in events), "Failed to add baddns tag"

{bbot-2.3.0.5384rc0 → bbot-2.3.0.5399rc0}/bbot/test/test_step_2/module_tests/test_module_bypass403.py

@@ -26,7 +26,7 @@ class TestBypass403_collapsethreshold(ModuleTestBase):
     async def setup_after_prep(self, module_test):
         respond_args = {"response_data": "alive"}
 
-        # some of these wont work outside of the module because of the complex logic. This doesn't matter, we just need to get more alerts than the threshold.
+        # some of these won't work outside of the module because of the complex logic. This doesn't matter, we just need to get more alerts than the threshold.
 
         query_payloads = [
             "%09",