code cleanup in geoip modules

blacklanternsecurity · Sep 13, 2023 · ef6fae2 · ef6fae2
1 parent 9f98071
commit ef6fae2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/bbot/modules/base.py b/bbot/modules/base.py
@@ -609,6 +609,13 @@ def priority(self):
     def auth_required(self):
         return self.meta.get("auth_required", False)
 
+    @property
+    def http_timeout(self):
+        """
+        Convenience shortcut to `http_timeout` in the config
+        """
+        return self.scan.config.get("http_timeout", 10)
+
     @property
     def log(self):
         if getattr(self, "_log", None) is None:

diff --git a/bbot/modules/ip2location.py b/bbot/modules/ip2location.py
@@ -1,7 +1,7 @@
-from .shodan_dns import shodan_dns
+from bbot.modules.base import BaseModule
 
 
-class IP2Location(shodan_dns):
+class IP2Location(BaseModule):
     """
     IP2Location.io Geolocation API.
     """
@@ -21,12 +21,10 @@ class IP2Location(shodan_dns):
 
     base_url = "http://api.ip2location.io"
 
-    async def filter_event(self, event):
-        return True
-
     async def setup(self):
+        await self.require_api_key()
         self.lang = self.config.get("lang", "")
-        return await super().setup()
+        return True
 
     async def ping(self):
         url = self.build_url("8.8.8.8")

diff --git a/bbot/modules/ipstack.py b/bbot/modules/ipstack.py
@@ -1,7 +1,7 @@
-from bbot.modules.templates.subdomain_enum import subdomain_enum_apikey
+from bbot.modules.base import BaseModule
 
 
-class Ipstack(subdomain_enum_apikey):
+class Ipstack(BaseModule):
     """
     Ipstack GeoIP
     Leverages the ipstack.com API to geolocate a host by IP address.
@@ -10,7 +10,7 @@ class Ipstack(subdomain_enum_apikey):
     watched_events = ["IP_ADDRESS"]
     produced_events = ["GEOLOCATION"]
     flags = ["passive", "safe"]
-    meta = {"description": "Query IPStack's API for GeoIP ", "auth_required": True}
+    meta = {"description": "Query IPStack's GeoIP API", "auth_required": True}
     options = {"api_key": ""}
     options_desc = {"api_key": "IPStack GeoIP API Key"}
     scope_distance_modifier = 1
@@ -19,7 +19,8 @@ class Ipstack(subdomain_enum_apikey):
 
     base_url = "http://api.ipstack.com"
 
-    async def filter_event(self, event):
+    async def setup(self):
+        await self.require_api_key()
         return True
 
     async def ping(self):

diff --git a/bbot/modules/templates/subdomain_enum.py b/bbot/modules/templates/subdomain_enum.py
@@ -24,8 +24,6 @@ class subdomain_enum(BaseModule):
 
     async def setup(self):
         self.processed = set()
-        self.http_timeout = self.scan.config.get("http_timeout", 10)
-        self._failures = 0
         return True
 
     async def handle_event(self, event):