From b97aa7b823b4aa9a0ed29cb2184f4926ef3dafa2 Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Mon, 20 Nov 2023 15:04:42 -0500 Subject: [PATCH] remove old cloud tagging system; update slow tags on modules --- bbot/core/helpers/misc.py | 9 +-------- bbot/modules/massdns.py | 2 +- bbot/modules/telerik.py | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/bbot/core/helpers/misc.py b/bbot/core/helpers/misc.py index ecbceaa33..1d3e321e2 100644 --- a/bbot/core/helpers/misc.py +++ b/bbot/core/helpers/misc.py @@ -2234,9 +2234,6 @@ def is_file(f): return False -provider_map = {"amazon": "aws", "google": "gcp"} - - def cloudcheck(ip): """ Check whether an IP address belongs to a cloud provider and returns the provider name, type, and subnet. @@ -2251,11 +2248,7 @@ def cloudcheck(ip): >>> cloudcheck("168.62.20.37") ('Azure', 'cloud', IPv4Network('168.62.0.0/19')) """ - provider, provider_type, subnet = _cloudcheck.check(ip) - if provider: - with suppress(KeyError): - provider = provider_map[provider.lower()] - return provider, provider_type, subnet + return _cloudcheck.check(ip) def is_async_function(f): diff --git a/bbot/modules/massdns.py b/bbot/modules/massdns.py index 99ab08ad6..5a0865476 100644 --- a/bbot/modules/massdns.py +++ b/bbot/modules/massdns.py @@ -21,7 +21,7 @@ class massdns(subdomain_enum): Subdomains with higher mutation levels are more likely to be distant/rare or never-before-seen. """ - flags = ["subdomain-enum", "passive", "slow", "aggressive"] + flags = ["subdomain-enum", "passive", "aggressive"] watched_events = ["DNS_NAME"] produced_events = ["DNS_NAME"] meta = {"description": "Brute-force subdomains with massdns (highly effective)"} diff --git a/bbot/modules/telerik.py b/bbot/modules/telerik.py index e012b6af6..607cd5ff1 100644 --- a/bbot/modules/telerik.py +++ b/bbot/modules/telerik.py @@ -8,7 +8,7 @@ class telerik(BaseModule): watched_events = ["URL"] produced_events = ["VULNERABILITY", "FINDING"] - flags = ["active", "aggressive", "slow", "web-thorough"] + flags = ["active", "aggressive", "web-thorough"] meta = {"description": "Scan for critical Telerik vulnerabilities"} telerikVersions = [