Merge pull request #710 from BC-SECURITY/release/5.8.1

v5.8.1 into main

.dockerignore

@@ -1,6 +1,7 @@
 # Git
 **.git
 .gitignore
+.github
 
 # CI
 .codeclimate.yml

.github/CONTRIBUTING.md

@@ -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 .`).

.github/cst-config-docker.yaml

@@ -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

.github/install_tests/InstallTest.Dockerfile

@@ -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*

.github/install_tests/cst-config-debian.yaml

@@ -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"]

.github/cst-config-base.yaml → .github/install_tests/cst-config-install-base.yaml

@@ -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"]
@@ -8,6 +35,7 @@ commandTests:
     command: "dotnet"
     args: [ "--version" ]
     expectedOutput: ["6.0.*"]
+  # powershell
   - name: "powershell which"
     command: "which"
     args: ["pwsh"]
@@ -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"]
@@ -34,4 +77,3 @@ fileExistenceTests:
   - name: 'sharpire'
     path: '/empire/empire/server/csharp/Covenant/Data/ReferenceSourceLibraries/Sharpire'
     shouldExist: true
-

.github/install_tests/cst-config-kali.yaml

@@ -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"]

.github/install_tests/cst-config-parrot.yaml

@@ -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"]

.github/install_tests/cst-config-ubuntu.yaml

@@ -0,0 +1,8 @@
+schemaVersion: 2.0.0
+containerRunOptions:
+  user: "empire"
+commandTests:
+  - name: "mysql version"
+    command: "mysql"
+    args: ["--version"]
+    expectedOutput: ["mysql  Ver 8.0.*"]