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.8.1 into main #710

Merged
merged 32 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7f60494
Updated listeners to consistently use port 80 and 443 for HTTP traffi…
Cx01N Oct 28, 2023
5a6e737
Python and IronPython Agent Reformat (#694)
Cx01N Oct 28, 2023
accf740
Added install script option to enable MySQL service (#707)
Cx01N Oct 28, 2023
4a84a69
remove deprecated sqlalchemy functions and fix another invalid escape…
vinnybod Oct 28, 2023
f93afd9
remove unneeded condiiton from all listeners (#719)
vinnybod Oct 29, 2023
4ba4bab
Python 3.12 (#716)
vinnybod Nov 5, 2023
b8151b4
make donut install conditional so we can support arm machines. add wa…
vinnybod Nov 5, 2023
7aad4aa
Ruff - Python 3.10 minimum (#722)
vinnybod Nov 5, 2023
7d3197d
Multi-arch docker build (#723)
vinnybod Nov 6, 2023
6bb427b
Update README.md
vinnybod Nov 6, 2023
127ba8b
Config path improvements (#724)
vinnybod Nov 6, 2023
7b2cc58
Prepare release 5.8.0 private
web-flow Nov 6, 2023
6204235
fix docker build test
vinnybod Nov 6, 2023
6757efb
attempt fix docker test again
vinnybod Nov 6, 2023
957617e
Merge pull request #725 from BC-SECURITY/release/5.8.0-private
vinnybod Nov 6, 2023
3ed4c67
Pydantic v2 & FastAPI Annotated (#727)
vinnybod Nov 8, 2023
2fb8865
fix notifications
vinnybod Nov 8, 2023
4e87067
increase coverage by optimizing conftest and removed unused migration…
vinnybod Nov 11, 2023
f263d17
5.8 additions (#730)
vinnybod Nov 17, 2023
884ffe7
Add flake8-comprehensions (#731)
vinnybod Nov 17, 2023
b280a3f
fix port number
vinnybod Nov 17, 2023
c225be1
enable starkiller
vinnybod Nov 17, 2023
6fad4f9
organize changelog
vinnybod Nov 18, 2023
45ff7d1
Remove usages of deprecated listener and credential functions (#732)
vinnybod Nov 20, 2023
bde2f71
remove name arg from listener start and shutdown (#734)
vinnybod Nov 30, 2023
bc6bbc6
fix database session management for websockets (#733)
vinnybod Nov 30, 2023
4ffbdb7
Removed secretsocks as dependency for Python agents (#729)
Cx01N Nov 30, 2023
c3ee0da
Prepare release 5.8.1 private
web-flow Nov 30, 2023
945cb77
remove reset_db from test setup which was breaking sqlite
vinnybod Nov 30, 2023
f9864d9
Merge pull request #737 from BC-SECURITY/release/5.8.1-private
vinnybod Nov 30, 2023
3b518e1
Update starkiller version to v2.7.1
web-flow Dec 4, 2023
0636c62
Merge branch 'main' into release/5.8.1
vinnybod Dec 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Git
**.git
.gitignore
.github

# CI
.codeclimate.yml
Expand Down
1 change: 0 additions & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ The `main` branch in `BC-SECURITY/Empire` automatically syncs.

* We are using [psf/black](https://github.com/psf/black) for code formatting.
* We are using [charliermarsh/ruff](https://github.com/charliermarsh/ruff) for linting.
* We are using the E, W, F, I, UP, and B rulesets.
* After implementing your changes:
1. run `ruff . --fix` (or `poetry run ruff . --fix`).
2. run `black .` (or `poetry run black .`).
Expand Down
57 changes: 53 additions & 4 deletions .github/cst-config-docker.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,59 @@
schemaVersion: 2.0.0
commandTests:
- name: "python3 which"
command: "which"
args: ["python3"]
- name: "poetry python"
command: "poetry"
args: ["run", "which", "python3"]
expectedOutput: ["/usr/local/bin/python3"]
- name: "python3 version"
command: "python3"
args: ["--version"]
expectedOutput: ["Python 3.11.*"]
expectedOutput: ["Python 3.12.*"]
- name: "poetry"
command: "which"
args: ["poetry"]
expectedOutput: ["/usr/bin/poetry"]
- name: "poetry version"
command: "poetry"
args: ["--version"]
expectedOutput: ["Poetry (version 1.6*)*"]
- name: "poetry python version"
command: "poetry"
args: ["run", "python3", "--version"]
expectedOutput: ["Python 3.12.*"]
- name: "dotnet which"
command: "which"
args: ["dotnet"]
expectedOutput: ["/usr/bin/dotnet"]
- name: "dotnet version"
command: "dotnet"
args: [ "--version" ]
expectedOutput: ["6.0.*"]
- name: "powershell which"
command: "which"
args: ["pwsh"]
expectedOutput: ["/usr/bin/pwsh"]
- name: "powershell version"
command: "pwsh"
args: ["--version"]
expectedOutput: ["PowerShell 7.*"]
- name: "ps-empire help"
command: "./ps-empire"
args: ["server", "--help"]
expectedOutput: ["usage: empire.py server [-h]*"]
- name: "ps-empire version"
command: "./ps-empire"
args: ["server", "--version"]
expectedOutput: ["5.* BC Security Fork"]
fileExistenceTests:
- name: 'profiles'
path: '/empire/empire/server/data/profiles/'
shouldExist: true
- name: 'invoke obfuscation'
path: '/usr/local/share/powershell/Modules/Invoke-Obfuscation/'
shouldExist: true
- name: 'sharpire'
path: '/empire/empire/server/csharp/Covenant/Data/ReferenceSourceLibraries/Sharpire'
shouldExist: true
- name: 'starkiller'
path: '/empire/empire/server/api/v2/starkiller/index.html'
shouldExist: true
10 changes: 0 additions & 10 deletions .github/install_tests/Debian10.Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions .github/install_tests/Debian11.Dockerfile

This file was deleted.

18 changes: 18 additions & 0 deletions .github/install_tests/InstallTest.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ARG BASE_IMAGE
FROM $BASE_IMAGE
WORKDIR /empire
COPY . /empire

SHELL ["/bin/bash", "-c"]

RUN apt-get update && apt-get -y install sudo

# Add a non-root user
RUN echo 'empire ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
RUN useradd -m empire
RUN chown -R empire:empire /empire
USER empire

RUN sed -i 's/use: mysql/use: sqlite/g' empire/server/config.yaml
RUN yes | /empire/setup/install.sh
RUN rm -rf /empire/empire/server/data/empire*
9 changes: 0 additions & 9 deletions .github/install_tests/KaliRolling.Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions .github/install_tests/ParrotRolling.Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions .github/install_tests/Ubuntu2004.Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions .github/install_tests/Ubuntu2204.Dockerfile

This file was deleted.

8 changes: 8 additions & 0 deletions .github/install_tests/cst-config-debian.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
schemaVersion: 2.0.0
containerRunOptions:
user: "empire"
commandTests:
- name: "mysql version"
command: "mysql"
args: ["--version"]
expectedOutput: ["mysql Ver 15.*10.*-MariaDB"]
18 changes: 0 additions & 18 deletions .github/install_tests/cst-config-debian10.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/install_tests/cst-config-debian11.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
schemaVersion: 2.0.0
commandTests:
# pyenv
- name: "pyenv"
command: "which"
args: ["pyenv"]
expectedOutput: ["/usr/bin/pyenv"]
- name: "pyenv version"
command: "pyenv"
args: ["--version"]
expectedOutput: ["pyenv 2.3.*"]
# poetry
- name: "poetry python"
command: "poetry"
args: ["run", "which", "python3"]
expectedOutput: ["/empire/.venv/bin/python3"]
- name: "poetry"
command: "which"
args: ["poetry"]
expectedOutput: ["/usr/bin/poetry"]
- name: "poetry version"
command: "poetry"
args: ["--version"]
expectedOutput: ["Poetry (version 1.6*)*"]
- name: "poetry python version"
command: "poetry"
args: ["run", "python3", "--version"]
expectedOutput: ["Python 3.12.*"]
# dotnet
- name: "dotnet which"
command: "which"
args: ["dotnet"]
Expand All @@ -8,6 +35,7 @@ commandTests:
command: "dotnet"
args: [ "--version" ]
expectedOutput: ["6.0.*"]
# powershell
- name: "powershell which"
command: "which"
args: ["pwsh"]
Expand All @@ -16,6 +44,21 @@ commandTests:
command: "pwsh"
args: ["--version"]
expectedOutput: ["PowerShell 7.*"]
# mysql
- name: "mysql which"
command: "which"
args: ["mysql"]
expectedOutput: ["/usr/bin/mysql"]
# nim
- name: "nim which"
command: "which"
args: ["nim"]
expectedOutput: ["/usr/bin/nim"]
- name: "nim version"
command: "nim"
args: ["--version"]
expectedOutput: ["Nim Compiler Version 1.6.*"]
# run
- name: "ps-empire help"
command: "./ps-empire"
args: ["server", "--help"]
Expand All @@ -34,4 +77,3 @@ fileExistenceTests:
- name: 'sharpire'
path: '/empire/empire/server/csharp/Covenant/Data/ReferenceSourceLibraries/Sharpire'
shouldExist: true

8 changes: 8 additions & 0 deletions .github/install_tests/cst-config-kali.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
schemaVersion: 2.0.0
containerRunOptions:
user: "empire"
commandTests:
- name: "mysql version"
command: "mysql"
args: ["--version"]
expectedOutput: ["mysql Ver 15.*10.*-MariaDB"]
18 changes: 0 additions & 18 deletions .github/install_tests/cst-config-kalirolling.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions .github/install_tests/cst-config-parrot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
schemaVersion: 2.0.0
containerRunOptions:
user: "empire"
commandTests:
- name: "mysql version"
command: "mysql"
args: ["--version"]
expectedOutput: ["mysql Ver 15.*10.*-MariaDB"]
18 changes: 0 additions & 18 deletions .github/install_tests/cst-config-parrotrolling.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions .github/install_tests/cst-config-ubuntu.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
schemaVersion: 2.0.0
containerRunOptions:
user: "empire"
commandTests:
- name: "mysql version"
command: "mysql"
args: ["--version"]
expectedOutput: ["mysql Ver 8.0.*"]
18 changes: 0 additions & 18 deletions .github/install_tests/cst-config-ubuntu2004.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/install_tests/cst-config-ubuntu2204.yaml

This file was deleted.

Loading
Loading