Merge pull request #72 from BC-SECURITY/sponsors-dev

3.8.2 release
BC-SECURITY · Mar 29, 2021 · 66e4458 · 66e4458
2 parents b6fc9d7 + fca58ca
commit 66e4458
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.8.1
+3.8.2
diff --git a/changelog b/changelog
@@ -1,3 +1,8 @@
+3/28/2021
+------------
+- Version 3.8.2 Master Release
+       - Fixed issue with try/catch preventing agent connections for http_hop/http listeners (@Cx01N)
+
 3/22/2021
 ------------
 - Version 3.8.1 Master Release

diff --git a/lib/common/empire.py b/lib/common/empire.py
@@ -19,7 +19,7 @@
 from datetime import datetime, timezone
 from flask_socketio import SocketIO
 
-VERSION = "3.8.1 BC Security Fork"
+VERSION = "3.8.2 BC Security Fork"
 
 from pydispatch import dispatcher
 

diff --git a/lib/listeners/http.py b/lib/listeners/http.py
@@ -1194,11 +1194,13 @@ def handle_post(request_uri):
                             dispatcher.send(signal, sender="listeners/http/{}".format(listenerName))
 
                             hopListenerName = request.headers.get('Hop-Name')
-                            try:
-                                hopListener = helpers.get_listener_options(hopListenerName)
-                                tempListenerOptions = copy.deepcopy(listenerOptions)
+
+                            # Check for hop listener
+                            hopListener = helpers.get_listener_options(hopListenerName)
+                            tempListenerOptions = copy.deepcopy(listenerOptions)
+                            if hopListener is not None:
                                 tempListenerOptions['Host']['Value'] = hopListener.options['Host']['Value']
-                            except TypeError:
+                            else:
                                 tempListenerOptions = listenerOptions
 
                             # step 6 of negotiation -> server sends patched agent.ps1/agent.py