diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index d0dca4d7a..c4bf2e520 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -139,7 +139,7 @@ jobs: # To save CI time, only run these tests when the install script or deps changed - name: Get changed files using defaults id: changed-files - uses: tj-actions/changed-files@v44.5.5 + uses: tj-actions/changed-files@v45.0.3 - name: Build images if: contains(steps.changed-files.outputs.modified_files, 'setup/install.sh') || contains(steps.changed-files.outputs.modified_files, 'poetry.lock') run: docker compose -f .github/install_tests/docker-compose-install-tests.yml build --parallel ${{ join(matrix.images, ' ') }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 53f7b7cbe..0422e1e08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.11.6] - 2024-11-08 + +- Fixed extra character in nanodump.x64.o +- Fixed bof tasking for IronPython agent + ## [5.11.5] - 2024-09-22 - Updated Starkiller to v2.8.2 @@ -934,7 +939,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.11.5...HEAD +[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.11.6...HEAD + +[5.11.6]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.11.5...v5.11.6 [5.11.5]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.11.4...v5.11.5 diff --git a/empire/server/common/empire.py b/empire/server/common/empire.py index 749e06c0a..85f991664 100755 --- a/empire/server/common/empire.py +++ b/empire/server/common/empire.py @@ -38,7 +38,7 @@ from . import agents, credentials, listeners, stagers -VERSION = "5.11.5 BC Security Fork" +VERSION = "5.11.6 BC Security Fork" log = logging.getLogger(__name__) diff --git a/empire/server/core/module_service.py b/empire/server/core/module_service.py index f30d6ccce..49c6fa24f 100644 --- a/empire/server/core/module_service.py +++ b/empire/server/core/module_service.py @@ -203,7 +203,7 @@ def execute_module( # noqa: PLR0913 PLR0912 PLR0915 else: task_command = "TASK_POWERSHELL_CMD_WAIT" - elif agent.language == "ironpython" and module.language == "csharp": + elif agent.language == "ironpython" and module.language in ("csharp", "bof"): task_command = "TASK_CSHARP" return {"command": task_command, "data": module_data}, None diff --git a/empire/server/modules/bof/nanodump.yaml b/empire/server/modules/bof/nanodump.yaml index 413fd25a8..4b561f243 100644 --- a/empire/server/modules/bof/nanodump.yaml +++ b/empire/server/modules/bof/nanodump.yaml @@ -121,7 +121,7 @@ options: format: i bof: x86: bof/nanodump/nanodump.x86.o - x64: bof/nanodump/nanodump.x64.oo + x64: bof/nanodump/nanodump.x64.o entry_point: '' script_path: '' script_end: '' diff --git a/poetry.lock b/poetry.lock index b4f3e5b19..074a4166a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -709,12 +709,12 @@ files = [ [[package]] name = "donut-shellcode" -version = "1.0.2" +version = "1.1" description = "Donut shellcode Python C extension" optional = false python-versions = ">=3.0" files = [ - {file = "donut-shellcode-1.0.2.tar.gz", hash = "sha256:66fd1b5d4b7af2ec6ddd554d7e0ab93810f6c8172ab0c12f1f776e108e331121"}, + {file = "donut_shellcode-1.1.tar.gz", hash = "sha256:80861de844b9a36de3907e726605cdf01b8e052c24a74b6e454da9b2ebca2788"}, ] [[package]] @@ -3396,4 +3396,4 @@ test = ["pytest"] [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.13" -content-hash = "d2acc72039e831149b3a4225cc50619fc01fe496a644e177185575cd65934a3d" +content-hash = "3e1fcd78b7d6a0ec1c3eabb7aee6c2a349f03e768e977d40335525e68e1137c5" diff --git a/pyproject.toml b/pyproject.toml index 2a2c71cda..9ed1d9c10 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "empire-bc-security-fork" -version = "5.11.5" +version = "5.11.6" description = "" authors = ["BC Security "] readme = "README.md" @@ -48,7 +48,7 @@ pyvnc = {git = "https://github.com/BC-SECURITY/pyVNC.git"} python-socketio = {extras = ["client"], version = "^5.11.1"} Flask = "^3.0.2" pysecretsocks = {git = "https://github.com/BC-SECURITY/PySecretSOCKS.git", rev = "da5be0e"} -donut-shellcode = { version = "^1.0.2", markers = "platform_machine == 'x86_64' or platform_machine == 'amd64'" } +donut-shellcode = { version = "^1.1", markers = "platform_machine == 'x86_64' or platform_machine == 'amd64'" } python-obfuscator = "^0.0.2" pyinstaller = "^6.4.0" md2pdf = {git = "https://github.com/bc-security/md2pdf", rev = "48d5a46"}