Merge pull request #772 from BC-SECURITY/release/6.0.0

v6.0.0 into main

Author: vinnybod

.github/CONTRIBUTING.md

@@ -45,14 +45,13 @@ The `main` branch in `BC-SECURITY/Empire` automatically syncs.
 
 ### Code Formatting and Linting
 
-* 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 [astral-sh/ruff](https://github.com/astral-sh/ruff) for linting and formatting.
 * After implementing your changes:
-    1. run `ruff . --fix` (or `poetry run ruff . --fix`).
-    2. run `black .` (or `poetry run black .`).
+    1. run `ruff check . --fix` (or `poetry run ruff check . --fix`).
+    2. run `ruff format .` (or `poetry run ruff format .`).
 * The repo is also configured to use [pre-commit](https://pre-commit.com/) to automatically format code.
   * Once you have pre-commit installed, you can run `pre-commit install` to install the pre-commit hooks.
-  * Then pre-commit will execute black and ruff automatically before committing.
+  * Then pre-commit will execute ruff automatically before committing.
 
 ### Tests
 

.github/FUNDING.yml

@@ -1,3 +1,2 @@
 # These are supported funding model platforms
-
 github: [bc-security]

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -3,70 +3,71 @@ description: File a bug/issue
 title: "[BUG] <title>"
 labels: ["bug"]
 body:
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
-    options:
-    - label: I have searched the existing issues
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you
+        encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: input
+    attributes:
+      label: Empire Version
+      description: What version of Empire are you using?
+    validations:
       required: true
-- type: input
-  attributes:
-    label: Empire Version
-    description: What version of Empire are you using?
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Python Version
-    description: What version of Python are you using?
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Operating System
-    description: What operating system are you using?
-  validations:
-    required: true
-- type: dropdown
-  attributes:
-    label: Database
-    description: What database are you using?
-    options:
-      - SQLite
-      - MySQL
-      - MariaDB
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Current Behavior
-    description: A concise description of what you're experiencing.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A concise description of what you expected to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Steps To Reproduce
-    description: Steps to reproduce the behavior.
-    placeholder: |
-      1. In this environment...
-      1. With this config...
-      1. Run '...'
-      1. See error...
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Links? References? Anything that will give us more context about the issue you are encountering!
+  - type: input
+    attributes:
+      label: Python Version
+      description: What version of Python are you using?
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating System
+      description: What operating system are you using?
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Database
+      description: What database are you using?
+      options:
+        - SQLite
+        - MySQL
+        - MariaDB
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        1. With this config...
+        1. Run '...'
+        1. See error...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
 
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-  validations:
-    required: false
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -3,27 +3,30 @@ description: File a bug/issue
 title: "[FEATURE REQUEST] <title>"
 labels: ["enhancement"]
 body:
-- type: textarea
-  attributes:
-    label: Description
-    description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Solution
-    description: A clear and concise description of what you want to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Alternatives
-    description: A clear and concise description of any alternative solutions or features you've considered.
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Additional Context
-    description: Add any other context or screenshots about the feature request here.
-  validations:
-    required: false
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of what the problem is. Ex. I'm
+        always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Solution
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Alternatives
+      description: A clear and concise description of any alternative solutions or
+        features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other context or screenshots about the feature request
+        here.
+    validations:
+      required: false

.github/actions/clean-merge/action.yml

@@ -1,5 +1,6 @@
 name: 'Clean Merge'
-description: 'Merge a branch into another branch without creating a merge commit. Fail if the merge would create merge conflicts.'
+description: 'Merge a branch into another branch without creating a merge commit.
+  Fail if the merge would create merge conflicts.'
 inputs:
   from-branch:
     description: 'The branch to merge from'
@@ -47,4 +48,4 @@ runs:
       shell: bash
       run: |
         git push ${{ inputs.push-repo }} ${{ inputs.to-branch }}
-        echo "MERGE_STATUS=NO_CHANGES" >> $GITHUB_ENV
+        echo "MERGE_STATUS=NO_CHANGES" >> $GITHUB_ENV

.github/actions/update-starkiller/action.yml

@@ -25,11 +25,8 @@ runs:
         sed -i "s|repo:.*|repo: ${{ inputs.repo }}|" empire/server/config.yaml
     - name: Update config.yaml ref
       shell: bash
-      # this depends on there not being any other keys in the config named ref
-      # if there are, this will break. We could be safer to load/dump the yaml,
-      # but would lose the comments.
       run: |
-        sed -i "s/ref: .*/ref: ${{ inputs.starkiller-version }}/" empire/server/config.yaml
+        sed -i '0,/ref: .*/s//ref: ${{ inputs.starkiller-version }}/' empire/server/config.yaml
     - name: Update changelog
       shell: bash
       run: |

.github/cst-config-docker.yaml

@@ -7,7 +7,7 @@ commandTests:
   - name: "python3 version"
     command: "python3"
     args: ["--version"]
-    expectedOutput: ["Python 3.12.*"]
+    expectedOutput: ["Python 3.13.*"]
   - name: "poetry"
     command: "which"
     args: ["poetry"]
@@ -19,15 +19,7 @@ commandTests:
   - 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.*"]
+    expectedOutput: ["Python 3.13.*"]
   - name: "powershell which"
     command: "which"
     args: ["pwsh"]
@@ -38,19 +30,24 @@ commandTests:
     expectedOutput: ["PowerShell 7.*"]
   - name: "ps-empire help"
     command: "./ps-empire"
-    args: ["server", "--help"]
+    args: ["-f", "server", "--help"]
     expectedOutput: ["usage: empire.py server [-h]*"]
   - name: "ps-empire version"
     command: "./ps-empire"
-    args: ["server", "--version"]
-    expectedOutput: ["5.* BC Security Fork"]
+    args: ["-f", "server", "--version"]
+    expectedOutput: ["6.* BC Security Fork"]
+  - name: "go which"
+    command: "which"
+    args: ["go"]
+    expectedOutput: ["/usr/bin/go"]
+  - name: "go version"
+    command: "go"
+    args: ["version"]
+    expectedOutput: ["go version go1.23.* linux/*"]
 fileExistenceTests:
   - name: 'profiles'
     path: '/empire/empire/server/data/profiles/'
     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'
+    path: '/root/.local/share/empire/starkiller/'
     shouldExist: true

.github/docker-compose.yml

@@ -1,7 +1,6 @@
 # This is for running the tests in the Docker file, so we can catch
 # issues with the Dockerfile itself.
 version: '3'
-
 services:
   test:
     depends_on:
@@ -13,9 +12,10 @@ services:
     entrypoint: /bin/bash
     platform: linux/amd64
     command: >
-      -c "DATABASE_USE=sqlite poetry run python -m pytest . --runslow
-      && sed -i 's/localhost:3306/db:3306/g' empire/test/test_server_config.yaml
-      && DATABASE_USE=mysql poetry run python -m pytest . --runslow"
+      -c "DATABASE_USE=sqlite poetry run python -m pytest . --nodocker && sed -i
+      's/localhost:3306/db:3306/g' empire/test/test_server_config.yaml && DATABASE_USE=mysql
+      poetry run python -m pytest . --nodocker"
+
   db:
     image: mysql:8.0
     restart: always
@@ -25,7 +25,7 @@ services:
       MYSQL_PASSWORD: 'empire_password'
       MYSQL_DATABASE: test_empire
     volumes:
-     - db:/var/lib/mysql
+      - db:/var/lib/mysql
 volumes:
   db:
     driver: local

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

@@ -25,16 +25,7 @@ commandTests:
   - name: "poetry python version"
     command: "poetry"
     args: ["run", "python3", "--version"]
-    expectedOutput: ["Python 3.12.*"]
-  # dotnet
-  - name: "dotnet which"
-    command: "which"
-    args: ["dotnet"]
-    expectedOutput: ["/usr/bin/dotnet"]
-  - name: "dotnet version"
-    command: "dotnet"
-    args: [ "--version" ]
-    expectedOutput: ["6.0.*"]
+    expectedOutput: ["Python 3.13.*"]
   # powershell
   - name: "powershell which"
     command: "which"
@@ -49,15 +40,15 @@ commandTests:
     command: "which"
     args: ["mysql"]
     expectedOutput: ["/usr/bin/mysql"]
-  # nim
-  - name: "nim which"
+  # go
+  - name: "go which"
     command: "which"
-    args: ["nim"]
-    expectedOutput: ["/usr/bin/nim"]
-  - name: "nim version"
-    command: "nim"
-    args: ["--version"]
-    expectedOutput: ["Nim Compiler Version 1.6.*"]
+    args: ["go"]
+    expectedOutput: ["/usr/bin/go"]
+  - name: "go version"
+    command: "go"
+    args: ["version"]
+    expectedOutput: ["go version go1.23.* linux/*"]
   # run
   - name: "ps-empire help"
     command: "./ps-empire"
@@ -66,11 +57,8 @@ commandTests:
   - name: "ps-empire version"
     command: "./ps-empire"
     args: ["server", "--version"]
-    expectedOutput: ["5.* BC Security Fork"]
+    expectedOutput: ["6.* BC Security Fork"]
 fileExistenceTests:
   - name: 'profiles'
     path: '/empire/empire/server/data/profiles/'
     shouldExist: true
-  - name: 'sharpire'
-    path: '/empire/empire/server/csharp/Covenant/Data/ReferenceSourceLibraries/Sharpire'
-    shouldExist: true