Merge pull request EmpireProject#777 from BC-SECURITY/release/5.9.2-p…

…rivate

v5.9.2 into private-main

CHANGELOG.md

@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.9.2] - 2024-01-31
+
 ### Fixed
 
 -   Fixed the ForeignKeyConstraint error when refreshing a directory that contains a file with a linked Download (@Vinnybod)
@@ -764,7 +766,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.9.1...HEAD
+[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.9.2...HEAD
+
+[5.9.2]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.9.1...v5.9.2
 
 [5.9.1]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.9.0...v5.9.1
 

empire/server/common/empire.py

@@ -38,7 +38,7 @@
 
 from . import agents, credentials, listeners, stagers
 
-VERSION = "5.9.1 BC Security Fork"
+VERSION = "5.9.2 BC Security Fork"
 
 log = logging.getLogger(__name__)
 

empire/test/test_agents.py

@@ -258,7 +258,7 @@ def test_update_dir_list(session_local, models, agent, main: MainMenu):
 
 
 def test_update_dir_list_with_existing_joined_file(
-    session_local, models, agent, main: MainMenu
+    session_local, models, agent, main: MainMenu, empire_config
 ):
     with session_local.begin() as db:
         message = {
@@ -286,7 +286,7 @@ def test_update_dir_list_with_existing_joined_file(
         download_path = Path("empire/test/avatar.png")
         file.downloads.append(
             models.Download(
-                location=download_path.absolute(),
+                location=str(download_path.absolute()),
                 filename=download_path.name,
                 size=download_path.stat().st_size,
             )
@@ -299,8 +299,13 @@ def test_update_dir_list_with_existing_joined_file(
             db, agent, "C:\\Users\\vinnybod\\Desktop\\test.txt"
         )
 
-        assert file.id != file2.id
-        assert len(file2.downloads) == 0
+        if empire_config.database.use != "sqlite":
+            # sqlite reuses ids and apparently doesn't cascade the delete to the
+            # association table. This can result in files being linked to the wrong
+            # download after refreshing a directory for sqlite.
+            assert file.id != file2.id
+            assert len(file2.downloads) == 0
+
         assert file.name == file2.name
 
         db.query(models.AgentFile).delete()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "empire-bc-security-fork"
-version = "5.9.1"
+version = "5.9.2"
 description = ""
 authors = ["BC Security <[email protected]>"]
 readme = "README.md"