bbot 2.3.0.5370rc0__tar.gz → 2.3.0.5376rc0__tar.gz

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/PKG-INFO

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

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/__init__.py

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

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/cli.py

@@ -29,7 +29,6 @@ scan_name = ""
 
 
 async def _main():
-
     import asyncio
     import traceback
     from contextlib import suppress
@@ -45,7 +44,6 @@ async def _main():
     global scan_name
 
     try:
-
         # start by creating a default scan preset
         preset = Preset(_log=True, name="bbot_cli_main")
         # parse command line arguments and merge into preset
@@ -81,7 +79,6 @@ async def _main():
 
         # if we're listing modules or their options
         if options.list_modules or options.list_module_options:
-
             # if no modules or flags are specified, enable everything
             if not (options.modules or options.output_modules or options.flags):
                 for module, preloaded in preset.module_loader.preloaded().items():
@@ -172,7 +169,6 @@ async def _main():
             log.trace(f"Command: {' '.join(sys.argv)}")
 
             if sys.stdin.isatty():
-
                 # warn if any targets belong directly to a cloud provider
                 for event in scan.target.seeds.events:
                     if event.type == "DNS_NAME":

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/config/files.py

@@ -10,7 +10,6 @@ bbot_code_dir = Path(__file__).parent.parent.parent
 
 
 class BBOTConfigFiles:
-
     config_dir = (Path.home() / ".config" / "bbot").resolve()
     defaults_filename = (bbot_code_dir / "defaults.yml").resolve()
     config_filename = (config_dir / "bbot.yml").resolve()

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/event/base.py

@@ -1180,7 +1180,6 @@ class URL_UNVERIFIED(BaseEvent):
         self.num_redirects = getattr(self.parent, "num_redirects", 0)
 
     def _data_id(self):
-
         data = super()._data_id()
 
         # remove the querystring for URL/URL_UNVERIFIED events, because we will conditionally add it back in (based on settings)
@@ -1267,7 +1266,6 @@ class URL_UNVERIFIED(BaseEvent):
 
 
 class URL(URL_UNVERIFIED):
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -1309,7 +1307,6 @@ class URL_HINT(URL_UNVERIFIED):
 
 
 class WEB_PARAMETER(DictHostEvent):
-
     def _data_id(self):
         # dedupe by url:name:param_type
         url = self.data.get("url", "")

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/helpers/dns/dns.py

@@ -16,7 +16,6 @@ log = logging.getLogger("bbot.core.helpers.dns")
 
 
 class DNSHelper(EngineClient):
-
     SERVER_CLASS = DNSEngine
     ERROR_CLASS = DNSError
 

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/helpers/dns/engine.py

@@ -24,7 +24,6 @@ all_rdtypes = ["A", "AAAA", "SRV", "MX", "NS", "SOA", "CNAME", "TXT"]
 
 
 class DNSEngine(EngineServer):
-
     CMDS = {
         0: "resolve",
         1: "resolve_raw",
@@ -476,7 +475,6 @@ class DNSEngine(EngineServer):
         # for every parent domain, starting with the shortest
         parents = list(domain_parents(query))
         for parent in parents[::-1]:
-
             # check if the parent domain is set up with wildcards
             wildcard_results = await self.is_wildcard_domain(parent, rdtypes_to_check)
 

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/helpers/dns/mock.py

@@ -5,7 +5,6 @@ log = logging.getLogger("bbot.core.helpers.dns.mock")
 
 
 class MockResolver:
-
     def __init__(self, mock_data=None, custom_lookup_fn=None):
         self.mock_data = mock_data if mock_data else {}
         self._custom_lookup_fn = custom_lookup_fn

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/helpers/libmagic.py

@@ -2,7 +2,6 @@ import puremagic
 
 
 def get_magic_info(file):
-
     magic_detections = puremagic.magic_file(file)
     if magic_detections:
         magic_detections.sort(key=lambda x: x.confidence, reverse=True)

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/helpers/process.py

@@ -7,7 +7,6 @@ from .misc import in_exception_chain
 
 
 class BBOTThread(threading.Thread):
-
     default_name = "default bbot thread"
 
     def __init__(self, *args, **kwargs):
@@ -24,7 +23,6 @@ class BBOTThread(threading.Thread):
 
 
 class BBOTProcess(SpawnProcess):
-
     default_name = "bbot process pool"
 
     def __init__(self, *args, **kwargs):

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/helpers/validators.py

@@ -299,7 +299,6 @@ def is_email(email):
 
 
 class Validators:
-
     def __init__(self, parent_helper):
         self.parent_helper = parent_helper
 

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/helpers/web/engine.py

@@ -14,7 +14,6 @@ log = logging.getLogger("bbot.core.helpers.web.engine")
 
 
 class HTTPEngine(EngineServer):
-
     CMDS = {
         0: "request",
         1: "request_batch",

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/helpers/web/web.py

@@ -19,7 +19,6 @@ log = logging.getLogger("bbot.core.helpers.web")
 
 
 class WebHelper(EngineClient):
-
     SERVER_CLASS = HTTPEngine
     ERROR_CLASS = WebError
 

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/core/modules.py

@@ -337,7 +337,6 @@ class ModuleLoader:
             # look for classes
             if type(root_element) == ast.ClassDef:
                 for class_attr in root_element.body:
-
                     # class attributes that are dictionaries
                     if type(class_attr) == ast.Assign and type(class_attr.value) == ast.Dict:
                         # module options

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/db/sql/models.py

@@ -69,7 +69,6 @@ class BBOTBaseModel(SQLModel):
 
 
 class Event(BBOTBaseModel, table=True):
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         data = self._get_data(self.data, self.type)

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/modules/baddns.py

@@ -55,7 +55,6 @@ class baddns(BaseModule):
         return True
 
     async def handle_event(self, event):
-
         tasks = []
         for ModuleClass in self.select_modules():
             kwargs = {
@@ -75,7 +74,6 @@ class baddns(BaseModule):
             tasks.append((module_instance, task))
 
         async for completed_task in self.helpers.as_completed([task for _, task in tasks]):
-
             module_instance = next((m for m, t in tasks if t == completed_task), None)
             try:
                 task_result = await completed_task

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/modules/baddns_direct.py

@@ -51,7 +51,6 @@ class baddns_direct(BaseModule):
 
         CNAME_direct_instance = CNAME_direct_module(event.host, **kwargs)
         if await CNAME_direct_instance.dispatch():
-
             results = CNAME_direct_instance.analyze()
             if results and len(results) > 0:
                 for r in results:

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/modules/dotnetnuke.py

@@ -32,7 +32,6 @@ class dotnetnuke(BaseModule):
         self.interactsh_instance = None
 
         if self.scan.config.get("interactsh_disable", False) == False:
-
             try:
                 self.interactsh_instance = self.helpers.interactsh()
                 self.interactsh_domain = await self.interactsh_instance.register(callback=self.interactsh_callback)
@@ -114,7 +113,6 @@ class dotnetnuke(BaseModule):
                         )
 
             if "endpoint" not in event.tags:
-
                 # NewsArticlesSlider ImageHandler.ashx File Read
                 result = await self.helpers.request(
                     f'{event.data["url"]}/DesktopModules/dnnUI_NewsArticlesSlider/ImageHandler.ashx?img=~/web.config'

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/modules/internal/excavate.py

@@ -62,7 +62,6 @@ def _exclude_key(original_dict, key_to_exclude):
 
 
 def extract_params_url(parsed_url):
-
     params = parse_qs(parsed_url.query)
     flat_params = {k: v[0] for k, v in params.items()}
 
@@ -94,7 +93,6 @@ def extract_params_location(location_header_value, original_parsed_url):
 
 
 class YaraRuleSettings:
-
     def __init__(self, description, tags, emit_match):
         self.description = description
         self.tags = tags
@@ -263,7 +261,6 @@ class ExcavateRule:
 
 
 class CustomExtractor(ExcavateRule):
-
     def __init__(self, excavate):
         super().__init__(excavate)
 
@@ -358,7 +355,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
         )
 
     class ParameterExtractor(ExcavateRule):
-
         yara_rules = {}
 
         class ParameterExtractorRule:
@@ -372,7 +368,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                 self.result = result
 
         class GetJquery(ParameterExtractorRule):
-
             name = "GET jquery"
             discovery_regex = r"/\$.get\([^\)].+\)/ nocase"
             extraction_regex = re.compile(r"\$.get\([\'\"](.+)[\'\"].+(\{.+\})\)")
@@ -393,8 +388,12 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                     for action, extracted_parameters in extracted_results:
                         extracted_parameters_dict = self.convert_to_dict(extracted_parameters)
                         for parameter_name, original_value in extracted_parameters_dict.items():
-                            yield self.output_type, parameter_name, original_value, action, _exclude_key(
-                                extracted_parameters_dict, parameter_name
+                            yield (
+                                self.output_type,
+                                parameter_name,
+                                original_value,
+                                action,
+                                _exclude_key(extracted_parameters_dict, parameter_name),
                             )
 
         class PostJquery(GetJquery):
@@ -418,8 +417,12 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                         k: v[0] if isinstance(v, list) and len(v) == 1 else v for k, v in query_strings.items()
                     }
                     for parameter_name, original_value in query_strings_dict.items():
-                        yield self.output_type, parameter_name, original_value, url, _exclude_key(
-                            query_strings_dict, parameter_name
+                        yield (
+                            self.output_type,
+                            parameter_name,
+                            original_value,
+                            url,
+                            _exclude_key(query_strings_dict, parameter_name),
                         )
 
         class GetForm(ParameterExtractorRule):
@@ -444,8 +447,12 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                             form_parameters[parameter_name] = original_value
 
                         for parameter_name, original_value in form_parameters.items():
-                            yield self.output_type, parameter_name, original_value, form_action, _exclude_key(
-                                form_parameters, parameter_name
+                            yield (
+                                self.output_type,
+                                parameter_name,
+                                original_value,
+                                form_action,
+                                _exclude_key(form_parameters, parameter_name),
                             )
 
         class PostForm(GetForm):
@@ -485,7 +492,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                             endpoint,
                             additional_params,
                         ) in extracted_params:
-
                             self.excavate.debug(
                                 f"Found Parameter [{parameter_name}] in [{parameterExtractorSubModule.name}] ParameterExtractor Submodule"
                             )
@@ -497,7 +503,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                             )
 
                             if self.excavate.helpers.validate_parameter(parameter_name, parameter_type):
-
                                 if self.excavate.in_bl(parameter_name) == False:
                                     parsed_url = urlparse(url)
                                     description = f"HTTP Extracted Parameter [{parameter_name}] ({parameterExtractorSubModule.name} Submodule)"
@@ -532,7 +537,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                         await self.report(domain, event, yara_rule_settings, discovery_context, event_type="DNS_NAME")
 
     class EmailExtractor(ExcavateRule):
-
         yara_rules = {
             "email": 'rule email { meta: description = "contains email address" strings: $email = /[^\\W_][\\w\\-\\.\\+\']{0,100}@[a-zA-Z0-9\\-]{1,100}(\\.[a-zA-Z0-9\\-]{1,100})*\\.[a-zA-Z]{2,63}/ nocase fullword condition: $email }',
         }
@@ -551,7 +555,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
         }
 
     class ErrorExtractor(ExcavateRule):
-
         signatures = {
             "PHP_1": r"/\.php on line [0-9]+/",
             "PHP_2": r"/\.php<\/b> on line <b>[0-9]+/",
@@ -589,7 +592,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                     await self.report(event_data, event, yara_rule_settings, discovery_context, event_type="FINDING")
 
     class SerializationExtractor(ExcavateRule):
-
         regexes = {
             "Java": re.compile(r"[^a-zA-Z0-9\/+]rO0[a-zA-Z0-9+\/]+={0,2}"),
             "DOTNET": re.compile(r"[^a-zA-Z0-9\/+]AAEAAAD\/\/[a-zA-Z0-9\/+]+={0,2}"),
@@ -619,7 +621,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                     await self.report(event_data, event, yara_rule_settings, discovery_context, event_type="FINDING")
 
     class FunctionalityExtractor(ExcavateRule):
-
         yara_rules = {
             "File_Upload_Functionality": r'rule File_Upload_Functionality { meta: description = "contains file upload functionality" strings: $fileuploadfunc = /<input[^>]+type=["\']?file["\']?[^>]+>/ nocase condition: $fileuploadfunc }',
             "Web_Service_WSDL": r'rule Web_Service_WSDL { meta: emit_match = "True" description = "contains a web service WSDL URL" strings: $wsdl = /https?:\/\/[^\s]*\.(wsdl)/ nocase condition: $wsdl }',
@@ -704,7 +705,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
         tag_attribute_regex = bbot_regexes.tag_attribute_regex
 
         async def process(self, yara_results, event, yara_rule_settings, discovery_context):
-
             for identifier, results in yara_results.items():
                 urls_found = 0
                 final_url = ""
@@ -897,7 +897,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
         decoded_data = await self.helpers.re.recursive_decode(data)
 
         if self.parameter_extraction:
-
             content_type_lower = content_type.lower() if content_type else ""
             extraction_map = {
                 "json": self.helpers.extract_params_json,
@@ -934,7 +933,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
                 self.hugewarning(f"YARA Rule {rule_name} not found in pre-compiled rules")
 
     async def handle_event(self, event):
-
         if event.type == "HTTP_RESPONSE":
             # Harvest GET parameters from URL, if it came directly from the target, and parameter extraction is enabled
             if (
@@ -1023,7 +1021,6 @@ class excavate(BaseInternalModule, BaseInterceptModule):
 
                             # Try to extract parameters from the redirect URL
                             if self.parameter_extraction:
-
                                 for (
                                     method,
                                     parsed_url,

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/modules/paramminer_headers.py

@@ -82,7 +82,6 @@ class paramminer_headers(BaseModule):
     header_regex = re.compile(r"^[!#$%&\'*+\-.^_`|~0-9a-zA-Z]+: [^\r\n]+$")
 
     async def setup(self):
-
         self.recycle_words = self.config.get("recycle_words", True)
         self.event_dict = {}
         self.already_checked = set()
@@ -157,7 +156,6 @@ class paramminer_headers(BaseModule):
             )
 
     async def handle_event(self, event):
-
         # If recycle words is enabled, we will collect WEB_PARAMETERS we find to build our list in finish()
         # We also collect any parameters of type "SPECULATIVE"
         if event.type == "WEB_PARAMETER":
@@ -201,7 +199,7 @@ class paramminer_headers(BaseModule):
             return
         for count, args, kwargs in self.gen_count_args(url):
             r = await self.helpers.request(*args, **kwargs)
-            if r is not None and not ((str(r.status_code)[0] in ("4", "5"))):
+            if r is not None and not (str(r.status_code)[0] in ("4", "5")):
                 return count
 
     def gen_count_args(self, url):
@@ -240,7 +238,6 @@ class paramminer_headers(BaseModule):
         return await compare_helper.compare(url, headers=test_headers, check_reflection=(len(header_list) == 1))
 
     async def finish(self):
-
         untested_matches = sorted(list(self.extracted_words_master.copy()))
         for url, (event, batch_size) in list(self.event_dict.items()):
             try:

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/modules/trufflehog.py

@@ -13,7 +13,7 @@ class trufflehog(BaseModule):
     }
 
     options = {
-        "version": "3.84.0",
+        "version": "3.84.1",
         "config": "",
         "only_verified": True,
         "concurrency": 8,

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/scanner/preset/args.py

@@ -10,7 +10,6 @@ log = logging.getLogger("bbot.presets.args")
 
 
 class BBOTArgs:
-
     # module config options to exclude from validation
     exclude_from_validation = re.compile(r".*modules\.[a-z0-9_]+\.(?:batch_size|module_threads)$")
 

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/scanner/preset/environ.py

@@ -65,7 +65,6 @@ omegaconf.OmegaConf.register_new_resolver("env", env_resolver)
 
 
 class BBOTEnviron:
-
     def __init__(self, preset):
         self.preset = preset
 

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/test/test_step_2/module_tests/test_module_asset_inventory.py

@@ -10,7 +10,6 @@ class TestAsset_Inventory(ModuleTestBase):
     masscan_output = """{   "ip": "127.0.0.1",   "timestamp": "1680197558", "ports": [ {"port": 9999, "proto": "tcp", "status": "open", "reason": "syn-ack", "ttl": 54} ] }"""
 
     async def setup_before_prep(self, module_test):
-
         async def run_masscan(command, *args, **kwargs):
             if "masscan" in command[:2]:
                 targets = open(command[11]).read().splitlines()

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/test/test_step_2/module_tests/test_module_dnsbrute.py

@@ -7,7 +7,6 @@ class TestDnsbrute(ModuleTestBase):
     config_overrides = {"modules": {"dnsbrute": {"wordlist": str(subdomain_wordlist), "max_depth": 3}}}
 
     async def setup_after_prep(self, module_test):
-
         old_run_live = module_test.scan.helpers.run_live
 
         async def new_run_live(*command, check=False, text=True, **kwargs):

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/test/test_step_2/module_tests/test_module_dnsbrute_mutations.py

@@ -11,7 +11,6 @@ class TestDnsbrute_mutations(ModuleTestBase):
     ]
 
     async def setup_after_prep(self, module_test):
-
         old_run_live = module_test.scan.helpers.run_live
 
         async def new_run_live(*command, check=False, text=True, **kwargs):

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/test/test_step_2/module_tests/test_module_dnscommonsrv.py

@@ -8,7 +8,6 @@ class TestDNSCommonSRV(ModuleTestBase):
     config_overrides = {"dns": {"minimal": False}}
 
     async def setup_after_prep(self, module_test):
-
         old_run_live = module_test.scan.helpers.run_live
 
         async def new_run_live(*command, check=False, text=True, **kwargs):

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/test/test_step_2/module_tests/test_module_dotnetnuke.py

@@ -146,14 +146,12 @@ class TestDotnetnuke_blindssrf(ModuleTestBase):
         return Response("alive", status=200)
 
     async def setup_before_prep(self, module_test):
-
         self.interactsh_mock_instance = module_test.mock_interactsh("dotnetnuke_blindssrf")
         module_test.monkeypatch.setattr(
             module_test.scan.helpers, "interactsh", lambda *args, **kwargs: self.interactsh_mock_instance
         )
 
     async def setup_after_prep(self, module_test):
-
         # Simulate DotNetNuke Instance
         expect_args = {"method": "GET", "uri": "/"}
         respond_args = {"response_data": dotnetnuke_http_response}

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/test/test_step_2/module_tests/test_module_excavate.py

@@ -13,7 +13,6 @@ class TestExcavate(ModuleTestBase):
     config_overrides = {"web": {"spider_distance": 1, "spider_depth": 1}}
 
     async def setup_before_prep(self, module_test):
-
         response_data = """
         ftp://ftp.test.notreal
         \\nhttps://www1.test.notreal
@@ -181,7 +180,6 @@ class TestExcavateRedirect(TestExcavate):
         module_test.httpserver.no_handler_status_code = 404
 
     def check(self, module_test, events):
-
         assert 1 == len(
             [
                 e
@@ -332,7 +330,6 @@ class TestExcavateMaxLinksPerPage(TestExcavate):
 
 
 class TestExcavateCSP(TestExcavate):
-
     csp_test_header = "default-src 'self'; script-src asdf.test.notreal; object-src 'none';"
 
     async def setup_before_prep(self, module_test):
@@ -356,7 +353,6 @@ class TestExcavateURL(TestExcavate):
 
 
 class TestExcavateURL_IP(TestExcavate):
-
     targets = ["http://127.0.0.1:8888/", "127.0.0.2"]
 
     async def setup_before_prep(self, module_test):
@@ -405,7 +401,6 @@ class TestExcavateSerializationPositive(TestExcavate):
 
 
 class TestExcavateNonHttpScheme(TestExcavate):
-
     targets = ["http://127.0.0.1:8888/", "test.notreal"]
 
     non_http_scheme_html = """
@@ -425,7 +420,6 @@ class TestExcavateNonHttpScheme(TestExcavate):
         module_test.httpserver.expect_request("/").respond_with_data(self.non_http_scheme_html)
 
     def check(self, module_test, events):
-
         found_hxxp_url = False
         found_ftp_url = False
         found_nonsense_url = False
@@ -540,7 +534,6 @@ class TestExcavateParameterExtraction(TestExcavate):
 
 
 class TestExcavateParameterExtraction_getparam(ModuleTestBase):
-
     targets = ["http://127.0.0.1:8888/"]
 
     # hunt is added as parameter extraction is only activated by one or more modules that consume WEB_PARAMETER
@@ -554,11 +547,9 @@ class TestExcavateParameterExtraction_getparam(ModuleTestBase):
         module_test.set_expect_requests(respond_args=respond_args)
 
     def check(self, module_test, events):
-
         excavate_getparam_extraction = False
         for e in events:
             if e.type == "WEB_PARAMETER":
-
                 if "HTTP Extracted Parameter [hack] (HTML Tags Submodule)" in e.data["description"]:
                     excavate_getparam_extraction = True
         assert excavate_getparam_extraction, "Excavate failed to extract web parameter"
@@ -626,7 +617,6 @@ class excavateTestRule(ExcavateRule):
 
 
 class TestExcavateYara(TestExcavate):
-
     targets = ["http://127.0.0.1:8888/"]
     yara_test_html = """
     <html>
@@ -641,12 +631,10 @@ class TestExcavateYara(TestExcavate):
 """
 
     async def setup_before_prep(self, module_test):
-
         self.modules_overrides = ["excavate", "httpx"]
         module_test.httpserver.expect_request("/").respond_with_data(self.yara_test_html)
 
     async def setup_after_prep(self, module_test):
-
         excavate_module = module_test.scan.modules["excavate"]
         excavateruleinstance = excavateTestRule(excavate_module)
         excavate_module.add_yara_rule(
@@ -665,7 +653,6 @@ class TestExcavateYara(TestExcavate):
         found_yara_string_1 = False
         found_yara_string_2 = False
         for e in events:
-
             if e.type == "FINDING":
                 if e.data["description"] == "HTTP response (body) Contains the text AAAABBBBCCCC":
                     found_yara_string_1 = True
@@ -677,7 +664,6 @@ class TestExcavateYara(TestExcavate):
 
 
 class TestExcavateYaraCustom(TestExcavateYara):
-
     rule_file = [
         'rule SearchForText { meta: description = "Contains the text AAAABBBBCCCC" strings: $text = "AAAABBBBCCCC" condition: $text }',
         'rule SearchForText2 { meta: description = "Contains the text DDDDEEEEFFFF" strings: $text2 = "DDDDEEEEFFFF" condition: $text2 }',
@@ -711,7 +697,6 @@ class TestExcavateSpiderDedupe(ModuleTestBase):
         module_test.httpserver.expect_request("/spider").respond_with_data("hi")
 
     def check(self, module_test, events):
-
         found_url_unverified_spider_max = False
         found_url_unverified_dummy = False
         found_url_event = False
@@ -803,7 +788,6 @@ class TestExcavate_retain_querystring(ModuleTestBase):
 
 
 class TestExcavate_retain_querystring_not(TestExcavate_retain_querystring):
-
     config_overrides = {
         "url_querystring_remove": False,
         "url_querystring_collapse": False,
@@ -827,7 +811,6 @@ class TestExcavate_retain_querystring_not(TestExcavate_retain_querystring):
 
 
 class TestExcavate_webparameter_outofscope(ModuleTestBase):
-
     html_body = "<html><a class=button href='https://socialmediasite.com/send?text=foo'><a class=button href='https://outofscope.com/send?text=foo'></html>"
 
     targets = ["http://127.0.0.1:8888", "socialmediasite.com"]
@@ -858,13 +841,11 @@ class TestExcavate_webparameter_outofscope(ModuleTestBase):
 
 
 class TestExcavateHeaders(ModuleTestBase):
-
     targets = ["http://127.0.0.1:8888/"]
     modules_overrides = ["excavate", "httpx", "hunt"]
     config_overrides = {"web": {"spider_distance": 1, "spider_depth": 1}}
 
     async def setup_before_prep(self, module_test):
-
         module_test.httpserver.expect_request("/").respond_with_data(
             "<html><p>test</p></html>",
             status=200,
@@ -877,7 +858,6 @@ class TestExcavateHeaders(ModuleTestBase):
         )
 
     def check(self, module_test, events):
-
         found_first_cookie = False
         found_second_cookie = False
 

{bbot-2.3.0.5370rc0 → bbot-2.3.0.5376rc0}/bbot/test/test_step_2/module_tests/test_module_paramminer_cookies.py

@@ -36,7 +36,6 @@ class TestParamminer_Cookies(Paramminer_Headers):
         module_test.set_expect_requests(respond_args=respond_args)
 
     def check(self, module_test, events):
-
         found_reflected_cookie = False
         false_positive_match = False