str/byte, new server message check, agents listing bug #103
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merging with Empire 3.0.6
Merging Dev
Cx01N
approved these changes
Feb 29, 2020
vinnybod
added a commit
that referenced
this pull request
Jul 27, 2021
* stopping point with pydantic * a little cleanup * refactors * convert a couple modules * Keep modules endpoints functioning the same as 3.x * fix default option format strings * fix a couple of the modules * fix rubeus and add docs * formatting fix * add stub for python yaml * fix a few of the modules that weren't loading * fix issues in bypassuac * some initial python conversions * rename variables * clear some todos... add others * python minify * clear out more todos * convert a few more modules * Converted modules to YAML Format (#60) * converted modules to yaml format * reformatted code * initial csharp module ingestor * added agent option when loading covenant yamls * updates to call the compiler * Tasks compile and runing on powershell agent * initial agent integration. Not working yet * initial covenant compiler integration * adding in all files * renaming folder * adding compiler files * removing unnecessary files * make generic csharp directory, remove covenant debug files * fix 1 yaml name * remove some more definite unused files * some formatting * updates to the agent. no argument tasks running * fixed C# tasks with parameters in C# agents * csharp cleanup * graceful csharp shutdown * updated submodules * added rubeus * updated rubeus * updated dpapi * local updates * added notifications to csharpserver * fixed message stylization * fixed agent on the server * added colorization to stager generation in cli * updated csharp launcher with single exe * C# taskings fix for powershell agent. Throws error at the server * temporary fix for the outpipe bug in powershell agents * fix issue with main menu reference in 'send_socketio_message' (#96) * Update gitignore, limit text sent to compiler, fix issue starting up … (#94) * Update gitignore, limit text sent to compiler, fix issue starting up csharpserver plugin * add credential module * updated config.yaml back to defaults * readded autoconnect as a default config option * mimikatz resource folder * actually added files * binary clean up and supress agent console window * merge clean up * more csharp updates (#101) * more updates * fix agent option format * write full path on generated-stager * Fixed sharpire responses (#102) * fixed sharpire responses * removed .kill for thread * readded .kill for vinnybod... * Sharpire merge fixes (#103) * fix color issue * fixed csharp tasking * fixed missing type 44 bracket Co-authored-by: Vince Rose <vrose04@gmail.com> Co-authored-by: Anthony Rose <20302208+Cx01N@users.noreply.github.com> Co-authored-by: Cx01N <anthony.rose@bc-security.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
agent.py: Stripped trailing white spaces. In some cases the default HTML page and the current one, used to check if a new server message arrived, have a different number of trailing white spaces that makes the agent to try to base64 decode the HTML causing an exception within the agen:
empire.py: str/byte error trying to read the file.
helpers.py: Typo
messages.py: In some cases when an agent doesn't fully complete a connection the hostname is Null. In Python 3 that causes an
unsupported format string passed to NoneType.__format__exception when the commandagentsis invoked. If that happens the agents listing breaks until the offending agent is removed. Reference