Merge pull request #711 from BC-SECURITY/release/5.8.2

v5.8.2 into main
BC-SECURITY · Dec 9, 2023 · dd7a460 · dd7a460
2 parents f766c95 + 20f56d8
commit dd7a460
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -43,4 +43,4 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: bcsecurity/empire-test:${{ steps.tag-step.outputs.RELEASE_TAG }}
+          tags: bcsecurity/empire:${{ steps.tag-step.outputs.RELEASE_TAG }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.8.2] - 2023-12-09
+
+### Fixed
+
+-   Fixed error in generating stager for HTTP Hop listener (@Cx01N)
+-   Fixed the publishing of docker images to go to the correct DockerHub coordinate (@Vinnybod)
+
 ## [5.8.1] - 2023-11-30
 -   Updated Starkiller to v2.7.1
 
@@ -691,7 +698,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Updated shellcoderdi to newest version (@Cx01N)
 -   Added a Nim launcher (@Hubbl3)
 
-[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.8.1...HEAD
+[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.8.2...HEAD
+
+[5.8.2]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.8.1...v5.8.2
 
 [5.8.1]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.8.0...v5.8.1
 

diff --git a/empire/server/common/empire.py b/empire/server/common/empire.py
@@ -38,7 +38,7 @@
 
 from . import agents, credentials, listeners, stagers
 
-VERSION = "5.8.1 BC Security Fork"
+VERSION = "5.8.2 BC Security Fork"
 
 log = logging.getLogger(__name__)
 

diff --git a/empire/server/listeners/http_hop.py b/empire/server/listeners/http_hop.py
@@ -411,28 +411,26 @@ def generate_stager(
                 )
 
             staging_key = staging_key.encode("UTF-8")
-            unobfuscated_stager = listener_util.remove_lines_comments(stager)
+            stager = listener_util.remove_lines_comments(stager)
 
             if obfuscate:
-                obfuscated_stager = self.mainMenu.obfuscationv2.obfuscate(
-                    unobfuscated_stager, obfuscation_command=obfuscation_command
-                )
-                obfuscated_stager = self.mainMenu.obfuscationv2.obfuscate_keywords(
-                    obfuscated_stager
+                stager = self.mainMenu.obfuscationv2.obfuscate(
+                    stager, obfuscation_command=obfuscation_command
                 )
+                stager = self.mainMenu.obfuscationv2.obfuscate_keywords(stager)
 
             # base64 encode the stager and return it
             # There doesn't seem to be any conditions in which the encrypt flag isn't set so the other
             # if/else statements are irrelevant
             if encode:
-                return helpers.enc_powershell(obfuscated_stager)
+                return helpers.enc_powershell(stager)
             elif encrypt:
                 RC4IV = os.urandom(4)
                 return RC4IV + encryption.rc4(
-                    RC4IV + staging_key, obfuscated_stager.encode("UTF-8")
+                    RC4IV + staging_key, stager.encode("UTF-8")
                 )
             else:
-                return obfuscated_stager
+                return stager
 
         if language in ["python", "ironpython"]:
             template_path = [

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "empire-bc-security-fork"
-version = "5.8.1"
+version = "5.8.2"
 description = ""
 authors = ["BC Security <[email protected]>"]
 readme = "README.md"