Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v5.6.3 into main #695

Merged
merged 36 commits into from
Aug 27, 2023
Merged

v5.6.3 into main #695

merged 36 commits into from
Aug 27, 2023

Conversation

vinnybod
Copy link

This PR was automatically generated by the release-public-start workflow.
This PR should be merged with a merge commit, not a squash commit.
Merging this PR will trigger a tag and release automatically.

vinnybod and others added 30 commits July 8, 2023 17:15
* use poetry up

* upgrade deps

* update contrbuting.md

* changelog

* fix testclient

* fix tests

* fix changelog

* typo
* initial tags

* add tags endpoint for listeners with tests

* update tag

* expand to agents

* fixing some things

* fix agent tags, fix listener api tests

* abstract tag tests

* abstract tags endpoints

* add plugin task tags

* add tags to credentials

* add tags to downloads

* add events for tags

* refactor. working on list endpoint

* more cleanup, basic list endpoint

* add validation

* add ordering to tags

* remove starkiller submodule

* remove todo

* more tags tests. add tags to download filters

* fix stager test cleanup

* add label to tag dto

* fix user filters

* fix reset test
* combine docs with main repo

* remove docs submodule

* remove conflicts

* revert contributing.md
…8374dd70c3dd82847d681282

Cherry-pick 58b97f0 to private-main
* some fixes from blackhat feedback

* bump ruff

* fixes for new ruff

* further fixes for listener name

* move log messages for starkiller

* Update empire/server/api/app.py
* initial bat fixes

* update bat file to use base64

* formatting

* added pytest for bat files

* updated formatting and changelog

* Update empire/server/modules/powershell/management/spawnas.py

Co-authored-by: Vincent Rose <[email protected]>

---------

Co-authored-by: Vincent Rose <[email protected]>
* added advanced reporting plugin and dependencies

* updated changelog

* updated plugin version

* Update CHANGELOG.md

Co-authored-by: Vincent Rose <[email protected]>

---------

Co-authored-by: Vincent Rose <[email protected]>
vinnybod and others added 5 commits August 26, 2023 15:35
* Catch error when starting up database that was seeded by an older version of Empire

* add extra startup check

* Update CHANGELOG.md
CHANGELOG.md Outdated Show resolved Hide resolved
@vinnybod vinnybod merged commit 5b2ad2c into main Aug 27, 2023
@vinnybod vinnybod deleted the release/5.6.3 branch August 27, 2023 22:08
vinnybod pushed a commit that referenced this pull request Oct 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants