Skip to content

Commit

Permalink
Merge branch 'main' into csharp_exe_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
vinnybod authored Jan 12, 2025
2 parents 73ff30d + b9a2d98 commit 0a65de9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Fixed issue with C# exe and shellcode not compiling PowerShell stagers
- Fix delay/jitter adjustment in python agent (@janit0rjoe)

## [5.12.1] - 2025-01-08

Expand Down
2 changes: 1 addition & 1 deletion empire/server/core/agent_task_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def create_task_update_sleep(
db,
agent,
"TASK_CMD_WAIT",
f"global delay; global jitter; delay={delay}; jitter={jitter}; print('delay/jitter set to {delay}/{jitter}')",
f"global agent; agent.delay={delay}; agent.jitter={jitter}; print('delay/jitter set to {delay}/{jitter}')",
user_id=user_id,
)
if agent.language == "csharp":
Expand Down
1 change: 1 addition & 0 deletions empire/server/data/agent/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ def dynamic_code_execute_wait_nosave(self, data, result_id):
Task 100
"""
try:
globals().update({'agent':self})
buffer = StringIO()
sys.stdout = buffer
code_obj = compile(data, "<string>", "exec")
Expand Down

0 comments on commit 0a65de9

Please sign in to comment.