From edab5a82fe89a106eba0039ff8d46ca7cfff076f Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Mon, 29 Jan 2024 15:29:38 -0500 Subject: [PATCH 1/2] clarify interactsh polling error --- bbot/core/helpers/interactsh.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bbot/core/helpers/interactsh.py b/bbot/core/helpers/interactsh.py index 929637dfe..871ecb1c4 100644 --- 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) From 8bba54cadde118f64c910d3f3104b1d251d79729 Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Mon, 29 Jan 2024 15:30:32 -0500 Subject: [PATCH 2/2] update release history --- docs/release_history.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release_history.md b/docs/release_history.md index 2f0b16a17..eef23ba39 100644 --- 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