bbot 2.3.0.5376rc0__py3-none-any.whl → 2.3.0.5382rc0__py3-none-any.whl

bbot/modules/url_manipulation.py

@@ -69,11 +69,11 @@ class url_manipulation(BaseModule):
 
             if subject_response:
                 subject_content = "".join([str(x) for x in subject_response.headers])
-                if subject_response.text != None:
+                if subject_response.text is not None:
                     subject_content += subject_response.text
 
                 if self.rand_string not in subject_content:
-                    if match == False:
+                    if match is False:
                         if str(subject_response.status_code).startswith("2"):
                             if "body" in reasons:
                                 reported_signature = f"Modified URL: {sig[1]}"
@@ -98,7 +98,7 @@ class url_manipulation(BaseModule):
         return False
 
     def format_signature(self, sig, event):
-        if sig[2] == True:
+        if sig[2] is True:
             cleaned_path = event.parsed_url.path.strip("/")
         else:
             cleaned_path = event.parsed_url.path.lstrip("/")

bbot/modules/urlscan.py

@@ -78,5 +78,5 @@ class urlscan(subdomain_enum):
             else:
                 self.debug(f'No results for "{query}"')
         except Exception:
-            self.verbose(f"Error retrieving urlscan results")
+            self.verbose("Error retrieving urlscan results")
         return results

bbot/modules/viewdns.py

@@ -48,7 +48,7 @@ class viewdns(BaseModule):
 
         html = self.helpers.beautifulsoup(content, "html.parser")
         if html is False:
-            self.debug(f"BeautifulSoup returned False")
+            self.debug("BeautifulSoup returned False")
             return results
         found = set()
         for table_row in html.findAll("tr"):

bbot/modules/wafw00f.py

@@ -52,7 +52,7 @@ class wafw00f(BaseModule):
                     context=f"{{module}} scanned {url} and identified {{event.type}}: {waf}",
                 )
         else:
-            if self.config.get("generic_detect") == True:
+            if self.config.get("generic_detect") is True:
                 generic = await self.helpers.run_in_executor(WW.genericdetect)
                 if generic:
                     waf = "generic detection"

bbot/scanner/preset/args.py

@@ -174,9 +174,9 @@ class BBOTArgs:
 
     def create_parser(self, *args, **kwargs):
         kwargs.update(
-            dict(
-                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)
 
@@ -214,7 +214,7 @@ class BBOTArgs:
             metavar="CONFIG",
             default=[],
         )
-        presets.add_argument("-lp", "--list-presets", action="store_true", help=f"List available presets.")
+        presets.add_argument("-lp", "--list-presets", action="store_true", help="List available presets.")
 
         modules = p.add_argument_group(title="Modules")
         modules.add_argument(
@@ -225,12 +225,12 @@ class BBOTArgs:
             help=f'Modules to enable. Choices: {",".join(sorted(self.preset.module_loader.scan_module_choices))}',
             metavar="MODULE",
         )
-        modules.add_argument("-l", "--list-modules", action="store_true", help=f"List available modules.")
+        modules.add_argument("-l", "--list-modules", action="store_true", help="List available modules.")
         modules.add_argument(
             "-lmo", "--list-module-options", action="store_true", help="Show all module config options"
         )
         modules.add_argument(
-            "-em", "--exclude-modules", nargs="+", default=[], help=f"Exclude these modules.", metavar="MODULE"
+            "-em", "--exclude-modules", nargs="+", default=[], help="Exclude these modules.", metavar="MODULE"
         )
         modules.add_argument(
             "-f",
@@ -240,13 +240,13 @@ class BBOTArgs:
             help=f'Enable modules by flag. Choices: {",".join(sorted(self.preset.module_loader.flag_choices))}',
             metavar="FLAG",
         )
-        modules.add_argument("-lf", "--list-flags", action="store_true", help=f"List available flags.")
+        modules.add_argument("-lf", "--list-flags", action="store_true", help="List available flags.")
         modules.add_argument(
             "-rf",
             "--require-flags",
             nargs="+",
             default=[],
-            help=f"Only enable modules with these flags (e.g. -rf passive)",
+            help="Only enable modules with these flags (e.g. -rf passive)",
             metavar="FLAG",
         )
         modules.add_argument(
@@ -254,7 +254,7 @@ class BBOTArgs:
             "--exclude-flags",
             nargs="+",
             default=[],
-            help=f"Disable modules with these flags. (e.g. -ef aggressive)",
+            help="Disable modules with these flags. (e.g. -ef aggressive)",
             metavar="FLAG",
         )
         modules.add_argument("--allow-deadly", action="store_true", help="Enable the use of highly aggressive modules")
@@ -275,7 +275,7 @@ class BBOTArgs:
             action="store_true",
             help="Scan only the provided targets as fast as possible, with no extra discovery",
         )
-        scan.add_argument("--dry-run", action="store_true", help=f"Abort before executing scan")
+        scan.add_argument("--dry-run", action="store_true", help="Abort before executing scan")
         scan.add_argument(
             "--current-preset",
             action="store_true",

bbot/scanner/preset/preset.py

@@ -17,7 +17,7 @@ from bbot.core.helpers.misc import make_table, mkdir, get_closest_match
 log = logging.getLogger("bbot.presets")
 
 
-_preset_cache = dict()
+_preset_cache = {}
 
 
 # cache default presets to prevent having to reload from disk
@@ -443,7 +443,7 @@ class Preset:
 
         # disable internal modules if requested
         for internal_module in baked_preset.internal_modules:
-            if baked_preset.config.get(internal_module, True) == False:
+            if baked_preset.config.get(internal_module, True) is False:
                 baked_preset.exclude_modules.add(internal_module)
 
         # enable modules by flag
@@ -840,7 +840,7 @@ class Preset:
         else:
             raise ValidationError(f'Unknown module type "{module}"')
 
-        if not module in module_choices:
+        if module not in module_choices:
             raise ValidationError(get_closest_match(module, module_choices, msg=f"{module_type} module"))
 
         try:
@@ -883,21 +883,21 @@ class Preset:
 
         # validate excluded modules
         for excluded_module in self.exclude_modules:
-            if not excluded_module in self.module_loader.all_module_choices:
+            if excluded_module not in self.module_loader.all_module_choices:
                 raise ValidationError(
                     get_closest_match(excluded_module, self.module_loader.all_module_choices, msg="module")
                 )
         # validate excluded flags
         for excluded_flag in self.exclude_flags:
-            if not excluded_flag in self.module_loader.flag_choices:
+            if excluded_flag not in self.module_loader.flag_choices:
                 raise ValidationError(get_closest_match(excluded_flag, self.module_loader.flag_choices, msg="flag"))
         # validate required flags
         for required_flag in self.require_flags:
-            if not required_flag in self.module_loader.flag_choices:
+            if required_flag not in self.module_loader.flag_choices:
                 raise ValidationError(get_closest_match(required_flag, self.module_loader.flag_choices, msg="flag"))
         # validate flags
         for flag in self.flags:
-            if not flag in self.module_loader.flag_choices:
+            if flag not in self.module_loader.flag_choices:
                 raise ValidationError(get_closest_match(flag, self.module_loader.flag_choices, msg="flag"))
 
     @property
@@ -916,7 +916,7 @@ class Preset:
 
         global DEFAULT_PRESETS
         if DEFAULT_PRESETS is None:
-            presets = dict()
+            presets = {}
             for ext in ("yml", "yaml"):
                 for preset_path in PRESET_PATH:
                     # for every yaml file
@@ -967,7 +967,7 @@ class Preset:
         header = ["Preset", "Category", "Description", "# Modules"]
         if include_modules:
             header.append("Modules")
-        for yaml_file, (loaded_preset, category, preset_path, original_file) in self.all_presets.items():
+        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/scanner/scanner.py

@@ -214,8 +214,8 @@ class Scanner:
             )
 
         # url file extensions
-        self.url_extension_blacklist = set(e.lower() for e in self.config.get("url_extension_blacklist", []))
-        self.url_extension_httpx_only = set(e.lower() for e in self.config.get("url_extension_httpx_only", []))
+        self.url_extension_blacklist = {e.lower() for e in self.config.get("url_extension_blacklist", [])}
+        self.url_extension_httpx_only = {e.lower() for e in self.config.get("url_extension_httpx_only", [])}
 
         # url querystring behavior
         self.url_querystring_remove = self.config.get("url_querystring_remove", True)
@@ -338,7 +338,7 @@ class Scanner:
             self.trace(f"Preset: {self.preset.to_dict(redact_secrets=True)}")
 
             if not self.target:
-                self.warning(f"No scan targets specified")
+                self.warning("No scan targets specified")
 
             # start status ticker
             self.ticker_task = asyncio.create_task(
@@ -348,7 +348,7 @@ class Scanner:
             self.status = "STARTING"
 
             if not self.modules:
-                self.error(f"No modules loaded")
+                self.error("No modules loaded")
                 self.status = "FAILED"
                 return
             else:
@@ -451,7 +451,7 @@ class Scanner:
             await m.queue_event(scan_finish_event)
         # wait until output modules are flushed
         while 1:
-            modules_finished = all([m.finished for m in output_modules])
+            modules_finished = all(m.finished for m in output_modules)
             if modules_finished:
                 break
             await asyncio.sleep(0.05)
@@ -461,7 +461,7 @@ class Scanner:
         return scan_finish_event
 
     def _start_modules(self):
-        self.verbose(f"Starting module worker loops")
+        self.verbose("Starting module worker loops")
         for module in self.modules.values():
             module.start()
 
@@ -485,17 +485,17 @@ class Scanner:
             Soft-failed modules are not set to an error state but are also removed if `remove_failed` is True.
         """
         await self.load_modules()
-        self.verbose(f"Setting up modules")
+        self.verbose("Setting up modules")
         succeeded = []
         hard_failed = []
         soft_failed = []
 
         async for task in self.helpers.as_completed([m._setup() for m in self.modules.values()]):
             module, status, msg = await task
-            if status == True:
+            if status is True:
                 self.debug(f"Setup succeeded for {module.name} ({msg})")
                 succeeded.append(module.name)
-            elif status == False:
+            elif status is False:
                 self.warning(f"Setup hard-failed for {module.name}: {msg}")
                 self.modules[module.name].set_error_state()
                 hard_failed.append(module.name)
@@ -537,11 +537,11 @@ class Scanner:
         """
         if not self._modules_loaded:
             if not self.preset.modules:
-                self.warning(f"No modules to load")
+                self.warning("No modules to load")
                 return
 
             if not self.preset.scan_modules:
-                self.warning(f"No scan modules to load")
+                self.warning("No scan modules to load")
 
             # install module dependencies
             succeeded, failed = await self.helpers.depsinstaller.install(*self.preset.modules)
@@ -685,7 +685,7 @@ class Scanner:
 
             if modules_errored:
                 self.verbose(
-                    f'{self.name}: Modules errored: {len(modules_errored):,} ({", ".join([m for m in modules_errored])})'
+                    f'{self.name}: Modules errored: {len(modules_errored):,} ({", ".join(list(modules_errored))})'
                 )
 
             num_queued_events = self.num_queued_events
@@ -722,7 +722,7 @@ class Scanner:
                     memory_usage = module.memory_usage
                     module_memory_usage.append((module.name, memory_usage))
                 module_memory_usage.sort(key=lambda x: x[-1], reverse=True)
-                self.debug(f"MODULE MEMORY USAGE:")
+                self.debug("MODULE MEMORY USAGE:")
                 for module_name, usage in module_memory_usage:
                     self.debug(f"    - {module_name}: {self.helpers.bytes_to_human(usage)}")
 
@@ -769,7 +769,7 @@ class Scanner:
             # Trigger .finished() on every module and start over
             log.info("Finishing scan")
             for module in self.modules.values():
-                finished_event = self.make_event(f"FINISHED", "FINISHED", dummy=True, tags={module.name})
+                finished_event = self.make_event("FINISHED", "FINISHED", dummy=True, tags={module.name})
                 await module.queue_event(finished_event)
             self.verbose("Completed finish()")
             return True
@@ -1024,7 +1024,7 @@ class Scanner:
         A list of DNS hostname strings generated from the scan target
         """
         if self._dns_strings is None:
-            dns_whitelist = set(t.host for t in self.whitelist if t.host and isinstance(t.host, str))
+            dns_whitelist = {t.host for t in self.whitelist if t.host and isinstance(t.host, str)}
             dns_whitelist = sorted(dns_whitelist, key=len)
             dns_whitelist_set = set()
             dns_strings = []
@@ -1121,7 +1121,7 @@ class Scanner:
         """
         A dictionary representation of the scan including its name, ID, targets, whitelist, blacklist, and modules
         """
-        j = dict()
+        j = {}
         for i in ("id", "name"):
             v = getattr(self, i, "")
             if v:
@@ -1291,7 +1291,7 @@ class Scanner:
             context = f"{context.__qualname__}()"
         filename, lineno, funcname = self.helpers.get_traceback_details(e)
         if self.helpers.in_exception_chain(e, (KeyboardInterrupt,)):
-            log.debug(f"Interrupted")
+            log.debug("Interrupted")
             self.stop()
         elif isinstance(e, BrokenPipeError):
             log.debug(f"BrokenPipeError in {filename}:{lineno}:{funcname}(): {e}")

bbot/scanner/target.py

@@ -78,7 +78,7 @@ class BaseTarget(RadixTarget):
         if args and is_event(args[0]):
             return args[0]
         # otherwise make a new one
-        if not "tags" in kwargs:
+        if "tags" not in kwargs:
             kwargs["tags"] = set()
         kwargs["tags"].update(self.tags)
         return make_event(*args, dummy=True, scan=self.scan, **kwargs)

bbot/scripts/docs.py

@@ -124,7 +124,7 @@ def find_replace_file(file, keyword, replace):
         content = f.read()
         new_content = find_replace_markdown(content, keyword, replace)
     if new_content != content:
-        if not "BBOT_TESTING" in os.environ:
+        if "BBOT_TESTING" not in os.environ:
             with open(file, "w") as f:
                 f.write(new_content)
 

bbot/test/bbot_fixtures.py

@@ -19,7 +19,7 @@ from bbot.core.helpers.async_helpers import get_event_loop
 from bbot.core.helpers.misc import mkdir, rand_string, get_python_constraints
 
 
-log = logging.getLogger(f"bbot.test.fixtures")
+log = logging.getLogger("bbot.test.fixtures")
 
 
 bbot_test_dir = Path("/tmp/.bbot_test")

bbot/test/conftest.py

@@ -95,7 +95,7 @@ def bbot_httpserver_ssl():
 
 
 def should_mock(request):
-    return not request.url.host in ["127.0.0.1", "localhost", "raw.githubusercontent.com"] + interactsh_servers
+    return request.url.host not in ["127.0.0.1", "localhost", "raw.githubusercontent.com"] + interactsh_servers
 
 
 def pytest_collection_modifyitems(config, items):

bbot/test/run_tests.sh

@@ -3,14 +3,14 @@
 bbot_dir="$( realpath "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")"
 echo -e "[+] BBOT dir: $bbot_dir\n"
 
-echo "[+] Checking code formatting with black"
+echo "[+] Checking code formatting with ruff"
 echo "======================================="
-black --check "$bbot_dir" || exit 1
+ruff format "$bbot_dir" || exit 1
 echo
 
-echo "[+] Linting with flake8"
+echo "[+] Linting with ruff"
 echo "======================="
-flake8 "$bbot_dir" || exit 1
+ruff check "$bbot_dir" || exit 1
 echo
 
 if [ "${1}x" != "x" ] ; then

bbot/test/test_step_1/test_bbot_fastapi.py

@@ -28,7 +28,7 @@ def test_bbot_multiprocess(bbot_httpserver):
     assert len(events) >= 3
     scan_events = [e for e in events if e["type"] == "SCAN"]
     assert len(scan_events) == 2
-    assert any([e["data"] == "test@blacklanternsecurity.com" for e in events])
+    assert any(e["data"] == "test@blacklanternsecurity.com" for e in events)
 
 
 def test_bbot_fastapi(bbot_httpserver):
@@ -61,7 +61,7 @@ def test_bbot_fastapi(bbot_httpserver):
         assert len(events) >= 3
         scan_events = [e for e in events if e["type"] == "SCAN"]
         assert len(scan_events) == 2
-        assert any([e["data"] == "test@blacklanternsecurity.com" for e in events])
+        assert any(e["data"] == "test@blacklanternsecurity.com" for e in events)
 
     finally:
         with suppress(Exception):