Merge pull request #1040 from blacklanternsecurity/interactsh-error-h…

…andling Better Interactsh error handling
blacklanternsecurity · Jan 29, 2024 · 9809d5e · 9809d5e
2 parents b77f878 + 8bba54c
commit 9809d5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/bbot/core/helpers/interactsh.py b/bbot/core/helpers/interactsh.py
@@ -235,6 +235,8 @@ async def poll(self):
             r = await self.parent_helper.request(
                 f"https://{self.server}/poll?id={self.correlation_id}&secret={self.secret}", headers=headers
             )
+            if r is None:
+                raise InteractshError("Error polling interact.sh: No response from server")
 
             ret = []
             data_list = r.json().get("data", None)

diff --git a/docs/release_history.md b/docs/release_history.md
@@ -9,6 +9,7 @@ January 29, 2024
 - https://github.com/blacklanternsecurity/bbot/pull/1014
 - https://github.com/blacklanternsecurity/bbot/pull/1015
 - https://github.com/blacklanternsecurity/bbot/pull/1032
+- https://github.com/blacklanternsecurity/bbot/pull/1040
 
 ## Bugfixes
 - https://github.com/blacklanternsecurity/bbot/pull/1005