Merge pull request #855 from blacklanternsecurity/fix-cloud-tags

Fix Cloud Tags
blacklanternsecurity · Nov 20, 2023 · ed7042e · ed7042e
2 parents 3325541 + b97aa7b
commit ed7042e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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 = [