fix web proxy

blacklanternsecurity · Aug 20, 2024 · 11795e9 · 11795e9
1 parent ecae65a
commit 11795e9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/bbot/modules/deadly/ffuf.py b/bbot/modules/deadly/ffuf.py
@@ -37,6 +37,7 @@ class ffuf(BaseModule):
     async def setup(self):
         self.canary = "".join(random.choice(string.ascii_lowercase) for i in range(10))
         wordlist_url = self.config.get("wordlist", "")
+        self.proxy = self.scan.web_config.get("http_proxy", "")
         self.debug(f"Using wordlist [{wordlist_url}]")
         self.wordlist = await self.helpers.wordlist(wordlist_url)
         self.wordlist_lines = list(self.helpers.read_file(self.wordlist))
@@ -243,6 +244,9 @@ async def execute_ffuf(
                 self.debug("invalid mode specified, aborting")
                 return
 
+            if self.proxy:
+                command += ["-x", self.proxy]
+
             if apply_filters:
                 if ext in filters.keys():
                     if filters[ext][0] == ("ABORT"):

diff --git a/bbot/modules/deadly/nuclei.py b/bbot/modules/deadly/nuclei.py
@@ -75,7 +75,7 @@ async def setup(self):
                 self.warning(f"Failure while updating nuclei templates: {update_results.stderr}")
         else:
             self.warning("Error running nuclei template update command")
-        self.proxy = self.scan.config.get("http_proxy", "")
+        self.proxy = self.scan.web_config.get("http_proxy", "")
         self.mode = self.config.get("mode", "severe").lower()
         self.ratelimit = int(self.config.get("ratelimit", 150))
         self.concurrency = int(self.config.get("concurrency", 25))

diff --git a/bbot/modules/gowitness.py b/bbot/modules/gowitness.py
@@ -56,7 +56,7 @@ async def setup(self):
         self.threads = self.config.get("threads", 0)
         if not self.threads:
             self.threads = default_thread_count
-        self.proxy = self.scan.config.get("http_proxy", "")
+        self.proxy = self.scan.web_config.get("http_proxy", "")
         self.resolution_x = self.config.get("resolution_x")
         self.resolution_y = self.config.get("resolution_y")
         self.visit_social = self.config.get("social", True)

diff --git a/bbot/modules/wpscan.py b/bbot/modules/wpscan.py
@@ -62,7 +62,7 @@ async def setup(self):
         self.ignore_events = ["xmlrpc", "readme"]
         self.api_key = self.config.get("api_key", "")
         self.enumerate = self.config.get("enumerate", "vp,vt,tt,cb,dbe,u,m")
-        self.proxy = self.scan.config.get("http_proxy", "")
+        self.proxy = self.scan.web_config.get("http_proxy", "")
         self.threads = self.config.get("threads", 5)
         self.request_timeout = self.config.get("request_timeout", 60)
         self.connection_timeout = self.config.get("connection_timeout", 30)

diff --git a/bbot/scanner/preset/environ.py b/bbot/scanner/preset/environ.py
@@ -107,7 +107,7 @@ def prepare(self):
         environ.update(bbot_environ)
 
         # handle HTTP proxy
-        http_proxy = self.preset.config.get("http_proxy", "")
+        http_proxy = self.preset.config.get("web", {}).get("http_proxy", "")
         if http_proxy:
             environ["HTTP_PROXY"] = http_proxy
             environ["HTTPS_PROXY"] = http_proxy

diff --git a/bbot/scanner/preset/preset.py b/bbot/scanner/preset/preset.py
@@ -74,7 +74,7 @@ class Preset:
                 "1.2.3.0/24",
                 flags=["subdomain-enum"],
                 modules=["nuclei"],
-                config={"http_proxy": "http://127.0.0.1"}
+                config={"web": {"http_proxy": "http://127.0.0.1"}}
             )
         >>> scan = Scanner(preset=preset)