Expand test harness

.github/CODEOWNERS

@@ -1 +1 @@
-* @BishopFox/bf-red-team
+* @BishopFox/red-team

.github/workflows/autorelease.yml

@@ -2,8 +2,8 @@ name: Release
 
 on:
   push:
-    tags:
-      - "v*.*.*"
+    branches:
+      - master
 
 permissions:
   contents: write
@@ -21,22 +21,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Validate Release Tag
+      - name: Find Semver Tag
         id: tag
         run: |
-          git fetch --prune --tags -f origin
-          tag="${GITHUB_REF_NAME}"
-
-          if ! printf '%s\n' "$tag" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+$'; then
-            echo "Tag $tag is not a release semver tag."
-            exit 0
-          fi
-
-          if ! git merge-base --is-ancestor "$GITHUB_SHA" "origin/master"; then
-            echo "Tag $tag does not point to a commit on origin/master."
-            exit 0
-          fi
-
+          git fetch --prune --tags -f
+          tag=$(git tag --points-at "$GITHUB_SHA" | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | head -n 1)
           echo "tag=$tag" >> "$GITHUB_OUTPUT"
 
   release:
@@ -52,10 +41,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Go 1.26.6
+      - name: Go 1.25
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.6"
+          go-version: "^1.25"
 
       - name: Install Minisign
         run: sudo apt-get update --fix-missing && sudo apt-get -y install minisign

.github/workflows/codeql-scanning.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       # Setup go environment
-      - name: Go 1.26.6
+      - name: Go 1.25
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.6"
+          go-version: "^1.25"
 
       - name: Checkout repository
         uses: actions/checkout@v6

.github/workflows/golangci-lint.yml

@@ -1,56 +0,0 @@
-name: golangci-lint
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-    paths:
-      - ".golangci.yml"
-      - ".github/workflows/golangci-lint.yml"
-      - "go.mod"
-      - "go.sum"
-      - "go.work"
-      - "go.work.sum"
-      - "Makefile"
-      - "vendor/**"
-      - "**/*.go"
-
-permissions:
-  contents: read
-  pull-requests: read
-
-jobs:
-  lint:
-    name: golangci-lint (${{ matrix.goos }})
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      matrix:
-        goos:
-          - linux
-          - darwin
-          - windows
-    env:
-      GOOS: ${{ matrix.goos }}
-      GOARCH: amd64
-      CGO_ENABLED: "0"
-    steps:
-      - name: Check Out Code
-        uses: actions/checkout@v6
-
-      - name: Go 1.26.6
-        uses: actions/setup-go@v6
-        with:
-          go-version: "1.26.6"
-
-      - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v9
-        with:
-          version: v2.12.2
-          # Keep legacy findings visible without making them blockers.
-          only-new-issues: true
-          args: ./client/... ./server/... ./util/... ./protobuf/... ./docs ./implant/...

.github/workflows/unit-tests.yml

@@ -6,13 +6,11 @@ on:
     paths:
       - "go.mod"
       - "go.sum"
-      - ".github/workflows/unit-tests.yml"
       - "Makefile"
       - "**/*.go"
       - "**/*.c"
       - "**/*.h"
       - "**/*.sh"
-      - "**/*.ps1"
     types:
       - opened
       - reopened
@@ -20,15 +18,15 @@ on:
       - ready_for_review
 
 jobs:
-  linux-build-test:
-    name: Linux Build & Test
+  linux-windows-build-test:
+    name: Linux & Windows Test
     runs-on: ubuntu-latest
     timeout-minutes: 180
     steps:
-      - name: Go 1.26.6
+      - name: Go 1.25
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.6"
+          go-version: "^1.25"
 
       - name: OS Packages
         run: |
@@ -50,64 +48,8 @@ jobs:
       - name: Make Linux (amd64)
         run: make linux-amd64
 
-      - name: Determine go-tests flags
-        id: go-tests-flags
-        shell: bash
-        run: |
-          set -euo pipefail
-          base_sha="${{ github.event.pull_request.base.sha }}"
-          head_sha="${{ github.sha }}"
-          if git diff --name-only "$base_sha" "$head_sha" | grep -qE '^(implant/|server/gogo/|server/generate/)'; then
-            echo "args=" >> "$GITHUB_OUTPUT"
-          else
-            echo "args=--skip-generate" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: Test Linux
-        run: make clean && make && ./sliver-server unpack --force && ./go-tests.sh ${{ steps.go-tests-flags.outputs.args }}
-
-  windows-build-test:
-    name: Windows Build & Test
-    runs-on: windows-latest
-    timeout-minutes: 180
-    steps:
-      - name: Go 1.26.6
-        uses: actions/setup-go@v6
-        with:
-          go-version: "1.26.6"
-
-      - name: Install make
-        run: choco install make -y --no-progress
-
-      - name: Check Out Code
-        uses: actions/checkout@v6
-
-      - name: Git Fetch Tags
-        run: git fetch --prune --unshallow --tags -f
-
-      - name: Make Windows (amd64)
-        run: make windows-amd64
-
-      - name: Determine go-tests flags
-        id: go-tests-flags
-        shell: pwsh
-        run: |
-          $baseSha = "${{ github.event.pull_request.base.sha }}"
-          $headSha = "${{ github.sha }}"
-          $changedFiles = git diff --name-only $baseSha $headSha
-
-          if ($changedFiles | Select-String -Pattern '^(implant/|server/gogo/|server/generate/)') {
-            "args=" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
-          } else {
-            "args=--skip-generate" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
-          }
-
-      - name: Test Windows
-        shell: pwsh
-        run: |
-          make clean
-          make
-          ./go-tests.ps1 ${{ steps.go-tests-flags.outputs.args }}
+        run: make clean && make && ./sliver-server unpack --force && ./go-tests.sh
 
 
   macos-build-test:
@@ -115,10 +57,10 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 180
     steps:
-      - name: Go 1.26.6
+      - name: Go 1.25
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.6"
+          go-version: "^1.25"
 
       - name: Check Out Code
         uses: actions/checkout@v6
@@ -132,31 +74,18 @@ jobs:
       - name: Make MacOS (arm64)
         run: make macos-arm64
 
-      - name: Determine go-tests flags
-        id: go-tests-flags
-        shell: bash
-        run: |
-          set -euo pipefail
-          base_sha="${{ github.event.pull_request.base.sha }}"
-          head_sha="${{ github.sha }}"
-          if git diff --name-only "$base_sha" "$head_sha" | grep -qE '^(implant/|server/gogo/|server/generate/)'; then
-            echo "args=" >> "$GITHUB_OUTPUT"
-          else
-            echo "args=--skip-generate" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: Test MacOS
-        run: make clean && make && ./sliver-server unpack --force && ./go-tests.sh ${{ steps.go-tests-flags.outputs.args }}
+        run: make clean && make && ./sliver-server unpack --force && ./go-tests.sh
 
   clients-build:
     name: Clients Build
     runs-on: ubuntu-latest
     timeout-minutes: 90
     steps:
-      - name: Go 1.26.6
+      - name: Go 1.25
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.6"
+          go-version: "^1.25"
 
       - name: Check Out Code
         uses: actions/checkout@v6

.gitignore

@@ -1,8 +1,3 @@
-/crush
-
-/examples
-
-/.vscode
 /.vscode/*
 /.devcontainer
 /.idea

.golangci.yml

@@ -1,27 +0,0 @@
-version: "2"
-
-run:
-  timeout: 10m
-  modules-download-mode: vendor
-  build-tags:
-    - client
-    - server
-    - osusergo
-    - netgo
-    - go_sqlite
-    # Raw implant entry points are Go templates; lint their supporting packages.
-    - sliver_lint
-
-linters:
-  default: standard
-  enable:
-    - gocyclo
-    - misspell
-    - revive
-  settings:
-    gocyclo:
-      min-complexity: 15
-
-formatters:
-  enable:
-    - gofmt

AGENTS.md

@@ -1,18 +1,41 @@
 # Repository Guidelines
 
+## Project Structure & Module Organization
+- `client/` holds the CLI client and interactive commands.
+- `server/` contains the server runtime, C2 logic, configs, and web assets.
+- `implant/` is the implant runtime and transport implementations.
+- `protobuf/` stores protobuf definitions and generated Go types.
+- `util/` is shared helpers (crypto, encoders, minisign, etc.).
+- `docs/sliver-docs/` is the Next.js documentation site and prebuild scripts.
+- `vendor/` is the vendored Go dependency tree used by builds.
+- Build outputs land in the repo root as `sliver-client*` and `sliver-server*`.
+
 ## Build, Test, and Development Commands
 - `make` builds server + client using vendored modules and runs `go-assets.sh`.
 - `make client` builds a CGO-free client; `make debug` keeps symbols.
 - `make pb` regenerates protobuf stubs from `protobuf/`.
-- `./go-tests.sh` runs the Go test suite, this is the only way you should run unit tests.
+- `./go-tests.sh` runs the curated Go test suite with build tags.
 - Docs site: `cd docs/sliver-docs && npm install && npm run dev` for local dev; `npm run build` for a static build.
+- Go toolchain: the Makefile enforces Go >= 1.24.
 
 ## Coding Style & Naming Conventions
 - Run `gofmt` on all Go code; keep package names lowercase and idiomatic.
 - Avoid `CGO` and empty interfaces; prefer explicit types and interfaces.
 - Do not import `server` packages from `client`.
+- If `math/rand` is required, import it as `insecureRand` and avoid security use.
 
 ## Testing Guidelines
+- Go tests follow standard `_test.go` naming within each package.
 - Prefer `docker build --target test --build-arg GO_TESTS_FLAGS=--skip-generate .` 
 - Add or update tests when behavior changes; some server packages run longer tests.
 
+## Commit & Pull Request Guidelines
+- Commits must be signed for PRs to `master`; work in a feature branch.
+- Commit subjects are short and imperative (e.g., "Fix ...", "Add ...", "Update ...", "Bump ...").
+- Changes to `vendor/` should be in a distinct commit.
+- PRs should link the tracking issue, note tests run, and confirm `gofmt` plus unit tests as applicable.
+
+## Security Notes
+- Default to secure configuration; fail closed rather than open.
+- Avoid insecure algorithms (MD5/SHA1/AES-ECB); prefer AES-GCM and modern curves.
+- Treat user input as untrusted: canonicalize paths and use restrictive file permissions.

Makefile

@@ -2,31 +2,31 @@
 # Makefile for Sliver
 #
 
-.DEFAULT_GOAL := default
-
 GO ?= go
-ARTIFACT_SUFFIX ?=
+ARTIFACT_SUFFIX ?= 
 ENV =
 TAGS ?= -tags go_sqlite
 CGO_ENABLED = 0
-GOLANGCI_LINT ?= golangci-lint
-# The tree has legacy lint findings, so gate issues introduced by this change.
-GOLANGCI_LINT_BASE ?= master
-GOLANGCI_LINT_ARGS ?= --new-from-merge-base=$(GOLANGCI_LINT_BASE)
-GOLANGCI_LINT_PACKAGES = \
-	./client/... \
-	./server/... \
-	./util/... \
-	./protobuf/... \
-	./docs \
-	./implant/...
 
 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 date cut $(GO)
+K := $(foreach exec,$(EXECUTABLES),\
+        $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))
+
+#
+# Build Information
+#
+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 = 26
+MIN_SUPPORTED_GO_MINOR_VERSION = 24
 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)
 
 SLIVER_PUBLIC_KEY ?= RWTZPg959v3b7tLG7VzKHRB1/QT+d3c71Uzetfa44qAoX5rH7mGoQTTR
@@ -34,298 +34,151 @@ ARMORY_PUBLIC_KEY ?= RWSBpxpRWDrD7Fe+VvRE3c2VEDC2NK80rlNCj+BX0gz44Xw07r6KQD9L
 ARMORY_REPO_URL ?= https://api.github.com/repos/sliverarmory/armory/releases
 CLIENT_ASSETS_PKG = github.com/bishopfox/sliver/client/assets
 SLIVER_UPDATE_PKG = github.com/bishopfox/sliver/client/command/update
-PB_COMPILERS = protoc protoc-gen-go protoc-gen-go-grpc
-
-.PHONY: lint
-lint:
-	$(GOLANGCI_LINT) run $(GOLANGCI_LINT_ARGS) $(GOLANGCI_LINT_PACKAGES)
-
-ifneq ($(OS),Windows_NT)
-
-#
-# Prerequisites
-#
-# https://stackoverflow.com/questions/5618615/check-if-a-program-exists-from-a-makefile
-EXECUTABLES = uname sed git date cut $(GO)
-K := $(foreach exec,$(EXECUTABLES),\
-        $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))
-
-#
-# Build Information
-#
-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)
 
 LDFLAGS = -ldflags "-s -w \
 	-X $(SLIVER_UPDATE_PKG).SliverPublicKey=$(SLIVER_PUBLIC_KEY) \
 	-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
-	-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
-
-# Debug builds shouldn't be stripped (-s -w flags)
-LDFLAGS_DEBUG = -ldflags "-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
-	-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
-
-SED_INPLACE := sed -i
-STATIC_TARGET := linux
-
+	-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+
+# Debug builds shouldn't be stripped (-s -w flags)
+LDFLAGS_DEBUG = -ldflags "-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
+	-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+
+SED_INPLACE := sed -i
+STATIC_TARGET := linux
+
 UNAME_S := $(shell uname -s)
 UNAME_P := $(shell uname -p)
 
 # 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")))
 endif
-
-# *** Darwin ***
-ifeq ($(UNAME_S),Darwin)
-	SED_INPLACE := sed -i ''
-	STATIC_TARGET := macos
-endif
-
-# If no target is specified, determine GOARCH
-ifeq ($(UNAME_P),arm)
-	ifeq ($(MAKECMDGOALS), )
-		ifeq ($(origin GOARCH), undefined)
-			ENV += GOARCH=arm64
-		endif
-	endif
-endif
-
-ifeq ($(MAKECMDGOALS), linux)
-	# Redefine LDFLAGS to add the static part
-	LDFLAGS = -ldflags "-s -w \
-		-extldflags '-static' \
-		-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
-		-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
-endif
-
-#
-# Targets
-#
-.PHONY: default
-default: clean validate-go-version
-	env -u GOOS -u GOARCH $(MAKE) GOOS= GOARCH= .downloaded_assets
-	$(ENV) $(if $(GOOS),GOOS=$(GOOS)) $(if $(GOARCH),GOARCH=$(GOARCH)) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	$(ENV) $(if $(GOOS),GOOS=$(GOOS)) $(if $(GOARCH),GOARCH=$(GOARCH)) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./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-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
-
-.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-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: clean .downloaded_assets validate-go-version
-	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=windows GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_windows-arm64$(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: 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
-	rm -rf ./server/assets/fs/darwin/arm64
-	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:
-	$(ENV) $(GO) run -mod=vendor ./util/cmd/assets
-	touch ./.downloaded_assets
-
-
+
+# *** Darwin ***
+ifeq ($(UNAME_S),Darwin)
+	SED_INPLACE := sed -i ''
+	STATIC_TARGET := macos
+endif
+
+# If no target is specified, determine GOARCH
+ifeq ($(UNAME_P),arm)
+	ifeq ($(MAKECMDGOALS), )
+		ifeq ($(origin GOARCH), undefined)
+			ENV += GOARCH=arm64
+		endif
+	endif
+endif
+
+ifeq ($(MAKECMDGOALS), linux)
+	# Redefine LDFLAGS to add the static part
+	LDFLAGS = -ldflags "-s -w \
+		-extldflags '-static' \
+		-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
+		-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+endif
+
 #
-# >>> WINDOWS <<<
+# Targets
 #
-else
+.PHONY: default
+default: clean validate-go-version
+	env -u GOOS -u GOARCH $(MAKE) GOOS= GOARCH= .downloaded_assets
+	$(ENV) $(if $(GOOS),GOOS=$(GOOS)) $(if $(GOARCH),GOARCH=$(GOARCH)) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
+	$(ENV) $(if $(GOOS),GOOS=$(GOOS)) $(if $(GOARCH),GOARCH=$(GOARCH)) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
 
-SHELL := cmd.exe
-.SHELLFLAGS := /C
+# 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
 
-GO_VERSION := $(patsubst go%,%,$(strip $(shell $(GO) env GOVERSION)))
-GO_MAJOR_VERSION := $(word 1,$(subst ., ,$(GO_VERSION)))
-GO_MINOR_VERSION := $(word 2,$(subst ., ,$(GO_VERSION)))
+.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
 
-LDFLAGS = -ldflags "-s -w -X $(SLIVER_UPDATE_PKG).SliverPublicKey=$(SLIVER_PUBLIC_KEY) -X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) -X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+.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
 
-LDFLAGS_DEBUG = -ldflags "-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) -X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+.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
 
-COMMA := ,
-
-ifeq ($(MAKECMDGOALS), linux)
-	LDFLAGS = -ldflags "-s -w -extldflags '-static' -X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) -X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
-endif
-
-define windows_exec
-$(strip $(foreach envvar,$(1),set "$(envvar)" && ))$(2)
-endef
-
-define windows_go_build
-$(call windows_exec,$(ENV) GOOS=$(1) GOARCH=$(2) CGO_ENABLED=$(3),"$(GO)" build $(4) $(TAGS)$(COMMA)$(5) $(6) -o $(7) ./$(5))
-endef
-
-.PHONY: default
-default: clean validate-go-version
-	$(call windows_exec,$(ENV) GOOS= GOARCH=,"$(MAKE)" GOOS= GOARCH= .downloaded_assets)
-	$(call windows_go_build,$(GOOS),$(GOARCH),$(CGO_ENABLED),-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,$(GOOS),$(GOARCH),0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client$(ARTIFACT_SUFFIX))
-
-.PHONY: client
-client: clean .downloaded_assets validate-go-version
-	$(call windows_go_build,$(GOOS),$(GOARCH),0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client)
-
-.PHONY: macos-amd64
-macos-amd64: clean .downloaded_assets validate-go-version
-	$(call windows_go_build,darwin,amd64,$(CGO_ENABLED),-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,darwin,amd64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client$(ARTIFACT_SUFFIX))
-
-.PHONY: macos-arm64
-macos-arm64: clean .downloaded_assets validate-go-version
-	$(call windows_go_build,darwin,arm64,$(CGO_ENABLED),-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,darwin,arm64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client$(ARTIFACT_SUFFIX))
-
-.PHONY: linux-amd64
-linux-amd64: clean .downloaded_assets validate-go-version
-	$(call windows_go_build,linux,amd64,$(CGO_ENABLED),-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,linux,amd64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client$(ARTIFACT_SUFFIX))
-
-.PHONY: linux-arm64
-linux-arm64: clean .downloaded_assets validate-go-version
-	$(call windows_go_build,linux,arm64,$(CGO_ENABLED),-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,linux,arm64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client$(ARTIFACT_SUFFIX))
-
-.PHONY: windows-amd64
-windows-amd64: clean .downloaded_assets validate-go-version
-	$(call windows_go_build,windows,amd64,$(CGO_ENABLED),-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server$(ARTIFACT_SUFFIX).exe)
-	$(call windows_go_build,windows,amd64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client$(ARTIFACT_SUFFIX).exe)
-
-.PHONY: clients
-clients: clean .downloaded_assets validate-go-version
-	$(call windows_go_build,darwin,amd64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_macos-amd64$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,darwin,arm64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_macos-arm64$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,linux,386,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_linux-386$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,linux,amd64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_linux-amd64$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,linux,arm64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_linux-arm64$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,windows,386,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_windows-386$(ARTIFACT_SUFFIX).exe)
-	$(call windows_go_build,windows,amd64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_windows-amd64$(ARTIFACT_SUFFIX).exe)
-	$(call windows_go_build,windows,arm64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_windows-arm64$(ARTIFACT_SUFFIX).exe)
-	$(call windows_go_build,freebsd,amd64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_freebsd-amd64$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,freebsd,arm64,0,-mod=vendor -trimpath,client,$(LDFLAGS),sliver-client_freebsd-arm64$(ARTIFACT_SUFFIX))
-
-.PHONY: servers
-servers: clean .downloaded_assets validate-go-version
-	$(call windows_go_build,windows,amd64,0,-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server_windows-amd64$(ARTIFACT_SUFFIX).exe)
-	$(call windows_go_build,windows,arm64,0,-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server_windows-arm64$(ARTIFACT_SUFFIX).exe)
-	$(call windows_go_build,linux,amd64,0,-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server_linux-amd64$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,linux,arm64,0,-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server_linux-arm64$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,darwin,arm64,0,-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server_darwin-arm64$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,darwin,amd64,0,-mod=vendor -trimpath,server,$(LDFLAGS),sliver-server_darwin-amd64$(ARTIFACT_SUFFIX))
-
-.PHONY: pb
-pb: validate-pb-compilers
-	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
-	$(call windows_go_build,$(GOOS),$(GOARCH),$(CGO_ENABLED),-mod=vendor,server,$(LDFLAGS_DEBUG),sliver-server$(ARTIFACT_SUFFIX))
-	$(call windows_go_build,$(GOOS),$(GOARCH),0,-mod=vendor,client,$(LDFLAGS_DEBUG),sliver-client$(ARTIFACT_SUFFIX))
-
-.PHONY: validate-pb-compilers
-validate-pb-compilers:
-	@for %%P in ($(PB_COMPILERS)) do @where.exe %%P >NUL || (echo Missing protobuf util %%P in PATH & exit /b 1)
-
-validate-go-version:
-	@if $(GO_MAJOR_VERSION) GTR $(MIN_SUPPORTED_GO_MAJOR_VERSION) (exit /b 0) else if $(GO_MAJOR_VERSION) LSS $(MIN_SUPPORTED_GO_MAJOR_VERSION) (echo $(GO_VERSION_VALIDATION_ERR_MSG) & exit /b 1) else if $(GO_MINOR_VERSION) LSS $(MIN_SUPPORTED_GO_MINOR_VERSION) (echo $(GO_VERSION_VALIDATION_ERR_MSG) & exit /b 1)
-
-.PHONY: clean-all
-clean-all: clean
-	-rmdir /S /Q server\assets\fs\darwin\amd64
-	-rmdir /S /Q server\assets\fs\darwin\arm64
-	-rmdir /S /Q server\assets\fs\windows\amd64
-	-rmdir /S /Q server\assets\fs\linux\amd64
-	-del /Q /F server\assets\fs\*.zip 2>NUL
-	-del /Q /F .downloaded_assets 2>NUL
-
-.PHONY: clean
-clean:
-	-del /Q /F sliver-client sliver-client_* sliver-server sliver-server_* sliver-*.exe 2>NUL
-
-.downloaded_assets:
-	$(call windows_exec,$(ENV),"$(GO)" run -mod=vendor ./util/cmd/assets)
-	@type NUL > .downloaded_assets
-
-endif
+.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: clean .downloaded_assets validate-go-version
+	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=windows GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_windows-arm64$(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: 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
+	rm -rf ./server/assets/fs/darwin/arm64
+	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:
+	$(ENV) $(GO) run -mod=vendor ./util/cmd/assets
+	touch ./.downloaded_assets

README.md

@@ -4,9 +4,7 @@ Sliver is an open source cross-platform adversary emulation/red team framework,
 
 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) [![golangci-lint](https://github.com/BishopFox/sliver/actions/workflows/golangci-lint.yml/badge.svg)](https://github.com/BishopFox/sliver/actions/workflows/golangci-lint.yml) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-
-Visit [https://sliver.sh/](https://sliver.sh/) for tutorials and documentation.
+[![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)
 
 ### Features
 

client/assets/assets.go

@@ -115,7 +115,7 @@ func Setup(force bool, echo bool) {
 	if force || localVer == "" || localVer != ver.GitCommit {
 		if echo {
 			fmt.Printf(`
-Sliver  Copyright (C) 2026  Bishop Fox
+Sliver  Copyright (C) 2025  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.`)
@@ -124,5 +124,4 @@ under certain conditions; type 'licenses' for details.`)
 		saveAssetVersion(appDir)
 	}
 	_, _ = LoadSettings()
-	_, _ = LoadSpoofMetadataConfig()
 }

client/assets/config.go

@@ -34,25 +34,15 @@ const (
 	ConfigDirName = "configs"
 )
 
-// ClientWGConfig - Optional WireGuard wrapper configuration for multiplayer.
-type ClientWGConfig struct {
-	ServerPubKey     string `json:"server_pub_key"`
-	ClientPrivateKey string `json:"client_private_key"`
-	ClientPubKey     string `json:"client_pub_key"`
-	ClientIP         string `json:"client_ip"`
-	ServerIP         string `json:"server_ip"`
-}
-
 // ClientConfig - Client JSON config
 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"`
-	WG            *ClientWGConfig `json:"wg,omitempty"`
+	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"`
 }
 
 // GetConfigDir - Returns the path to the config dir

client/assets/settings.go

@@ -22,7 +22,6 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"gopkg.in/yaml.v3"
 )
@@ -32,18 +31,6 @@ const (
 	settingsLegacyFileName = "tui-settings.json"
 )
 
-const (
-	// Accepted values for tui-settings.yaml "prompt:":
-	// - host: show "[host]" prefix on sliver-client, "[server]" on server console
-	// - operator-host: show "[operator@host]" prefix on sliver-client, "[server]" on server console
-	// - basic: show "sliver >" (no prefix)
-	// - custom: render full prompt from prompt_template
-	PromptStyleHost         = "host"
-	PromptStyleOperatorHost = "operator-host"
-	PromptStyleBasic        = "basic"
-	PromptStyleCustom       = "custom"
-)
-
 // ClientSettings - Client JSON config
 type ClientSettings struct {
 	TableStyle        string `json:"tables" yaml:"tables"`
@@ -54,8 +41,6 @@ type ClientSettings struct {
 	VimMode           bool   `json:"vim_mode" yaml:"vim_mode"`
 	UserConnect       bool   `json:"user_connect" yaml:"user_connect"`
 	ConsoleLogs       bool   `json:"console_logs" yaml:"console_logs"`
-	PromptStyle       string `json:"prompt" yaml:"prompt"`
-	PromptTemplate    string `json:"prompt_template" yaml:"prompt_template"`
 }
 
 // LoadSettings - Load the client settings from disk
@@ -82,8 +67,6 @@ func LoadSettings() (*ClientSettings, error) {
 		return defaultSettings(), err
 	}
 
-	// Ensure any missing/unknown values are coerced to a supported prompt style.
-	settings.PromptStyle = NormalizePromptStyle(settings.PromptStyle)
 	if err := SaveSettings(settings); err != nil {
 		return settings, err
 	}
@@ -95,38 +78,6 @@ func LoadSettings() (*ClientSettings, error) {
 	return settings, nil
 }
 
-// NormalizePromptStyle canonicalizes prompt style strings and returns a safe
-// default if the value is empty/unknown.
-func NormalizePromptStyle(v string) string {
-	switch strings.ToLower(strings.TrimSpace(v)) {
-	case PromptStyleOperatorHost:
-		return PromptStyleOperatorHost
-	case PromptStyleHost:
-		return PromptStyleHost
-	case PromptStyleBasic:
-		return PromptStyleBasic
-	case PromptStyleCustom:
-		return PromptStyleCustom
-
-	// Backward compatible aliases.
-	case "show host":
-		return PromptStyleHost
-	case "show user and host":
-		return PromptStyleOperatorHost
-	case "show operator and host":
-		return PromptStyleOperatorHost
-	case "operator@host":
-		return PromptStyleOperatorHost
-	case "user@host":
-		return PromptStyleOperatorHost
-
-	case "":
-		return PromptStyleHost
-	default:
-		return PromptStyleHost
-	}
-}
-
 func defaultSettings() *ClientSettings {
 	return &ClientSettings{
 		TableStyle:        "SliverDefault",
@@ -136,13 +87,9 @@ func defaultSettings() *ClientSettings {
 		AlwaysOverflow:    false,
 		VimMode:           false,
 		ConsoleLogs:       true,
-		PromptStyle:       PromptStyleHost,
-		PromptTemplate:    DefaultPromptTemplate,
 	}
 }
 
-const DefaultPromptTemplate = `{{- if .IsServer -}}{{ .Styles.Bold.Render "[server]" }} {{ .Styles.Underline.Render "sliver" }}{{ .Target.Suffix }} > {{- else -}}{{- if .Host -}}{{ .Styles.BoldPrimary.Render (printf "[%s]" .Host) }} {{- end -}}{{ .Styles.Underline.Render "sliver" }}{{ .Target.Suffix }} > {{- end -}}`
-
 // SaveSettings - Save the current settings to disk
 func SaveSettings(settings *ClientSettings) error {
 	rootDir, _ := filepath.Abs(GetRootAppDir())

client/assets/settings_test.go

@@ -21,8 +21,6 @@ always_overflow: true
 vim_mode: true
 user_connect: true
 console_logs: false
-prompt: "basic"
-prompt_template: "{{.Host}}"
 `)
 	if err := os.WriteFile(settingsPath, data, 0o600); err != nil {
 		t.Fatalf("failed to write yaml settings: %v", err)
@@ -56,12 +54,6 @@ prompt_template: "{{.Host}}"
 	if settings.ConsoleLogs {
 		t.Fatalf("expected ConsoleLogs false")
 	}
-	if settings.PromptStyle != PromptStyleBasic {
-		t.Fatalf("expected PromptStyle %q, got %q", PromptStyleBasic, settings.PromptStyle)
-	}
-	if settings.PromptTemplate != "{{.Host}}" {
-		t.Fatalf("expected PromptTemplate %q, got %q", "{{.Host}}", settings.PromptTemplate)
-	}
 }
 
 func TestLoadSettingsMigratesLegacyJSON(t *testing.T) {
@@ -79,8 +71,6 @@ func TestLoadSettingsMigratesLegacyJSON(t *testing.T) {
 		VimMode:           true,
 		UserConnect:       true,
 		ConsoleLogs:       false,
-		PromptStyle:       PromptStyleOperatorHost,
-		PromptTemplate:    "{{.Operator}}@{{.Host}} sliver > ",
 	}
 	data, err := json.MarshalIndent(legacy, "", "  ")
 	if err != nil {
@@ -97,12 +87,6 @@ func TestLoadSettingsMigratesLegacyJSON(t *testing.T) {
 	if settings.TableStyle != "Legacy" {
 		t.Fatalf("expected TableStyle %q, got %q", "Legacy", settings.TableStyle)
 	}
-	if settings.PromptStyle != PromptStyleOperatorHost {
-		t.Fatalf("expected PromptStyle %q, got %q", PromptStyleOperatorHost, settings.PromptStyle)
-	}
-	if settings.PromptTemplate != "{{.Operator}}@{{.Host}} sliver > " {
-		t.Fatalf("expected PromptTemplate %q, got %q", "{{.Operator}}@{{.Host}} sliver > ", settings.PromptTemplate)
-	}
 	if _, err := os.Stat(filepath.Join(rootDir, settingsFileName)); err != nil {
 		t.Fatalf("expected yaml settings to exist: %v", err)
 	}
@@ -124,12 +108,6 @@ func TestLoadSettingsWritesDefault(t *testing.T) {
 	if settings.TableStyle != "SliverDefault" {
 		t.Fatalf("expected default TableStyle %q, got %q", "SliverDefault", settings.TableStyle)
 	}
-	if settings.PromptStyle != PromptStyleHost {
-		t.Fatalf("expected default PromptStyle %q, got %q", PromptStyleHost, settings.PromptStyle)
-	}
-	if settings.PromptTemplate != DefaultPromptTemplate {
-		t.Fatalf("expected default PromptTemplate %q, got %q", DefaultPromptTemplate, settings.PromptTemplate)
-	}
 	rootDir, _ := filepath.Abs(GetRootAppDir())
 	if _, err := os.Stat(filepath.Join(rootDir, settingsFileName)); err != nil {
 		t.Fatalf("expected default settings to be written: %v", err)

client/assets/spoof_metadata.go

@@ -1,216 +0,0 @@
-package assets
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2026  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 (
-	"os"
-	"path/filepath"
-
-	"gopkg.in/yaml.v3"
-)
-
-const spoofMetadataFileName = "spoof-metadata.yaml"
-
-const defaultSpoofMetadataConfigTemplate = `# Sliver executable metadata spoofing configuration.
-# Used by generate commands when --spoof-metadata is set.
-#
-# Fields that reference file content support either:
-# - path: read bytes from a local file path
-# - base64: inline base64 file content
-# Do not set both path and base64 for the same object.
-#
-# Example 1: Minimal path-based metadata cloning (most common)
-pe:
-  source:
-    name: metadata-source.exe
-    path: ""
-
-  # Optional icon donor. Reserved for future standalone icon mutation support.
-  icon:
-    name: icon.ico
-    path: ""
-
-  # Example 2: Inline/base64 source (uncomment and remove "path" above)
-  # source:
-  #   name: metadata-source.exe
-  #   base64: "TVqQAAMAAAAEAAAA..."
-
-  # Example 3: Optional PE structure overrides (advanced)
-  # Applied after metadata/resources are cloned from source.
-  # Omitted fields keep cloned values.
-  # resource_directory:
-  #   characteristics: 0
-  #   time_date_stamp: 0
-  #   major_version: 1
-  #   minor_version: 0
-  #   number_of_named_entries: 0
-  #   number_of_id_entries: 0
-  #
-  # resource_directory_entries:
-  #   - name: 1
-  #     offset_to_data: 0
-  #
-  # resource_data_entries:
-  #   - offset_to_data: 0
-  #     size: 0
-  #     code_page: 0
-  #     reserved: 0
-  #
-  # export_directory:
-  #   characteristics: 0
-  #   time_date_stamp: 0
-  #   major_version: 1
-  #   minor_version: 0
-  #   name: 0
-  #   base: 0
-  #   number_of_functions: 0
-  #   number_of_names: 0
-  #   address_of_functions: 0
-  #   address_of_names: 0
-  #   address_of_name_ordinals: 0
-`
-
-// SpoofMetadataConfig stores default metadata spoofing inputs for generate commands.
-type SpoofMetadataConfig struct {
-	PE *PESpoofMetadataConfig `json:"pe,omitempty" yaml:"pe,omitempty"`
-}
-
-// PESpoofMetadataConfig stores PE-specific spoofing inputs.
-type PESpoofMetadataConfig struct {
-	Source *SpoofMetadataDataSource `json:"source,omitempty" yaml:"source,omitempty"`
-	Icon   *SpoofMetadataDataSource `json:"icon,omitempty" yaml:"icon,omitempty"`
-
-	ResourceDirectory        *ImageResourceDirectory        `json:"resource_directory,omitempty" yaml:"resource_directory,omitempty"`
-	ResourceDirectoryEntries []*ImageResourceDirectoryEntry `json:"resource_directory_entries,omitempty" yaml:"resource_directory_entries,omitempty"`
-	ResourceDataEntries      []*ImageResourceDataEntry      `json:"resource_data_entries,omitempty" yaml:"resource_data_entries,omitempty"`
-	ExportDirectory          *ImageExportDirectory          `json:"export_directory,omitempty" yaml:"export_directory,omitempty"`
-}
-
-// SpoofMetadataDataSource points to bytes that should be sent to the server.
-// Either Path or Base64 may be set.
-type SpoofMetadataDataSource struct {
-	Name   string `json:"name,omitempty" yaml:"name,omitempty"`
-	Path   string `json:"path,omitempty" yaml:"path,omitempty"`
-	Base64 string `json:"base64,omitempty" yaml:"base64,omitempty"`
-}
-
-type ImageResourceDirectory struct {
-	Characteristics      uint32 `json:"characteristics,omitempty" yaml:"characteristics,omitempty"`
-	TimeDateStamp        uint32 `json:"time_date_stamp,omitempty" yaml:"time_date_stamp,omitempty"`
-	MajorVersion         uint32 `json:"major_version,omitempty" yaml:"major_version,omitempty"`
-	MinorVersion         uint32 `json:"minor_version,omitempty" yaml:"minor_version,omitempty"`
-	NumberOfNamedEntries uint32 `json:"number_of_named_entries,omitempty" yaml:"number_of_named_entries,omitempty"`
-	NumberOfIDEntries    uint32 `json:"number_of_id_entries,omitempty" yaml:"number_of_id_entries,omitempty"`
-}
-
-type ImageResourceDirectoryEntry struct {
-	Name         uint32 `json:"name,omitempty" yaml:"name,omitempty"`
-	OffsetToData uint32 `json:"offset_to_data,omitempty" yaml:"offset_to_data,omitempty"`
-}
-
-type ImageResourceDataEntry struct {
-	OffsetToData uint32 `json:"offset_to_data,omitempty" yaml:"offset_to_data,omitempty"`
-	Size         uint32 `json:"size,omitempty" yaml:"size,omitempty"`
-	CodePage     uint32 `json:"code_page,omitempty" yaml:"code_page,omitempty"`
-	Reserved     uint32 `json:"reserved,omitempty" yaml:"reserved,omitempty"`
-}
-
-type ImageExportDirectory struct {
-	Characteristics       uint32 `json:"characteristics,omitempty" yaml:"characteristics,omitempty"`
-	TimeDateStamp         uint32 `json:"time_date_stamp,omitempty" yaml:"time_date_stamp,omitempty"`
-	MajorVersion          uint32 `json:"major_version,omitempty" yaml:"major_version,omitempty"`
-	MinorVersion          uint32 `json:"minor_version,omitempty" yaml:"minor_version,omitempty"`
-	Name                  uint32 `json:"name,omitempty" yaml:"name,omitempty"`
-	Base                  uint32 `json:"base,omitempty" yaml:"base,omitempty"`
-	NumberOfFunctions     uint32 `json:"number_of_functions,omitempty" yaml:"number_of_functions,omitempty"`
-	NumberOfNames         uint32 `json:"number_of_names,omitempty" yaml:"number_of_names,omitempty"`
-	AddressOfFunctions    uint32 `json:"address_of_functions,omitempty" yaml:"address_of_functions,omitempty"`
-	AddressOfNames        uint32 `json:"address_of_names,omitempty" yaml:"address_of_names,omitempty"`
-	AddressOfNameOrdinals uint32 `json:"address_of_name_ordinals,omitempty" yaml:"address_of_name_ordinals,omitempty"`
-}
-
-// SpoofMetadataConfigPath returns the spoof metadata config file path.
-func SpoofMetadataConfigPath() string {
-	rootDir, _ := filepath.Abs(GetRootAppDir())
-	return filepath.Join(rootDir, spoofMetadataFileName)
-}
-
-// LoadSpoofMetadataConfig loads spoof metadata config from disk, writing defaults
-// if the file is missing.
-func LoadSpoofMetadataConfig() (*SpoofMetadataConfig, error) {
-	config := defaultSpoofMetadataConfig()
-	configPath := SpoofMetadataConfigPath()
-
-	data, err := os.ReadFile(configPath)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return defaultSpoofMetadataConfig(), err
-		}
-		if err := os.WriteFile(configPath, []byte(defaultSpoofMetadataConfigTemplate), 0o600); err != nil {
-			return defaultSpoofMetadataConfig(), err
-		}
-		data = []byte(defaultSpoofMetadataConfigTemplate)
-	}
-	if err := yaml.Unmarshal(data, config); err != nil {
-		return defaultSpoofMetadataConfig(), err
-	}
-
-	normalizeSpoofMetadataConfig(config)
-	return config, nil
-}
-
-// SaveSpoofMetadataConfig writes spoof metadata config to disk.
-func SaveSpoofMetadataConfig(config *SpoofMetadataConfig) error {
-	if config == nil {
-		config = defaultSpoofMetadataConfig()
-	}
-	normalizeSpoofMetadataConfig(config)
-	data, err := yaml.Marshal(config)
-	if err != nil {
-		return err
-	}
-	return os.WriteFile(SpoofMetadataConfigPath(), data, 0o600)
-}
-
-func normalizeSpoofMetadataConfig(config *SpoofMetadataConfig) {
-	if config.PE == nil {
-		config.PE = &PESpoofMetadataConfig{}
-	}
-	if config.PE.Source == nil {
-		config.PE.Source = &SpoofMetadataDataSource{Name: "metadata-source.exe"}
-	}
-	if config.PE.Icon == nil {
-		config.PE.Icon = &SpoofMetadataDataSource{Name: "icon.ico"}
-	}
-}
-
-func defaultSpoofMetadataConfig() *SpoofMetadataConfig {
-	return &SpoofMetadataConfig{
-		PE: &PESpoofMetadataConfig{
-			Source: &SpoofMetadataDataSource{
-				Name: "metadata-source.exe",
-				Path: "",
-			},
-			Icon: &SpoofMetadataDataSource{
-				Name: "icon.ico",
-				Path: "",
-			},
-		},
-	}
-}

client/cli/cli.go

@@ -52,7 +52,6 @@ func init() {
 
 	rootCmd.TraverseChildren = true
 	rootCmd.Flags().String(RCFlagName, "", "path to rc script file")
-	rootCmd.PersistentFlags().Bool(enableWGFlag, false, "connect to multiplayer through the operator config's WireGuard wrapper")
 
 	// 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

client/cli/config.go

@@ -26,16 +26,16 @@ import (
 	"github.com/bishopfox/sliver/client/forms"
 )
 
-func selectConfig() (string, *assets.ClientConfig) {
+func selectConfig() *assets.ClientConfig {
 	configs := assets.GetConfigs()
 
 	if len(configs) == 0 {
-		return "", nil
+		return nil
 	}
 
 	if len(configs) == 1 {
-		for key, config := range configs {
-			return key, config
+		for _, config := range configs {
+			return config
 		}
 	}
 
@@ -49,8 +49,8 @@ func selectConfig() (string, *assets.ClientConfig) {
 	err := forms.Select("Select a server:", keys, &selection)
 	if err != nil {
 		fmt.Println(err.Error())
-		return "", nil
+		return nil
 	}
 
-	return selection, configs[selection]
+	return configs[selection]
 }

client/cli/connect_spinner.go

@@ -1,177 +0,0 @@
-package cli
-
-import (
-	"fmt"
-	"io"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	bspinner "charm.land/bubbles/v2/spinner"
-	"github.com/bishopfox/sliver/client/transport"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"google.golang.org/grpc"
-)
-
-const (
-	minConnectSpinnerDuration = 900 * time.Millisecond
-	minConnectStatusDuration  = 350 * time.Millisecond
-)
-
-type connectResult struct {
-	rpc  rpcpb.SliverRPCClient
-	conn *grpc.ClientConn
-	err  error
-}
-
-func connectWithSpinner(out io.Writer, target string, connect func(transport.ConnectStatusFn) (rpcpb.SliverRPCClient, *grpc.ClientConn, error)) (rpcpb.SliverRPCClient, *grpc.ClientConn, error) {
-	statusCh := make(chan string, 8)
-	resultCh := make(chan connectResult, 1)
-
-	go func() {
-		rpc, conn, err := connect(func(status string) {
-			sendStatus(statusCh, status)
-		})
-		resultCh <- connectResult{rpc: rpc, conn: conn, err: err}
-	}()
-
-	currentStatus := ""
-	currentStatusSince := time.Time{}
-	queuedStatus := ""
-	lastWidth := 0
-	spinner := bspinner.New(bspinner.WithSpinner(bspinner.Line))
-	ticker := time.NewTicker(spinner.Spinner.FPS)
-	defer ticker.Stop()
-	startedAt := time.Now()
-	var pendingResult *connectResult
-
-	setStatus := func(status string) {
-		status = strings.TrimSpace(status)
-		if status == "" || status == currentStatus {
-			return
-		}
-		currentStatus = status
-		currentStatusSince = time.Now()
-	}
-
-	stageStatus := func(status string) {
-		status = strings.TrimSpace(status)
-		if status == "" {
-			return
-		}
-		if currentStatus == "" || time.Since(currentStatusSince) >= minConnectStatusDuration {
-			queuedStatus = ""
-			setStatus(status)
-			return
-		}
-		queuedStatus = status
-	}
-
-	flushQueuedStatus := func() {
-		if queuedStatus == "" || time.Since(currentStatusSince) < minConnectStatusDuration {
-			return
-		}
-		nextStatus := queuedStatus
-		queuedStatus = ""
-		setStatus(nextStatus)
-	}
-
-	canReturnPendingResult := func() bool {
-		if pendingResult == nil {
-			return false
-		}
-		if pendingResult.err != nil {
-			return true
-		}
-		if time.Since(startedAt) < minConnectSpinnerDuration {
-			return false
-		}
-		if queuedStatus != "" {
-			return false
-		}
-		if !currentStatusSince.IsZero() && time.Since(currentStatusSince) < minConnectStatusDuration {
-			return false
-		}
-		return true
-	}
-
-	render := func() {
-		line := fmt.Sprintf("%s %s", spinner.View(), formatConnectSpinnerMessage(target, currentStatus))
-		lastWidth = writeSpinnerLine(out, line, lastWidth)
-	}
-
-	render()
-	for {
-		select {
-		case status := <-statusCh:
-			stageStatus(status)
-			spinner, _ = spinner.Update(spinner.Tick())
-			render()
-
-		case result := <-resultCh:
-			pendingResult = &result
-
-		case <-ticker.C:
-			spinner, _ = spinner.Update(spinner.Tick())
-			flushQueuedStatus()
-			render()
-			if canReturnPendingResult() {
-				result := *pendingResult
-				pendingResult = nil
-				clearSpinnerLine(out, lastWidth)
-				return result.rpc, result.conn, result.err
-			}
-		}
-
-		if pendingResult != nil && pendingResult.err != nil {
-			result := *pendingResult
-			pendingResult = nil
-			clearSpinnerLine(out, lastWidth)
-			return result.rpc, result.conn, result.err
-		}
-	}
-}
-
-func sendStatus(statusCh chan string, status string) {
-	status = strings.TrimSpace(status)
-	if status == "" {
-		return
-	}
-	statusCh <- status
-}
-
-func formatConnectSpinnerMessage(target string, status string) string {
-	target = strings.TrimSpace(target)
-	status = strings.TrimSpace(status)
-
-	if target == "" {
-		if status == "" {
-			return "Connecting ..."
-		}
-		return fmt.Sprintf("Connecting (%s) ...", status)
-	}
-	if status == "" {
-		return fmt.Sprintf("Connecting to %s ...", target)
-	}
-	return fmt.Sprintf("Connecting to %s (%s) ...", target, status)
-}
-
-func writeSpinnerLine(out io.Writer, line string, lastWidth int) int {
-	width := utf8.RuneCountInString(line)
-	padding := ""
-	if lastWidth > width {
-		padding = strings.Repeat(" ", lastWidth-width)
-	}
-	fmt.Fprintf(out, "\r%s%s", line, padding)
-	if width > lastWidth {
-		return width
-	}
-	return lastWidth
-}
-
-func clearSpinnerLine(out io.Writer, lastWidth int) {
-	if lastWidth <= 0 {
-		return
-	}
-	fmt.Fprintf(out, "\r%s\r", strings.Repeat(" ", lastWidth))
-}

client/cli/connect_spinner_test.go

@@ -1,132 +0,0 @@
-package cli
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/bishopfox/sliver/client/transport"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"google.golang.org/grpc"
-)
-
-func TestFormatConnectSpinnerMessage(t *testing.T) {
-	tests := []struct {
-		name   string
-		target string
-		status string
-		want   string
-	}{
-		{
-			name:   "target only",
-			target: "127.0.0.1:31337",
-			want:   "Connecting to 127.0.0.1:31337 ...",
-		},
-		{
-			name:   "target with status",
-			target: "127.0.0.1:31337",
-			status: "wireguard",
-			want:   "Connecting to 127.0.0.1:31337 (wireguard) ...",
-		},
-		{
-			name:   "status without target",
-			status: "grpc/mtls",
-			want:   "Connecting (grpc/mtls) ...",
-		},
-		{
-			name:   "trim whitespace",
-			target: " 127.0.0.1:31337 ",
-			status: " grpc/mtls over wireguard ",
-			want:   "Connecting to 127.0.0.1:31337 (grpc/mtls over wireguard) ...",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			if got := formatConnectSpinnerMessage(test.target, test.status); got != test.want {
-				t.Fatalf("expected %q, got %q", test.want, got)
-			}
-		})
-	}
-}
-
-func TestConnectWithSpinnerOutput(t *testing.T) {
-	var out bytes.Buffer
-	spinnerDelay := 2 * (100 * time.Millisecond)
-
-	_, _, err := connectWithSpinner(&out, "127.0.0.1:31337", func(statusFn transport.ConnectStatusFn) (rpcpb.SliverRPCClient, *grpc.ClientConn, error) {
-		statusFn("wireguard")
-		time.Sleep(spinnerDelay)
-		statusFn("grpc/mtls over wireguard")
-		time.Sleep(spinnerDelay)
-		return nil, nil, nil
-	})
-	if err != nil {
-		t.Fatalf("connectWithSpinner returned error: %v", err)
-	}
-
-	got := out.String()
-	if !strings.Contains(got, "Connecting to 127.0.0.1:31337 (wireguard) ...") {
-		t.Fatalf("expected wireguard status in output, got %q", got)
-	}
-	if !strings.Contains(got, "Connecting to 127.0.0.1:31337 (grpc/mtls over wireguard) ...") {
-		t.Fatalf("expected grpc over wireguard status in output, got %q", got)
-	}
-	frameCount := 0
-	for _, frame := range []string{"|", "/", "-", "\\"} {
-		if strings.Contains(got, frame+" Connecting to 127.0.0.1:31337") {
-			frameCount++
-		}
-	}
-	if frameCount < 2 {
-		t.Fatalf("expected multiple spinner frames in output, got %q", got)
-	}
-}
-
-func TestConnectWithSpinnerFastSuccessStillShowsMultipleFrames(t *testing.T) {
-	var out bytes.Buffer
-
-	_, _, err := connectWithSpinner(&out, "127.0.0.1:31337", func(statusFn transport.ConnectStatusFn) (rpcpb.SliverRPCClient, *grpc.ClientConn, error) {
-		statusFn("grpc/mtls")
-		return nil, nil, nil
-	})
-	if err != nil {
-		t.Fatalf("connectWithSpinner returned error: %v", err)
-	}
-
-	got := out.String()
-	frameCount := 0
-	for _, frame := range []string{"|", "/", "-", "\\"} {
-		if strings.Contains(got, frame+" Connecting to 127.0.0.1:31337 (grpc/mtls) ...") {
-			frameCount++
-		}
-	}
-	if frameCount < 2 {
-		t.Fatalf("expected multiple spinner frames for fast success, got %q", got)
-	}
-}
-
-func TestConnectWithSpinnerFastSuccessShowsEachStatus(t *testing.T) {
-	var out bytes.Buffer
-
-	_, _, err := connectWithSpinner(&out, "127.0.0.1:31337", func(statusFn transport.ConnectStatusFn) (rpcpb.SliverRPCClient, *grpc.ClientConn, error) {
-		statusFn("wireguard")
-		statusFn("grpc/mtls over wireguard")
-		return nil, nil, nil
-	})
-	if err != nil {
-		t.Fatalf("connectWithSpinner returned error: %v", err)
-	}
-
-	got := out.String()
-	if !strings.Contains(got, "Connecting to 127.0.0.1:31337 (wireguard) ...") {
-		t.Fatalf("expected fast success output to include wireguard status, got %q", got)
-	}
-	if !strings.Contains(got, "Connecting to 127.0.0.1:31337 (grpc/mtls over wireguard) ...") {
-		t.Fatalf("expected fast success output to include grpc over wireguard status, got %q", got)
-	}
-	if strings.Contains(got, "Connected to 127.0.0.1:31337") {
-		t.Fatalf("did not expect past-tense success output, got %q", got)
-	}
-}

client/cli/connection_lost.go

@@ -1,26 +0,0 @@
-package cli
-
-import (
-	"context"
-	"fmt"
-	"os"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/connectivity"
-)
-
-func handleConnectionLost(ln *grpc.ClientConn) {
-	if ln == nil {
-		return
-	}
-	currentState := ln.GetState()
-	// currentState should be "Ready" when the connection is established.
-	if ln.WaitForStateChange(context.Background(), currentState) {
-		newState := ln.GetState()
-		// newState will be "Idle" if the connection is lost.
-		if newState == connectivity.Idle {
-			fmt.Println("\nLost connection to server. Exiting now.")
-			os.Exit(1)
-		}
-	}
-}

client/cli/console.go

@@ -19,6 +19,7 @@ package cli
 */
 
 import (
+	"context"
 	"fmt"
 	"os"
 
@@ -29,6 +30,7 @@ import (
 	"github.com/bishopfox/sliver/protobuf/rpcpb"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/connectivity"
 )
 
 // consoleCmd generates the console with required pre/post runners.
@@ -44,17 +46,16 @@ func consoleCmd(con *console.SliverClient) *cobra.Command {
 }
 
 func consoleRunnerCmd(con *console.SliverClient, run bool) (pre, post func(cmd *cobra.Command, args []string) error) {
+	var ln *grpc.ClientConn
+
 	pre = func(cmd *cobra.Command, _ []string) error {
-		if err := applyMultiplayerConnectMode(cmd); err != nil {
-			return err
-		}
 
 		configs := assets.GetConfigs()
 		if len(configs) == 0 {
 			fmt.Printf("No config files found at %s (see --help)\n", assets.GetConfigDir())
 			return nil
 		}
-		configKey, config := selectConfig()
+		config := selectConfig()
 		if config == nil {
 			return nil
 		}
@@ -65,29 +66,46 @@ func consoleRunnerCmd(con *console.SliverClient, run bool) (pre, post func(cmd *
 			return nil
 		}
 
-		target := fmt.Sprintf("%s:%d", config.LHost, config.LPort)
-		var rpc rpcpb.SliverRPCClient
-		var ln *grpc.ClientConn
-
 		// Don't clobber output when simply running an implant command from system shell.
 		if run {
-			rpc, ln, err = connectWithSpinner(os.Stdout, target, func(statusFn transport.ConnectStatusFn) (rpcpb.SliverRPCClient, *grpc.ClientConn, error) {
-				return transport.MTLSConnectWithStatus(config, statusFn)
-			})
-		} else {
-			rpc, ln, err = transport.MTLSConnect(config)
+			fmt.Printf("Connecting to %s:%d ...\n", config.LHost, config.LPort)
 		}
+
+		var rpc rpcpb.SliverRPCClient
+
+		rpc, ln, err = transport.MTLSConnect(config)
 		if err != nil {
-			fmt.Printf("Connection to server failed %s\n", err)
+			fmt.Printf("Connection to server failed %s", err)
 			return nil
 		}
-		return console.StartClient(con, rpc, ln, &console.ConnectionDetails{ConfigKey: configKey, Config: config}, command.ServerCommands(con, nil), command.SliverCommands(con), run, rcScript)
+
+		// Wait for any connection state changes and exit if the connection is lost.
+		go handleConnectionLost(ln)
+
+		return console.StartClient(con, rpc, command.ServerCommands(con, nil), command.SliverCommands(con), run, rcScript)
 	}
 
 	// Close the RPC connection once exiting
 	post = func(_ *cobra.Command, _ []string) error {
-		return con.CloseConnection()
+		if ln != nil {
+			return ln.Close()
+		}
+
+		return nil
 	}
 
 	return pre, post
 }
+
+func handleConnectionLost(ln *grpc.ClientConn) {
+	currentState := ln.GetState()
+	// currentState should be "Ready" when the connection is established.
+	if ln.WaitForStateChange(context.Background(), currentState) {
+		newState := ln.GetState()
+		// newState will be "Idle" if the connection is lost.
+		if newState == connectivity.Idle {
+			fmt.Println("\nLost connection to server. Exiting now.")
+			os.Exit(1)
+		}
+	}
+}

client/cli/mcp.go

@@ -43,10 +43,6 @@ func mcpCmd(con *console.SliverClient) *cobra.Command {
 }
 
 func runMCP(cmd *cobra.Command, con *console.SliverClient) error {
-	if err := applyMultiplayerConnectMode(cmd); err != nil {
-		return err
-	}
-
 	configPath, _ := cmd.Flags().GetString("config")
 	config, err := loadMCPClientConfig(configPath)
 	if err != nil {
@@ -59,7 +55,7 @@ func runMCP(cmd *cobra.Command, con *console.SliverClient) error {
 		fmt.Printf("Connection to server failed %s\n", err)
 		return nil
 	}
-	defer transport.CloseGRPCConnection(ln)
+	defer ln.Close()
 
 	con.Rpc = rpc
 	go handleConnectionLost(ln)

client/cli/transport_mode.go

@@ -1,29 +0,0 @@
-package cli
-
-import (
-	"github.com/bishopfox/sliver/client/transport"
-	"github.com/spf13/cobra"
-)
-
-const (
-	enableWGFlag = "enable-wg"
-)
-
-func applyMultiplayerConnectMode(cmd *cobra.Command) error {
-	if cmd == nil {
-		transport.SetMultiplayerConnectMode(transport.MultiplayerConnectDirect)
-		return nil
-	}
-
-	enableWG, err := cmd.Flags().GetBool(enableWGFlag)
-	if err != nil {
-		return err
-	}
-
-	mode := transport.MultiplayerConnectDirect
-	if enableWG {
-		mode = transport.MultiplayerConnectEnableWG
-	}
-	transport.SetMultiplayerConnectMode(mode)
-	return nil
-}

client/command/README.md

@@ -12,7 +12,6 @@ Shared registration glue, scaffolding, and helpers for Sliver client console com
 
 ## Sub-packages
 
-- `ai/` – Implements the 'ai' Bubble Tea layout preview command for the Sliver client console.
 - `alias/` – Implements the 'alias' command group for the Sliver client console.
 - `armory/` – Implements the 'armory' command group for the Sliver client console.
 - `backdoor/` – Implements the 'backdoor' command group for the Sliver client console.
@@ -26,7 +25,6 @@ Shared registration glue, scaffolding, and helpers for Sliver client console com
 - `creds/` – Implements the 'creds' command group for the Sliver client console.
 - `cursed/` – Implements the 'cursed' command group for the Sliver client console.
 - `dllhijack/` – Implements the 'dllhijack' command group for the Sliver client console.
-- `edit/` – Implements the 'edit' command for the Sliver client console.
 - `environment/` – Implements the 'environment' command group for the Sliver client console.
 - `exec/` – Implements the 'exec' command group for the Sliver client console.
 - `exit/` – Implements the 'exit' command group for the Sliver client console.

client/command/ai/README.md

@@ -1,5 +0,0 @@
-# client/command/ai
-
-Implements the `ai` command for the Sliver client console.
-
-The TUI loads server-backed AI conversation threads over gRPC, submits prompts to the server, and refreshes when `AIConversationEvent` updates arrive with assistant replies or failure messages.

client/command/ai/ai.go

@@ -1,242 +0,0 @@
-package ai
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2026  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"
-
-	tea "charm.land/bubbletea/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/termio"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/charmbracelet/colorprofile"
-	"github.com/spf13/cobra"
-	"golang.org/x/term"
-)
-
-var openAIProgramTTY = tea.OpenTTY
-
-// AICmd launches the AI conversation TUI.
-func AICmd(_ *cobra.Command, con *console.SliverClient, _ []string) {
-	if con == nil || con.Rpc == nil {
-		if con != nil {
-			con.PrintErrorf("Connect to a server before using `ai`.\n")
-		}
-		return
-	}
-
-	listenerID, listener := con.CreateEventListener()
-	defer con.RemoveEventListener(listenerID)
-	restoreEventNotifications := con.SuppressEventNotifications()
-	defer restoreEventNotifications()
-
-	model := newAIModel(con, buildAIContext(con), listener)
-	model.showExperimentalWarningModal()
-
-	width, height := 100, 30
-	if w, h, err := term.GetSize(0); err == nil && w > 0 && h > 0 {
-		width, height = w, h
-	}
-
-	opts := []tea.ProgramOption{
-		tea.WithWindowSize(width, height),
-		tea.WithColorProfile(colorprofile.TrueColor),
-	}
-	ttyOpts, cleanup := configureAIProgramTTY()
-	if cleanup != nil {
-		defer cleanup()
-	}
-	opts = append(opts, ttyOpts...)
-
-	program := tea.NewProgram(model, opts...)
-	if _, err := program.Run(); err != nil {
-		con.PrintErrorf("AI TUI error: %s\n", err)
-	}
-}
-
-// Console logging can swap stdout/stderr to pipes so session output can be tee'd
-// to disk. Bubble Tea needs a real TTY output to enable terminal features like
-// mouse reporting, so bind the AI TUI back to the interactive terminal when
-// stdout is no longer the controlling TTY.
-func configureAIProgramTTY() ([]tea.ProgramOption, func()) {
-	stdinTTY := isAITTY(os.Stdin)
-	stdoutTTY := isAITTY(os.Stdout)
-
-	switch {
-	case !stdinTTY || stdoutTTY:
-		return nil, nil
-
-	case isAITTY(termio.InteractiveInput()) && isAITTY(termio.InteractiveOutput()):
-		return []tea.ProgramOption{
-			tea.WithInput(termio.InteractiveInput()),
-			tea.WithOutput(termio.InteractiveOutput()),
-		}, nil
-
-	default:
-		inTTY, outTTY, err := openAIProgramTTY()
-		if err != nil {
-			return nil, nil
-		}
-		return []tea.ProgramOption{
-				tea.WithInput(inTTY),
-				tea.WithOutput(outTTY),
-			}, func() {
-				_ = inTTY.Close()
-				if outTTY != inTTY {
-					_ = outTTY.Close()
-				}
-			}
-	}
-}
-
-func isAITTY(file *os.File) bool {
-	return file != nil && term.IsTerminal(int(file.Fd()))
-}
-
-type aiContext struct {
-	target     aiTargetSummary
-	connection aiConnectionSummary
-	status     string
-}
-
-type aiTargetSummary struct {
-	SessionID string
-	BeaconID  string
-	Label     string
-	Host      string
-	OS        string
-	Arch      string
-	C2        string
-	Mode      string
-	Details   []string
-}
-
-type aiConnectionSummary struct {
-	Profile  string
-	Server   string
-	Operator string
-	State    string
-}
-
-func defaultAITargetSummary() aiTargetSummary {
-	return aiTargetSummary{
-		Label: "No active target",
-		Host:  "Select a session or beacon with `use` or ctrl+s",
-		Mode:  "offline preview",
-		C2:    "n/a",
-		OS:    "unknown",
-		Arch:  "unknown",
-	}
-}
-
-func aiSessionTargetSummary(session *clientpb.Session) aiTargetSummary {
-	if session == nil {
-		return defaultAITargetSummary()
-	}
-
-	return aiTargetSummary{
-		SessionID: session.ID,
-		Label:     fmt.Sprintf("Session %s", fallback(session.Name, session.ID)),
-		Host:      fallback(session.Hostname, "<unknown host>"),
-		OS:        fallback(session.OS, "unknown"),
-		Arch:      fallback(session.Arch, "unknown"),
-		C2:        fallback(session.ActiveC2, "unknown"),
-		Mode:      "interactive session",
-		Details: []string{
-			fmt.Sprintf("User: %s", fallback(session.Username, "<unknown>")),
-			fmt.Sprintf("PID: %d", session.PID),
-			fmt.Sprintf("Remote: %s", fallback(session.RemoteAddress, "<unknown>")),
-		},
-	}
-}
-
-func aiBeaconTargetSummary(beacon *clientpb.Beacon) aiTargetSummary {
-	if beacon == nil {
-		return defaultAITargetSummary()
-	}
-
-	return aiTargetSummary{
-		BeaconID: beacon.ID,
-		Label:    fmt.Sprintf("Beacon %s", fallback(beacon.Name, beacon.ID)),
-		Host:     fallback(beacon.Hostname, "<unknown host>"),
-		OS:       fallback(beacon.OS, "unknown"),
-		Arch:     fallback(beacon.Arch, "unknown"),
-		C2:       fallback(beacon.ActiveC2, "unknown"),
-		Mode:     "asynchronous beacon",
-		Details: []string{
-			fmt.Sprintf("User: %s", fallback(beacon.Username, "<unknown>")),
-			fmt.Sprintf("PID: %d", beacon.PID),
-			fmt.Sprintf("Remote: %s", fallback(beacon.RemoteAddress, "<unknown>")),
-			fmt.Sprintf("Interval: %s", time.Duration(beacon.Interval).String()),
-			fmt.Sprintf("Next checkin: %s", formatUnix(beacon.NextCheckin)),
-		},
-	}
-}
-
-func buildAIContext(con *console.SliverClient) aiContext {
-	ctx := aiContext{
-		target: defaultAITargetSummary(),
-		connection: aiConnectionSummary{
-			Profile:  "<disconnected>",
-			Server:   "<unknown>",
-			Operator: "<unknown>",
-			State:    "idle",
-		},
-		status: "Loading AI conversations from the server...",
-	}
-
-	if con != nil {
-		if details, state, ok := con.CurrentConnection(); ok {
-			ctx.connection.State = strings.ToLower(state.String())
-			if details != nil && details.Config != nil {
-				ctx.connection.Profile = fallback(details.ConfigKey, "<profile unavailable>")
-				ctx.connection.Server = fmt.Sprintf("%s:%d", details.Config.LHost, details.Config.LPort)
-				ctx.connection.Operator = fallback(details.Config.Operator, "<unknown>")
-			}
-		}
-
-		session, beacon := con.ActiveTarget.Get()
-		switch {
-		case session != nil:
-			ctx.target = aiSessionTargetSummary(session)
-		case beacon != nil:
-			ctx.target = aiBeaconTargetSummary(beacon)
-		}
-	}
-
-	return ctx
-}
-
-func fallback(value, def string) string {
-	value = strings.TrimSpace(value)
-	if value == "" {
-		return def
-	}
-	return value
-}
-
-func formatUnix(ts int64) string {
-	if ts <= 0 {
-		return "<unknown>"
-	}
-	return time.Unix(ts, 0).Local().Format("2006-01-02 15:04:05")
-}

client/command/ai/commands.go

@@ -1,49 +0,0 @@
-package ai
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2026  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/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/spf13/cobra"
-)
-
-// Commands returns the ai command.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	return []*cobra.Command{newAICommand(consts.SliverCoreHelpGroup, con)}
-}
-
-// ServerCommands returns the ai command for the top-level client REPL.
-func ServerCommands(con *console.SliverClient) []*cobra.Command {
-	return []*cobra.Command{newAICommand(consts.GenericHelpGroup, con)}
-}
-
-func newAICommand(groupID string, con *console.SliverClient) *cobra.Command {
-	return &cobra.Command{
-		Use:     consts.AIStr,
-		Short:   "Open the Sliver AI conversation TUI",
-		Long:    help.GetHelpFor([]string{consts.AIStr}),
-		Args:    cobra.NoArgs,
-		GroupID: groupID,
-		Run: func(cmd *cobra.Command, args []string) {
-			AICmd(cmd, con, args)
-		},
-	}
-}

client/command/ai/grpc_test.go

@@ -1,591 +0,0 @@
-package ai
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2026  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"
-	"net"
-	"sync"
-	"testing"
-
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/grpc/test/bufconn"
-	"google.golang.org/protobuf/proto"
-)
-
-func TestLoadAIStateCmdLoadsConversationOverRPC(t *testing.T) {
-	server := &aiRPCServer{
-		providersResp: &clientpb.AIProviderConfigs{
-			Providers: []*clientpb.AIProviderConfig{{Name: "openai", Configured: true}},
-			Config: &clientpb.AIConfigSummary{
-				Provider: "openai",
-				Model:    "gpt-test",
-				Valid:    true,
-			},
-		},
-		conversationsResp: &clientpb.AIConversations{
-			Conversations: []*clientpb.AIConversation{
-				{ID: "conv-1", Provider: "openai", Model: "gpt-test", Title: "First"},
-				{ID: "conv-2", Provider: "openai", Model: "gpt-test", Title: "Second"},
-			},
-		},
-		conversationByID: map[string]*clientpb.AIConversation{
-			"conv-1": {
-				ID:       "conv-1",
-				Provider: "openai",
-				Model:    "gpt-test",
-				Title:    "First",
-				Messages: []*clientpb.AIConversationMessage{
-					{Role: "user", Content: "Hello"},
-				},
-			},
-		},
-	}
-
-	rpcClient, cleanup := newAITestRPCClient(t, server)
-	defer cleanup()
-
-	cmd := loadAIStateCmd(&console.SliverClient{Rpc: rpcClient}, aiTargetSummary{}, "")
-	msg := cmd()
-
-	loaded, ok := msg.(aiLoadedMsg)
-	if !ok {
-		t.Fatalf("expected aiLoadedMsg, got %T", msg)
-	}
-	if loaded.selectedID != "conv-1" {
-		t.Fatalf("unexpected selected conversation id: got=%q want=%q", loaded.selectedID, "conv-1")
-	}
-	if loaded.conversation == nil || loaded.conversation.GetID() != "conv-1" {
-		t.Fatalf("unexpected loaded conversation: %+v", loaded.conversation)
-	}
-	if len(loaded.conversations) != 2 {
-		t.Fatalf("unexpected conversation count: got=%d want=%d", len(loaded.conversations), 2)
-	}
-
-	server.mu.Lock()
-	defer server.mu.Unlock()
-	if server.getProvidersCalls != 1 {
-		t.Fatalf("expected GetAIProviders to be called once, got %d", server.getProvidersCalls)
-	}
-	if server.getConversationsCalls != 1 {
-		t.Fatalf("expected GetAIConversations to be called once, got %d", server.getConversationsCalls)
-	}
-	if len(server.getConversationReqs) != 1 {
-		t.Fatalf("expected GetAIConversation to be called once, got %d", len(server.getConversationReqs))
-	}
-	if server.getConversationReqs[0].GetID() != "conv-1" || !server.getConversationReqs[0].GetIncludeMessages() {
-		t.Fatalf("unexpected GetAIConversation request: %+v", server.getConversationReqs[0])
-	}
-}
-
-func TestLoadAIStateCmdCreatesConversationWhenNoneExist(t *testing.T) {
-	server := &aiRPCServer{
-		providersResp: &clientpb.AIProviderConfigs{
-			Providers: []*clientpb.AIProviderConfig{{Name: "openai", Configured: true}},
-			Config: &clientpb.AIConfigSummary{
-				Provider:     "openai",
-				Model:        "gpt-test",
-				SystemPrompt: "Stay concise.",
-				Valid:        true,
-			},
-		},
-		conversationsResp: &clientpb.AIConversations{},
-		saveConversationResp: &clientpb.AIConversation{
-			ID:           "conv-created",
-			Provider:     "openai",
-			Model:        "gpt-test",
-			Title:        "New conversation",
-			SystemPrompt: "Stay concise.",
-		},
-		conversationByID: map[string]*clientpb.AIConversation{
-			"conv-created": {
-				ID:           "conv-created",
-				Provider:     "openai",
-				Model:        "gpt-test",
-				Title:        "New conversation",
-				SystemPrompt: "Stay concise.",
-			},
-		},
-	}
-
-	rpcClient, cleanup := newAITestRPCClient(t, server)
-	defer cleanup()
-
-	msg := loadAIStateCmd(&console.SliverClient{Rpc: rpcClient}, aiTargetSummary{}, "")()
-
-	loaded, ok := msg.(aiLoadedMsg)
-	if !ok {
-		t.Fatalf("expected aiLoadedMsg, got %T", msg)
-	}
-	if loaded.status != "Created a new AI conversation." {
-		t.Fatalf("unexpected status: %q", loaded.status)
-	}
-	if loaded.selectedID != "conv-created" {
-		t.Fatalf("unexpected selected conversation id: %q", loaded.selectedID)
-	}
-
-	server.mu.Lock()
-	defer server.mu.Unlock()
-	if len(server.saveConversationReqs) != 1 {
-		t.Fatalf("expected SaveAIConversation to be called once, got %d", len(server.saveConversationReqs))
-	}
-	request := server.saveConversationReqs[0]
-	if request.GetProvider() != "openai" || request.GetModel() != "gpt-test" || request.GetTitle() != "New conversation" {
-		t.Fatalf("unexpected SaveAIConversation request: %+v", request)
-	}
-	if request.GetSystemPrompt() != "Stay concise." {
-		t.Fatalf("unexpected SaveAIConversation system prompt: %q", request.GetSystemPrompt())
-	}
-}
-
-func TestSubmitPromptCmdCreatesConversationAndSavesUserMessage(t *testing.T) {
-	server := &aiRPCServer{
-		saveConversationResp: &clientpb.AIConversation{
-			ID:       "conv-created",
-			Provider: "openai",
-			Model:    "gpt-test",
-			Title:    "Explain the workflow.",
-		},
-		saveMessageResp: &clientpb.AIConversationMessage{
-			ID:             "msg-1",
-			ConversationID: "conv-created",
-			Role:           "user",
-			Content:        "Explain the workflow.\n\nWith details.",
-		},
-	}
-
-	rpcClient, cleanup := newAITestRPCClient(t, server)
-	defer cleanup()
-
-	msg := submitPromptCmd(
-		&console.SliverClient{Rpc: rpcClient},
-		aiTargetSummary{SessionID: "session-1"},
-		nil,
-		"openai",
-		"gpt-test",
-		"Stay concise.",
-		"Explain the workflow.\n\nWith details.",
-	)()
-
-	submitted, ok := msg.(aiPromptSubmittedMsg)
-	if !ok {
-		t.Fatalf("expected aiPromptSubmittedMsg, got %T", msg)
-	}
-	if submitted.conversationID != "conv-created" {
-		t.Fatalf("unexpected conversation id: %q", submitted.conversationID)
-	}
-
-	server.mu.Lock()
-	defer server.mu.Unlock()
-	if len(server.saveConversationReqs) != 1 {
-		t.Fatalf("expected SaveAIConversation to be called once, got %d", len(server.saveConversationReqs))
-	}
-	if server.saveConversationReqs[0].GetTitle() != "Explain the workflow." {
-		t.Fatalf("unexpected conversation title: %q", server.saveConversationReqs[0].GetTitle())
-	}
-	if server.saveConversationReqs[0].GetTargetSessionID() != "session-1" {
-		t.Fatalf("expected target session to be forwarded, got %+v", server.saveConversationReqs[0])
-	}
-	if server.saveConversationReqs[0].GetSystemPrompt() != "Stay concise." {
-		t.Fatalf("unexpected conversation system prompt: %q", server.saveConversationReqs[0].GetSystemPrompt())
-	}
-	if len(server.saveMessageReqs) != 1 {
-		t.Fatalf("expected SaveAIConversationMessage to be called once, got %d", len(server.saveMessageReqs))
-	}
-	request := server.saveMessageReqs[0]
-	if request.GetConversationID() != "conv-created" || request.GetProvider() != "openai" || request.GetModel() != "gpt-test" || request.GetRole() != "user" {
-		t.Fatalf("unexpected SaveAIConversationMessage request: %+v", request)
-	}
-	if request.GetContent() != "Explain the workflow.\n\nWith details." {
-		t.Fatalf("unexpected prompt content: %q", request.GetContent())
-	}
-}
-
-func TestSubmitPromptCmdUsesExistingConversationSettings(t *testing.T) {
-	server := &aiRPCServer{
-		saveMessageResp: &clientpb.AIConversationMessage{
-			ID:             "msg-1",
-			ConversationID: "conv-1",
-			Role:           "user",
-			Content:        "hello",
-		},
-	}
-
-	rpcClient, cleanup := newAITestRPCClient(t, server)
-	defer cleanup()
-
-	msg := submitPromptCmd(
-		&console.SliverClient{Rpc: rpcClient},
-		aiTargetSummary{},
-		&clientpb.AIConversation{ID: "conv-1", Provider: "anthropic", Model: "claude-test", Title: "Thread"},
-		"openai",
-		"gpt-test",
-		"Stay concise.",
-		"hello",
-	)()
-
-	if _, ok := msg.(aiPromptSubmittedMsg); !ok {
-		t.Fatalf("expected aiPromptSubmittedMsg, got %T", msg)
-	}
-
-	server.mu.Lock()
-	defer server.mu.Unlock()
-	if len(server.saveConversationReqs) != 0 {
-		t.Fatalf("did not expect SaveAIConversation to be called, got %d calls", len(server.saveConversationReqs))
-	}
-	if len(server.saveMessageReqs) != 1 {
-		t.Fatalf("expected SaveAIConversationMessage to be called once, got %d", len(server.saveMessageReqs))
-	}
-	request := server.saveMessageReqs[0]
-	if request.GetProvider() != "anthropic" || request.GetModel() != "claude-test" {
-		t.Fatalf("unexpected conversation settings in message request: %+v", request)
-	}
-}
-
-func TestDeleteConversationCmdSendsDeleteRequest(t *testing.T) {
-	server := &aiRPCServer{}
-
-	rpcClient, cleanup := newAITestRPCClient(t, server)
-	defer cleanup()
-
-	msg := deleteConversationCmd(
-		&console.SliverClient{Rpc: rpcClient},
-		"conv-1",
-		"conv-2",
-		`Deleted "Thread".`,
-	)()
-
-	deleted, ok := msg.(aiConversationDeletedMsg)
-	if !ok {
-		t.Fatalf("expected aiConversationDeletedMsg, got %T", msg)
-	}
-	if deleted.conversationID != "conv-1" || deleted.selectedID != "conv-2" {
-		t.Fatalf("unexpected delete message: %+v", deleted)
-	}
-
-	server.mu.Lock()
-	defer server.mu.Unlock()
-	if len(server.deleteConversationReqs) != 1 {
-		t.Fatalf("expected DeleteAIConversation to be called once, got %d", len(server.deleteConversationReqs))
-	}
-	if server.deleteConversationReqs[0].GetID() != "conv-1" {
-		t.Fatalf("unexpected DeleteAIConversation request: %+v", server.deleteConversationReqs[0])
-	}
-}
-
-func TestWaitForAIConversationEventCmdFiltersForAIEvents(t *testing.T) {
-	eventPayload := &clientpb.AIConversationEvent{
-		EventType: clientpb.AIConversationEventType_AI_CONVERSATION_EVENT_TYPE_CONVERSATION_UPDATED,
-		Conversation: &clientpb.AIConversation{
-			ID:           "conv-1",
-			OperatorName: "alice",
-		},
-	}
-	data, err := proto.Marshal(eventPayload)
-	if err != nil {
-		t.Fatalf("marshal conversation event: %v", err)
-	}
-
-	listener := make(chan *clientpb.Event, 2)
-	listener <- &clientpb.Event{EventType: consts.WatchtowerEvent}
-	listener <- &clientpb.Event{EventType: consts.AIConversationEvent, Data: data}
-
-	msg := waitForAIConversationEventCmd(listener)()
-
-	aiEvent, ok := msg.(aiConversationEventMsg)
-	if !ok {
-		t.Fatalf("expected aiConversationEventMsg, got %T", msg)
-	}
-	if aiEvent.event == nil || aiEvent.event.GetConversation() == nil || aiEvent.event.GetConversation().GetID() != "conv-1" {
-		t.Fatalf("unexpected AI conversation event payload: %+v", aiEvent.event)
-	}
-}
-
-func TestWaitForAIConversationEventCmdReturnsToastMessages(t *testing.T) {
-	listener := make(chan *clientpb.Event, 1)
-	listener <- &clientpb.Event{
-		EventType: consts.ClientToastEvent,
-		Data:      []byte("Session alpha connected"),
-		Err:       "info",
-	}
-
-	msg := waitForAIConversationEventCmd(listener)()
-
-	toast, ok := msg.(aiToastMsg)
-	if !ok {
-		t.Fatalf("expected aiToastMsg, got %T", msg)
-	}
-	if toast.level != "info" || toast.message != "Session alpha connected" {
-		t.Fatalf("unexpected toast payload: %+v", toast)
-	}
-}
-
-func TestWaitForAIConversationEventCmdReturnsClosedMessage(t *testing.T) {
-	listener := make(chan *clientpb.Event)
-	close(listener)
-
-	msg := waitForAIConversationEventCmd(listener)()
-	if _, ok := msg.(aiListenerClosedMsg); !ok {
-		t.Fatalf("expected aiListenerClosedMsg, got %T", msg)
-	}
-}
-
-func TestAIModelAppliesSharedConversationEventsWithoutReload(t *testing.T) {
-	listener := make(chan *clientpb.Event)
-	close(listener)
-
-	model := newAIModel(nil, aiContext{
-		connection: aiConnectionSummary{Operator: "alice"},
-	}, listener)
-	model.loading = false
-	model.conversations = []*clientpb.AIConversation{{ID: "conv-1", Title: "First"}}
-
-	updated, cmd := model.Update(aiConversationEventMsg{event: &clientpb.AIConversationEvent{
-		EventType: clientpb.AIConversationEventType_AI_CONVERSATION_EVENT_TYPE_CONVERSATION_UPDATED,
-		Conversation: &clientpb.AIConversation{
-			ID:           "conv-2",
-			OperatorName: "bob",
-			Title:        "Shared thread",
-		},
-	}})
-
-	nextModel := updated.(*aiModel)
-	if nextModel.loading {
-		t.Fatal("did not expect shared conversation event to trigger a reload")
-	}
-	if conversationIndexByID(nextModel.conversations, "conv-2") < 0 {
-		t.Fatalf("expected shared conversation to be merged locally, got %+v", nextModel.conversations)
-	}
-	if cmd == nil {
-		t.Fatal("expected shared conversation event to continue listening for events")
-	}
-}
-
-func TestAIModelAppliesDeleteEventsWhileAwaitingResponse(t *testing.T) {
-	listener := make(chan *clientpb.Event)
-	close(listener)
-
-	model := newAIModel(nil, aiContext{
-		connection: aiConnectionSummary{Operator: "alice"},
-	}, listener)
-	model.loading = false
-	model.awaitingResponse = true
-	model.currentConversation = &clientpb.AIConversation{
-		ID:           "conv-2",
-		OperatorName: "alice",
-		UpdatedAt:    100,
-		TurnState:    clientpb.AIConversationTurnState_AI_TURN_STATE_IN_PROGRESS,
-		Messages: []*clientpb.AIConversationMessage{
-			{Role: "user", Content: "still waiting"},
-		},
-	}
-	model.conversations = []*clientpb.AIConversation{
-		{ID: "conv-2", Title: "Current"},
-		{ID: "conv-1", Title: "Fallback"},
-	}
-
-	updated, cmd := model.Update(aiConversationEventMsg{event: &clientpb.AIConversationEvent{
-		EventType:      clientpb.AIConversationEventType_AI_CONVERSATION_EVENT_TYPE_CONVERSATION_DELETED,
-		ConversationID: "conv-2",
-		Conversation: &clientpb.AIConversation{
-			ID: "conv-2",
-		},
-	}})
-
-	nextModel := updated.(*aiModel)
-	if nextModel.loading {
-		t.Fatal("did not expect delete tombstone to trigger a reload")
-	}
-	if nextModel.currentConversation != nil {
-		t.Fatalf("expected deleted conversation to be cleared, got %+v", nextModel.currentConversation)
-	}
-	if conversationIndexByID(nextModel.conversations, "conv-2") >= 0 {
-		t.Fatalf("expected deleted conversation to be removed, got %+v", nextModel.conversations)
-	}
-	if cmd == nil {
-		t.Fatal("expected delete tombstone to continue listening for events")
-	}
-}
-
-type aiRPCServer struct {
-	rpcpb.UnimplementedSliverRPCServer
-
-	mu sync.Mutex
-
-	providersResp        *clientpb.AIProviderConfigs
-	conversationsResp    *clientpb.AIConversations
-	conversationByID     map[string]*clientpb.AIConversation
-	saveConversationResp *clientpb.AIConversation
-	saveMessageResp      *clientpb.AIConversationMessage
-	sessionsResp         *clientpb.Sessions
-	beaconsResp          *clientpb.Beacons
-
-	getProvidersCalls      int
-	getConversationsCalls  int
-	getSessionsCalls       int
-	getBeaconsCalls        int
-	getConversationReqs    []*clientpb.AIConversationReq
-	deleteConversationReqs []*clientpb.AIConversationReq
-	saveConversationReqs   []*clientpb.AIConversation
-	saveMessageReqs        []*clientpb.AIConversationMessage
-	getConversationStart   chan struct{}
-	getConversationWait    <-chan struct{}
-	saveMessageStarted     chan struct{}
-	saveMessageRelease     <-chan struct{}
-}
-
-func (s *aiRPCServer) GetAIProviders(context.Context, *commonpb.Empty) (*clientpb.AIProviderConfigs, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.getProvidersCalls++
-	if s.providersResp == nil {
-		return &clientpb.AIProviderConfigs{}, nil
-	}
-	return proto.Clone(s.providersResp).(*clientpb.AIProviderConfigs), nil
-}
-
-func (s *aiRPCServer) GetAIConversations(context.Context, *commonpb.Empty) (*clientpb.AIConversations, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.getConversationsCalls++
-	if s.conversationsResp == nil {
-		return &clientpb.AIConversations{}, nil
-	}
-	return proto.Clone(s.conversationsResp).(*clientpb.AIConversations), nil
-}
-
-func (s *aiRPCServer) GetSessions(context.Context, *commonpb.Empty) (*clientpb.Sessions, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.getSessionsCalls++
-	if s.sessionsResp == nil {
-		return &clientpb.Sessions{}, nil
-	}
-	return proto.Clone(s.sessionsResp).(*clientpb.Sessions), nil
-}
-
-func (s *aiRPCServer) GetBeacons(context.Context, *commonpb.Empty) (*clientpb.Beacons, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.getBeaconsCalls++
-	if s.beaconsResp == nil {
-		return &clientpb.Beacons{}, nil
-	}
-	return proto.Clone(s.beaconsResp).(*clientpb.Beacons), nil
-}
-
-func (s *aiRPCServer) GetAIConversation(_ context.Context, req *clientpb.AIConversationReq) (*clientpb.AIConversation, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.getConversationReqs = append(s.getConversationReqs, proto.Clone(req).(*clientpb.AIConversationReq))
-	if s.getConversationStart != nil {
-		select {
-		case s.getConversationStart <- struct{}{}:
-		default:
-		}
-	}
-	if s.getConversationWait != nil {
-		s.mu.Unlock()
-		<-s.getConversationWait
-		s.mu.Lock()
-	}
-	if s.conversationByID == nil {
-		return &clientpb.AIConversation{}, nil
-	}
-	conversation := s.conversationByID[req.GetID()]
-	if conversation == nil {
-		return &clientpb.AIConversation{}, nil
-	}
-	return proto.Clone(conversation).(*clientpb.AIConversation), nil
-}
-
-func (s *aiRPCServer) SaveAIConversation(_ context.Context, req *clientpb.AIConversation) (*clientpb.AIConversation, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.saveConversationReqs = append(s.saveConversationReqs, proto.Clone(req).(*clientpb.AIConversation))
-	if s.saveConversationResp == nil {
-		return proto.Clone(req).(*clientpb.AIConversation), nil
-	}
-	return proto.Clone(s.saveConversationResp).(*clientpb.AIConversation), nil
-}
-
-func (s *aiRPCServer) DeleteAIConversation(_ context.Context, req *clientpb.AIConversationReq) (*commonpb.Empty, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.deleteConversationReqs = append(s.deleteConversationReqs, proto.Clone(req).(*clientpb.AIConversationReq))
-	return &commonpb.Empty{}, nil
-}
-
-func (s *aiRPCServer) SaveAIConversationMessage(_ context.Context, req *clientpb.AIConversationMessage) (*clientpb.AIConversationMessage, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.saveMessageReqs = append(s.saveMessageReqs, proto.Clone(req).(*clientpb.AIConversationMessage))
-	if s.saveMessageStarted != nil {
-		select {
-		case s.saveMessageStarted <- struct{}{}:
-		default:
-		}
-	}
-	if s.saveMessageRelease != nil {
-		s.mu.Unlock()
-		<-s.saveMessageRelease
-		s.mu.Lock()
-	}
-	if s.saveMessageResp == nil {
-		return proto.Clone(req).(*clientpb.AIConversationMessage), nil
-	}
-	return proto.Clone(s.saveMessageResp).(*clientpb.AIConversationMessage), nil
-}
-
-func newAITestRPCClient(t *testing.T, srv rpcpb.SliverRPCServer) (rpcpb.SliverRPCClient, func()) {
-	t.Helper()
-
-	listener := bufconn.Listen(1024 * 1024)
-	grpcServer := grpc.NewServer()
-	rpcpb.RegisterSliverRPCServer(grpcServer, srv)
-
-	go func() {
-		_ = grpcServer.Serve(listener)
-	}()
-
-	dialer := func(context.Context, string) (net.Conn, error) { return listener.Dial() }
-	conn, err := grpc.DialContext(context.Background(), "bufnet",
-		grpc.WithContextDialer(dialer),
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-	)
-	if err != nil {
-		grpcServer.Stop()
-		_ = listener.Close()
-		t.Fatalf("dial bufconn: %v", err)
-	}
-
-	cleanup := func() {
-		_ = conn.Close()
-		grpcServer.Stop()
-		_ = listener.Close()
-	}
-
-	return rpcpb.NewSliverRPCClient(conn), cleanup
-}

client/command/alias/args.go

@@ -1,251 +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"
-	"strconv"
-	"strings"
-
-	"github.com/spf13/cobra"
-)
-
-// Alias commands run with cobra's DisableFlagParsing enabled (see LoadAlias),
-// the same treatment extension commands received for their arguments. Before
-// that, an unknown flag such as the payload's own `-pid` was rejected outright
-// by pflag ("unknown flag"), and operators had to inject cobra's "--"
-// separator (documented on the wiki) to pass arguments through at all (#2264).
-//
-// With flag parsing disabled cobra hands Run the raw, unstripped slice, and we
-// extract the Sliver-owned flags ourselves here. Everything we do not own is
-// passed to the payload untouched, so all of these now work:
-//
-//	amsi-bypass -pid 6969
-//	fakealias --process notepad.exe arg1 arg2
-//	fakealias -- --anything still-here     (existing workaround, unchanged)
-type ownedFlagKind int
-
-const (
-	ownedBool ownedFlagKind = iota
-	ownedString
-	ownedUint32
-	ownedInt64
-)
-
-// ownedFlagSpec describes one Sliver-owned flag that splitAliasArgs extracts
-// from the raw argument slice before the rest is handed to the alias payload.
-type ownedFlagSpec struct {
-	long  string        // canonical pflag name, e.g. "process-arguments"
-	short string        // shorthand letter, e.g. "A" ("" if the flag has none)
-	kind  ownedFlagKind // how the value is consumed and validated
-}
-
-// baseAliasOwnedFlags are registered for every alias command.
-var baseAliasOwnedFlags = []ownedFlagSpec{
-	{long: "process", short: "p", kind: ownedString},
-	{long: "process-arguments", short: "A", kind: ownedString},
-	{long: "ppid", short: "P", kind: ownedUint32},
-	{long: "save", short: "s", kind: ownedBool},
-	{long: "timeout", short: "t", kind: ownedInt64},
-}
-
-// assemblyAliasOwnedFlags are only owned when the alias wraps a .NET assembly;
-// for every other alias they are unknown tokens and pass through to the payload.
-var assemblyAliasOwnedFlags = []ownedFlagSpec{
-	{long: "method", short: "m", kind: ownedString},
-	{long: "class", short: "c", kind: ownedString},
-	{long: "app-domain", short: "d", kind: ownedString},
-	{long: "arch", short: "a", kind: ownedString},
-	{long: "in-process", short: "i", kind: ownedBool},
-	{long: "runtime", short: "r", kind: ownedString},
-	{long: "amsi-bypass", short: "M", kind: ownedBool},
-	{long: "etw-bypass", short: "E", kind: ownedBool},
-}
-
-// aliasOwnedFlagSpecs returns the flag set owned by a particular alias.
-func aliasOwnedFlagSpecs(isAssembly bool) []ownedFlagSpec {
-	if !isAssembly {
-		return baseAliasOwnedFlags
-	}
-	specs := make([]ownedFlagSpec, 0, len(baseAliasOwnedFlags)+len(assemblyAliasOwnedFlags))
-	specs = append(specs, baseAliasOwnedFlags...)
-	return append(specs, assemblyAliasOwnedFlags...)
-}
-
-// ownedFlagMatch is a raw token that spelled one of the Sliver-owned flags.
-type ownedFlagMatch struct {
-	spec   ownedFlagSpec
-	value  string // value from a "--flag=value" / "-f=value" spelling
-	inline bool   // whether the token carried its value inline
-}
-
-// splitAliasArgs separates the Sliver-owned flags from the alias payload's own
-// arguments in a raw (DisableFlagParsing) argument slice. It accepts the long
-// forms --flag, --flag=value, --flag value and the shorthand forms -f, -f=value,
-// -f value, mirroring pflag. Two deliberate differences from pflag:
-//
-//   - a glued shorthand value (-pnotepad) does NOT match --process: tokens
-//     like the payload's own "-pid" must survive intact (#2264);
-//   - after a literal "--" every token is copied through verbatim, preserving
-//     the long-standing separator workaround.
-//
-// The returned map holds the raw string value of each flag that was provided;
-// callers re-publish the values with applyOwnedAliasFlags.
-func splitAliasArgs(raw []string, specs []ownedFlagSpec) (map[string]string, bool, []string, error) {
-	values := make(map[string]string)
-	extArgs := make([]string, 0, len(raw))
-	byLong, byShort := ownedFlagTables(specs)
-
-	passthrough := false
-	for i := 0; i < len(raw); i++ {
-		tok := raw[i]
-
-		// Once we have seen "--", copy everything through untouched.
-		if passthrough {
-			extArgs = append(extArgs, tok)
-			continue
-		}
-		if tok == "--" {
-			passthrough = true
-			continue
-		}
-		if tok == "--help" || tok == "-h" {
-			return values, true, extArgs, nil
-		}
-
-		match, ok := matchOwnedFlag(tok, byLong, byShort)
-		if !ok {
-			// Not one of ours (including glued shorthands and the payload's
-			// own flags): the alias owns the token, pass it through untouched.
-			extArgs = append(extArgs, tok)
-			continue
-		}
-		i = takeOwnedValue(match, raw, i, values)
-	}
-
-	if err := validateOwnedValues(specs, values); err != nil {
-		return nil, false, nil, err
-	}
-	return values, false, extArgs, nil
-}
-
-// ownedFlagTables indexes the specs by long name and shorthand.
-func ownedFlagTables(specs []ownedFlagSpec) (byLong, byShort map[string]ownedFlagSpec) {
-	byLong = make(map[string]ownedFlagSpec, len(specs))
-	byShort = make(map[string]ownedFlagSpec, len(specs))
-	for _, spec := range specs {
-		byLong[spec.long] = spec
-		if spec.short != "" {
-			byShort[spec.short] = spec
-		}
-	}
-	return byLong, byShort
-}
-
-// matchOwnedFlag checks whether tok spells one of the Sliver-owned flags, in
-// the long form (--name, --name=value) or shorthand form (-f, -f=value). A
-// glued shorthand value (-pnotepad) deliberately does not match: pflag would
-// read "-pid" as -p with value "id", which is exactly the mangling that broke
-// #2264, so such tokens must fall through to the payload.
-func matchOwnedFlag(tok string, byLong, byShort map[string]ownedFlagSpec) (ownedFlagMatch, bool) {
-	var match ownedFlagMatch
-	var name, value string
-	var hasValue, isShort bool
-
-	switch {
-	case strings.HasPrefix(tok, "--"):
-		name, value, hasValue = strings.Cut(tok[2:], "=")
-	case strings.HasPrefix(tok, "-") && len(tok) > 1:
-		name, value, hasValue = strings.Cut(tok[1:], "=")
-		isShort = len(name) == 1
-	default:
-		return match, false
-	}
-
-	spec, ok := byLong[name]
-	if isShort {
-		spec, ok = byShort[name]
-	}
-	if !ok {
-		return match, false
-	}
-	match.spec, match.value, match.inline = spec, value, hasValue
-	return match, true
-}
-
-// takeOwnedValue records the flag's value in values and returns the index of
-// the last raw token it consumed. The "--flag value" / "-f value" spellings
-// consume the following token; a bool without an inline value defaults to
-// true; a value flag as the very last token is dropped and keeps its default,
-// mirroring the extension behaviour.
-func takeOwnedValue(match ownedFlagMatch, raw []string, i int, values map[string]string) int {
-	switch {
-	case match.spec.kind == ownedBool:
-		if !match.inline {
-			match.value = "true"
-		}
-		values[match.spec.long] = match.value
-	case match.inline:
-		values[match.spec.long] = match.value
-	case i+1 < len(raw):
-		values[match.spec.long] = raw[i+1]
-		return i + 1
-	}
-	return i
-}
-
-// validateOwnedValues rejects non-numeric values for the numeric flag kinds,
-// the way pflag's typed values would have.
-func validateOwnedValues(specs []ownedFlagSpec, values map[string]string) error {
-	for _, spec := range specs {
-		value, provided := values[spec.long]
-		if !provided {
-			continue
-		}
-		var err error
-		switch spec.kind {
-		case ownedUint32:
-			_, err = strconv.ParseUint(value, 10, 32)
-		case ownedInt64:
-			_, err = strconv.ParseInt(value, 10, 64)
-		}
-		if err != nil {
-			return fmt.Errorf("invalid value %q for --%s", value, spec.long)
-		}
-	}
-	return nil
-}
-
-// applyOwnedAliasFlags republishes the manually parsed Sliver-owned flag values
-// onto the command's flag set. DisableFlagParsing prevents pflag from
-// populating them, so readers such as runAliasCommand's Get* calls and
-// ActiveTarget.Request (which derives the gRPC timeout from --timeout) would
-// otherwise observe only the defaults.
-func applyOwnedAliasFlags(cmd *cobra.Command, values map[string]string) error {
-	for name, value := range values {
-		flag := cmd.Flags().Lookup(name)
-		if flag == nil {
-			continue // e.g. an assembly flag on a non-assembly alias
-		}
-		if err := flag.Value.Set(value); err != nil {
-			return fmt.Errorf("invalid value %q for --%s: %w", value, name, err)
-		}
-	}
-	return nil
-}

client/command/alias/args_test.go

@@ -1,259 +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 (
-	"reflect"
-	"testing"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-// TestSplitAliasArgs covers the argument passthrough regression from #2264:
-// the alias payload's own flags must reach the payload intact, while the
-// Sliver-owned flags are extracted and validated.
-func TestSplitAliasArgs(t *testing.T) {
-	base := aliasOwnedFlagSpecs(false)
-	assembly := aliasOwnedFlagSpecs(true)
-
-	cases := []struct {
-		name    string
-		specs   []ownedFlagSpec
-		in      []string
-		values  map[string]string
-		help    bool
-		extArgs []string
-		wantErr bool
-	}{
-		{
-			name:    "payload flag without -- separator (#2264 regression)",
-			specs:   base,
-			in:      []string{"-pid", "6969"},
-			values:  map[string]string{},
-			extArgs: []string{"-pid", "6969"},
-		},
-		{
-			name:    "glued shorthand is not ours and passes through",
-			specs:   base,
-			in:      []string{"-pid"},
-			values:  map[string]string{},
-			extArgs: []string{"-pid"},
-		},
-		{
-			name:    "payload flag with -- separator (existing workaround)",
-			specs:   base,
-			in:      []string{"--", "--pid", "6969"},
-			values:  map[string]string{},
-			extArgs: []string{"--pid", "6969"},
-		},
-		{
-			name:    "owned flag after -- belongs to the payload",
-			specs:   base,
-			in:      []string{"--", "--save"},
-			values:  map[string]string{},
-			extArgs: []string{"--save"},
-		},
-		{
-			name:    "long flag with separate value, then payload args",
-			specs:   base,
-			in:      []string{"--process", "notepad.exe", "arg1", "arg2"},
-			values:  map[string]string{"process": "notepad.exe"},
-			extArgs: []string{"arg1", "arg2"},
-		},
-		{
-			name:    "long flag with equals value",
-			specs:   base,
-			in:      []string{"--process=notepad.exe", "arg1"},
-			values:  map[string]string{"process": "notepad.exe"},
-			extArgs: []string{"arg1"},
-		},
-		{
-			name:    "shorthand with separate value",
-			specs:   base,
-			in:      []string{"-p", "notepad.exe", "arg1"},
-			values:  map[string]string{"process": "notepad.exe"},
-			extArgs: []string{"arg1"},
-		},
-		{
-			name:    "shorthand with equals value",
-			specs:   base,
-			in:      []string{"-p=notepad.exe"},
-			values:  map[string]string{"process": "notepad.exe"},
-			extArgs: []string{},
-		},
-		{
-			name:    "bool shorthand and long false form",
-			specs:   base,
-			in:      []string{"-s", "--save=false", "arg1"},
-			values:  map[string]string{"save": "false"},
-			extArgs: []string{"arg1"},
-		},
-		{
-			name:    "quoted value containing spaces stays a single argument",
-			specs:   base,
-			in:      []string{"-A", "-kalc -kdisable", "arg1"},
-			values:  map[string]string{"process-arguments": "-kalc -kdisable"},
-			extArgs: []string{"arg1"},
-		},
-		{
-			name:    "valid uint32 and int64 values",
-			specs:   base,
-			in:      []string{"-P", "1234", "--timeout=90"},
-			values:  map[string]string{"ppid": "1234", "timeout": "90"},
-			extArgs: []string{},
-		},
-		{
-			name:    "invalid uint32 value errors",
-			specs:   base,
-			in:      []string{"--ppid", "notanumber"},
-			wantErr: true,
-		},
-		{
-			name:    "invalid int64 value errors",
-			specs:   base,
-			in:      []string{"--timeout=x"},
-			wantErr: true,
-		},
-		{
-			name:  "assembly flags are owned for assembly aliases",
-			specs: assembly,
-			in:    []string{"--method", "Run", "--class", "Prog", "-i", "-M", "--arch", "x64", "payloadArg"},
-			values: map[string]string{
-				"method": "Run", "class": "Prog", "in-process": "true",
-				"amsi-bypass": "true", "arch": "x64",
-			},
-			extArgs: []string{"payloadArg"},
-		},
-		{
-			name:    "assembly flags pass through for non-assembly aliases",
-			specs:   base,
-			in:      []string{"--method", "Run"},
-			values:  map[string]string{},
-			extArgs: []string{"--method", "Run"},
-		},
-		{
-			name:    "help flags are detected",
-			specs:   base,
-			in:      []string{"--help"},
-			help:    true,
-			values:  map[string]string{},
-			extArgs: []string{},
-		},
-		{
-			name:    "short help is detected",
-			specs:   base,
-			in:      []string{"-h"},
-			help:    true,
-			values:  map[string]string{},
-			extArgs: []string{},
-		},
-		{
-			name:    "value flag as last token keeps its default",
-			specs:   base,
-			in:      []string{"arg1", "--process"},
-			values:  map[string]string{},
-			extArgs: []string{"arg1"},
-		},
-		{
-			name:    "empty input",
-			specs:   base,
-			in:      nil,
-			values:  map[string]string{},
-			extArgs: []string{},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			values, help, extArgs, err := splitAliasArgs(tc.in, tc.specs)
-
-			if tc.wantErr {
-				if err == nil {
-					t.Fatalf("expected error, got values=%#v help=%v extArgs=%#v", values, help, extArgs)
-				}
-				return
-			}
-			if err != nil {
-				t.Fatalf("unexpected error: %s", err)
-			}
-			if help != tc.help {
-				t.Errorf("help: got %v, want %v", help, tc.help)
-			}
-			if !reflect.DeepEqual(values, tc.values) {
-				t.Errorf("values: got %#v, want %#v", values, tc.values)
-			}
-			if !reflect.DeepEqual(extArgs, tc.extArgs) {
-				t.Errorf("extArgs: got %#v, want %#v", extArgs, tc.extArgs)
-			}
-		})
-	}
-}
-
-// TestApplyOwnedAliasFlags checks that manually parsed values are re-published
-// on the command's flag set for every value type an alias can own.
-func TestApplyOwnedAliasFlags(t *testing.T) {
-	cmd := &cobra.Command{}
-	f := pflag.NewFlagSet("alias-test", pflag.ContinueOnError)
-	f.StringP("process", "p", "", "host process")
-	f.StringP("process-arguments", "A", "", "host process arguments")
-	f.Uint32P("ppid", "P", 0, "parent pid")
-	f.BoolP("save", "s", false, "save output")
-	f.Int64P("timeout", "t", 60, "timeout")
-	f.BoolP("amsi-bypass", "M", false, "amsi bypass")
-	cmd.Flags().AddFlagSet(f)
-
-	err := applyOwnedAliasFlags(cmd, map[string]string{
-		"process":           "notepad.exe",
-		"process-arguments": "-k foo",
-		"ppid":              "1234",
-		"save":              "true",
-		"timeout":           "90",
-		"amsi-bypass":       "true",
-	})
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-
-	for name, want := range map[string]interface{}{
-		"process": "notepad.exe", "process-arguments": "-k foo",
-	} {
-		got, _ := cmd.Flags().GetString(name)
-		if got != want.(string) {
-			t.Errorf("%s: got %q, want %q", name, got, want)
-		}
-	}
-	if ppid, _ := cmd.Flags().GetUint32("ppid"); ppid != 1234 {
-		t.Errorf("ppid: got %d, want 1234", ppid)
-	}
-	if save, _ := cmd.Flags().GetBool("save"); !save {
-		t.Error("save: got false, want true")
-	}
-	if timeout, _ := cmd.Flags().GetInt64("timeout"); timeout != 90 {
-		t.Errorf("timeout: got %d, want 90", timeout)
-	}
-	if amsi, _ := cmd.Flags().GetBool("amsi-bypass"); !amsi {
-		t.Error("amsi-bypass: got false, want true")
-	}
-
-	// Unset flags keep their defaults.
-	if inProc := cmd.Flags().Lookup("in-process"); inProc != nil {
-		t.Error("in-process should not be registered on this command")
-	}
-}

client/command/alias/commands.go

@@ -1,7 +1,6 @@
 package alias
 
 import (
-	"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"
@@ -33,7 +32,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	}
 	aliasCmd.AddCommand(aliasLoadCmd)
 	flags.NewCompletions(aliasLoadCmd).PositionalCompletion(carapace.ActionDirectories().Tag("alias directory").Usage("path to the alias directory"))
-	completers.RegisterLocalFilePathPositionalCompletion(aliasLoadCmd, 0)
 
 	aliasInstallCmd := &cobra.Command{
 		Use:   consts.InstallStr + " [ALIAS]",
@@ -46,7 +44,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	}
 	aliasCmd.AddCommand(aliasInstallCmd)
 	flags.NewCompletions(aliasInstallCmd).PositionalCompletion(carapace.ActionFiles().Tag("alias file"))
-	completers.RegisterLocalFilePathPositionalCompletion(aliasInstallCmd, 0)
 
 	aliasRemove := &cobra.Command{
 		Use:   consts.RmStr + " [ALIAS]",

client/command/alias/load.go

@@ -215,6 +215,8 @@ func LoadAlias(manifestPath string, cmd *cobra.Command, con *console.SliverClien
 			longHelp.WriteString(fmt.Sprintf("%s (%s):\t%s%s", strings.ToUpper(arg.Name), aType, optStr, arg.Desc))
 		}
 	}
+	longHelp.WriteString("\n\n⚠️  If you're having issues passing arguments to the alias please read:\n")
+	longHelp.WriteString("https://github.com/BishopFox/sliver/wiki/Aliases-&-Extensions#aliases-command-parsing")
 
 	// for each alias command, add a new app command
 	helpMsg := fmt.Sprintf("[%s] %s", aliasManifest.Name, aliasManifest.Help)
@@ -225,14 +227,9 @@ func LoadAlias(manifestPath string, cmd *cobra.Command, con *console.SliverClien
 		Run: func(cmd *cobra.Command, args []string) {
 			runAliasCommand(cmd, con, args)
 		},
-		Args: cobra.ArbitraryArgs, // 	a.StringList("arguments", "arguments", grumble.Default([]string{}))
-		// DisableFlagParsing keeps the alias payload's own flags (which are
-		// unknown to pflag) from being rejected or swallowed; we split the
-		// Sliver-owned flags out of the raw slice ourselves in
-		// runAliasCommand (#2264, same treatment as extensions).
-		DisableFlagParsing: true,
-		GroupID:            consts.AliasHelpGroup,
-		Annotations:        makeAliasPlatformFilters(aliasManifest),
+		Args:        cobra.ArbitraryArgs, // 	a.StringList("arguments", "arguments", grumble.Default([]string{}))
+		GroupID:     consts.AliasHelpGroup,
+		Annotations: makeAliasPlatformFilters(aliasManifest),
 	}
 
 	if aliasManifest.IsAssembly {
@@ -242,9 +239,9 @@ func LoadAlias(manifestPath string, cmd *cobra.Command, con *console.SliverClien
 		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", "v4.0.30319", "Runtime to use for running the assembly")
-		f.BoolP("amsi-bypass", "M", false, "Bypass AMSI on Windows")
-		f.BoolP("etw-bypass", "E", false, "Bypass ETW on Windows")
+		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)
 	}
 
@@ -253,7 +250,7 @@ func LoadAlias(manifestPath string, cmd *cobra.Command, con *console.SliverClien
 	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.Int64P("timeout", "t", defaultTimeout, "command timeout in seconds")
+	f.IntP("timeout", "t", defaultTimeout, "command timeout in seconds")
 	addAliasCmd.Flags().AddFlagSet(f)
 
 	// Setup completions for alias arguments
@@ -336,27 +333,6 @@ func runAliasCommand(cmd *cobra.Command, con *console.SliverClient, args []strin
 		return
 	}
 	aliasManifest := loadedAlias.Manifest
-
-	// The command runs with DisableFlagParsing, so args is the raw, unstripped
-	// slice. Separate the Sliver-owned flags from the payload's own arguments
-	// and re-publish them on the flag set (so the Get* readers below and
-	// Request()'s --timeout still work), then hand only the payload arguments
-	// to the execution paths (#2264, same treatment as extensions in #2323).
-	ownedValues, helpRequested, payloadArgs, err := splitAliasArgs(args, aliasOwnedFlagSpecs(aliasManifest.IsAssembly))
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if helpRequested {
-		_ = cmd.Help()
-		return
-	}
-	if err := applyOwnedAliasFlags(cmd, ownedValues); err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	args = payloadArgs
-
 	binPath, err := aliasManifest.getFileForTarget(cmd.Name(), goos, goarch)
 	if err != nil {
 		con.PrintErrorf("Fail to find alias file: %s\n", err)
@@ -398,7 +374,7 @@ func runAliasCommand(cmd *cobra.Command, con *console.SliverClient, args []strin
 		}
 		con.PrintWarnf("%s", msgStr)
 		confirm := false
-		forms.Confirm("Do you want to continue?", &confirm)
+		_ = forms.Confirm("Do you want to continue?", &confirm)
 		if !confirm {
 			return
 		}
@@ -424,13 +400,7 @@ func runAliasCommand(cmd *cobra.Command, con *console.SliverClient, args []strin
 
 	var outFilePath *os.File
 	if save, _ := cmd.Flags().GetBool("save"); save {
-		hostname := ""
-		if session != nil {
-			hostname = session.GetHostname()
-		} else if beacon != nil {
-			hostname = beacon.GetHostname()
-		}
-		outFile := filepath.Base(fmt.Sprintf("%s_%s*.log", filepath.Base(cmd.Name()), filepath.Base(hostname)))
+		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)

client/command/armory/armory.go

@@ -164,7 +164,7 @@ func ArmoryCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 			cacheEntry, ok := value.(pkgCacheEntry)
 			if !ok {
 				// Something is wrong with this entry
-				pkgCache.Delete(key)
+				pkgCache.Delete(value)
 				return true
 			}
 			if cacheEntry.ArmoryConfig.PublicKey != index.ArmoryConfig.PublicKey {
@@ -428,7 +428,7 @@ func PrintArmoryPackages(aliases []*alias.AliasManifest, exts []*extensions.Exte
 
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
-	tw.SetTitle(console.StyleBold.Render("Packages"))
+	tw.SetTitle(console.Bold + "Packages" + console.Normal)
 
 	urlMargin := 150 // Extra margin needed to show URL column
 
@@ -493,26 +493,26 @@ func PrintArmoryPackages(aliases []*alias.AliasManifest, exts []*extensions.Exte
 
 	rows := []table.Row{}
 	for _, pkg := range entries {
-		style := console.StyleNormal
+		color := console.Normal
 		if extensions.CmdExists(pkg.CommandName, sliverMenu.Command) {
-			style = console.StyleGreen
+			color = console.Green
 		}
 		if con.Settings.SmallTermWidth+urlMargin < width {
 			rows = append(rows, table.Row{
-				style.Render(pkg.ArmoryName),
-				style.Render(pkg.CommandName),
-				style.Render(pkg.Version),
-				style.Render(pkg.Type),
-				style.Render(pkg.Help),
-				style.Render(pkg.URL),
+				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{
-				style.Render(pkg.ArmoryName),
-				style.Render(pkg.CommandName),
-				style.Render(pkg.Version),
-				style.Render(pkg.Type),
-				style.Render(pkg.Help),
+				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),
 			})
 		}
 	}
@@ -524,7 +524,7 @@ func PrintArmoryPackages(aliases []*alias.AliasManifest, exts []*extensions.Exte
 func PrintArmoryBundles(bundles []*ArmoryBundle, con *console.SliverClient) {
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
-	tw.SetTitle(console.StyleBold.Render("Bundles"))
+	tw.SetTitle(console.Bold + "Bundles" + console.Normal)
 	tw.AppendHeader(table.Row{
 		"Armory Name",
 		"Name",

client/command/armory/commands.go

@@ -1,23 +1,5 @@
 package armory
 
-/*
-	Sliver Implant Framework
-	Copyright (C) 2026  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/rsteube/carapace"
 	"github.com/spf13/cobra"

client/command/armory/install.go

@@ -635,15 +635,20 @@ func installAliasPackage(entry *pkgCacheEntry, promptToOverwrite bool, clientCon
 		return errors.New("signature verification failed")
 	}
 
-	tmpFileName, err := writeArmoryTempFile(tarGz)
+	tmpFile, err := os.CreateTemp("", "sliver-armory-")
 	if err != nil {
 		return err
 	}
-	defer os.Remove(tmpFileName)
+	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(tmpFileName, entry.Alias.CommandName, promptToOverwrite, con)
+	installPath := alias.InstallFromFile(tmpFile.Name(), entry.Alias.CommandName, promptToOverwrite, con)
 	if installPath == nil {
 		return errors.New("failed to install alias")
 	}
@@ -724,45 +729,23 @@ func installExtensionPackage(entry *pkgCacheEntry, promptToOverwrite bool, clien
 		return errors.New("signature verification failed")
 	}
 
-	tmpFileName, err := writeArmoryTempFile(tarGz)
+	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
 	}
-	defer os.Remove(tmpFileName)
 
 	con.Printf(console.Clearln + "\r") // Clear download message
 
-	extensions.InstallFromDir(tmpFileName, promptToOverwrite, con, true)
+	extensions.InstallFromDir(tmpFile.Name(), promptToOverwrite, con, true)
 
 	return nil
 }
-
-func writeArmoryTempFile(data []byte) (string, error) {
-	if len(data) == 0 {
-		return "", errors.New("downloaded archive is empty")
-	}
-	tmpFile, err := os.CreateTemp("", "sliver-armory-")
-	if err != nil {
-		return "", err
-	}
-	tmpFileName := tmpFile.Name()
-	for len(data) > 0 {
-		n, err := tmpFile.Write(data)
-		if err != nil {
-			tmpFile.Close()
-			os.Remove(tmpFileName)
-			return "", err
-		}
-		data = data[n:]
-	}
-	if err := tmpFile.Sync(); err != nil {
-		tmpFile.Close()
-		os.Remove(tmpFileName)
-		return "", err
-	}
-	if err := tmpFile.Close(); err != nil {
-		os.Remove(tmpFileName)
-		return "", err
-	}
-	return tmpFileName, nil
-}

client/command/armory/manage.go

@@ -1,23 +1,5 @@
 package armory
 
-/*
-	Sliver Implant Framework
-	Copyright (C) 2026  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"

client/command/armory/update.go

@@ -257,7 +257,7 @@ func displayAvailableUpdates(con *console.SliverClient, updateKeys []UpdateIdent
 	if len(extensionUpdates) != 1 {
 		extensionSuffix = "s"
 	}
-	tw.SetTitle(console.StyleBold.Render(fmt.Sprintf(title, len(aliasUpdates), aliasSuffix, len(extensionUpdates), extensionSuffix)))
+	tw.SetTitle(console.Bold + fmt.Sprintf(title, len(aliasUpdates), aliasSuffix, len(extensionUpdates), extensionSuffix) + console.Normal)
 	tw.AppendHeader(table.Row{
 		"Package Name",
 		"Package Type",

client/command/beacons/beacons.go

@@ -178,10 +178,10 @@ func renderBeacons(beacons []*clientpb.Beacon, filter string, filterRegex *regex
 	}
 
 	for _, beacon := range beacons {
-		style := console.StyleNormal
+		color := console.Normal
 		activeBeacon := con.ActiveTarget.GetBeacon()
 		if activeBeacon != nil && activeBeacon.ID == beacon.ID {
-			style = console.StyleGreen
+			color = console.Green
 		}
 		if beacon.Integrity == "" {
 			beacon.Integrity = "-"
@@ -192,34 +192,34 @@ func renderBeacons(beacons []*clientpb.Beacon, filter string, filterRegex *regex
 
 		if wideTermWidth {
 			rowEntries = []string{
-				style.Render(strings.Split(beacon.ID, "-")[0]),
-				style.Render(beacon.Name),
-				style.Render(fmt.Sprintf("%d/%d", beacon.TasksCountCompleted, beacon.TasksCount)),
-				style.Render(beacon.Transport),
-				style.Render(beacon.RemoteAddress),
-				style.Render(beacon.Hostname),
-				style.Render(strings.TrimPrefix(beacon.Username, beacon.Hostname+"\\")),
-				style.Render(fmt.Sprintf("%s (%d)", beacon.Filename, beacon.PID)),
+				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, style.Render(beacon.Integrity))
+				rowEntries = append(rowEntries, fmt.Sprintf(color+"%s"+console.Normal, beacon.Integrity))
 			}
 
 			rowEntries = append(rowEntries, []string{
-				style.Render(fmt.Sprintf("%s/%s", beacon.OS, beacon.Arch)),
-				style.Render(beacon.Locale),
+				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{
-				style.Render(strings.Split(beacon.ID, "-")[0]),
-				style.Render(beacon.Name),
-				style.Render(beacon.Transport),
-				style.Render(beacon.Hostname),
-				style.Render(strings.TrimPrefix(beacon.Username, beacon.Hostname+"\\")),
-				style.Render(fmt.Sprintf("%s/%s", beacon.OS, beacon.Arch)),
+				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),
 			}

client/command/beacons/commands.go

@@ -28,7 +28,7 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		},
 	}
 	flags.Bind("beacons", true, beaconsCmd, func(f *pflag.FlagSet) {
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
+		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")

client/command/c2profiles/commands.go

@@ -1,7 +1,6 @@
 package c2profiles
 
 import (
-	"github.com/bishopfox/sliver/client/command/completers"
 	"github.com/bishopfox/sliver/client/command/flags"
 	"github.com/bishopfox/sliver/client/command/generate"
 	"github.com/bishopfox/sliver/client/command/help"
@@ -28,7 +27,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		f.StringP("file", "f", "", "Path to C2 configuration file to import")
 		f.BoolP("overwrite", "o", false, "Overwrite profile if it exists")
 	})
-	completers.RegisterLocalFilePathFlagCompletion(importC2ProfileCmd, "file")
 
 	exportC2ProfileCmd := &cobra.Command{
 		Use:   consts.ExportC2ProfileStr,
@@ -42,7 +40,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		f.StringP("file", "f", "", "Path to file to export C2 configuration to")
 		f.StringP("name", "n", consts.DefaultC2Profile, "HTTP C2 Profile name")
 	})
-	completers.RegisterLocalFilePathFlagCompletion(exportC2ProfileCmd, "file")
 	flags.BindFlagCompletions(exportC2ProfileCmd, func(comp *carapace.ActionMap) {
 		(*comp)["name"] = generate.HTTPC2Completer(con)
 	})
@@ -79,7 +76,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		f.StringP("name", "n", "", "HTTP C2 Profile name to save C2Profile as")
 		f.StringP("template", "t", consts.DefaultC2Profile, "HTTP C2 Profile to use as a template for the new profile")
 	})
-	completers.RegisterLocalFilePathFlagCompletion(generateC2ProfileCmd, "file")
 
 	flags.BindFlagCompletions(generateC2ProfileCmd, func(comp *carapace.ActionMap) {
 		(*comp)["template"] = generate.HTTPC2Completer(con)

client/command/certificates/authorities.go

@@ -2,6 +2,7 @@ package certificates
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/bishopfox/sliver/client/command/settings"
@@ -57,28 +58,28 @@ func printCertificateAuthorityInfo(con *console.SliverClient, authData []*client
 	}
 
 	for _, authority := range authData {
-		rowStyle := console.StyleNormal
+		rowColor := console.Normal
 
 		expiry, err := time.Parse(timeFormat, authority.ValidityExpiry)
 		if err == nil {
-			rowStyle = checkCertExpiry(expiry)
+			rowColor = checkCertExpiry(expiry)
 		}
 
 		if wideTermWidth {
 			tw.AppendRow(table.Row{
-				rowStyle.Render(authority.ID),
-				rowStyle.Render(authority.CN),
-				rowStyle.Render(authority.CreationTime),
-				rowStyle.Render(authority.Type),
-				rowStyle.Render(authority.KeyAlgorithm),
-				rowStyle.Render(authority.ValidityStart),
-				rowStyle.Render(authority.ValidityExpiry),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.ID),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.CN),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.CreationTime),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.Type),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.KeyAlgorithm),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.ValidityStart),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.ValidityExpiry),
 			})
 		} else {
 			tw.AppendRow(table.Row{
-				rowStyle.Render(authority.ID),
-				rowStyle.Render(authority.CN),
-				rowStyle.Render(authority.ValidityExpiry),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.ID),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.CN),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, authority.ValidityExpiry),
 			})
 		}
 	}

client/command/certificates/certificates.go

@@ -2,6 +2,7 @@ package certificates
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/bishopfox/sliver/client/command/settings"
@@ -94,22 +95,22 @@ func CertificateInfoCmd(cmd *cobra.Command, con *console.SliverClient, args []st
 	printCertificateInfo(con, certificateInfo.Info)
 }
 
-func checkCertExpiry(expiryTime time.Time) console.TextStyle {
+func checkCertExpiry(expiryTime time.Time) string {
 	if expiryTime.Before(time.Now()) || expiryTime.Equal(time.Now()) {
-		return console.StyleBoldRed
+		return console.Bold + console.Red
 	}
 
 	// One week is 168 hours - this is bad
 	if expiryTime.Before(time.Now().Add(168 * time.Hour)) {
-		return console.StyleBoldRed
+		return console.Bold + console.Red
 	}
 
 	// One month is approximately 730 hours - this is a warning
 	if expiryTime.Before(time.Now().Add(730 * time.Hour)) {
-		return console.StyleBoldOrange
+		return console.Bold + console.Orange
 	}
 
-	return console.StyleNormal
+	return console.Normal
 }
 
 func printCertificateInfo(con *console.SliverClient, certData []*clientpb.CertificateData) {
@@ -147,28 +148,28 @@ func printCertificateInfo(con *console.SliverClient, certData []*clientpb.Certif
 	}
 
 	for _, cert := range certData {
-		rowStyle := console.StyleNormal
+		rowColor := console.Normal
 
 		expiry, err := time.Parse(timeFormat, cert.ValidityExpiry)
 		// This should not error out, but if it does, the row will not be colored
 		if err == nil {
-			rowStyle = checkCertExpiry(expiry)
+			rowColor = checkCertExpiry(expiry)
 		}
 		if wideTermWidth {
 			tw.AppendRow(table.Row{
-				rowStyle.Render(cert.ID),
-				rowStyle.Render(cert.CN),
-				rowStyle.Render(cert.CreationTime),
-				rowStyle.Render(cert.Type),
-				rowStyle.Render(cert.KeyAlgorithm),
-				rowStyle.Render(cert.ValidityStart),
-				rowStyle.Render(cert.ValidityExpiry),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.ID),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.CN),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.CreationTime),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.Type),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.KeyAlgorithm),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.ValidityStart),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.ValidityExpiry),
 			})
 		} else {
 			tw.AppendRow(table.Row{
-				rowStyle.Render(cert.ID),
-				rowStyle.Render(cert.CN),
-				rowStyle.Render(cert.ValidityExpiry),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.ID),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.CN),
+				fmt.Sprintf(rowColor+"%s"+console.Normal, cert.ValidityExpiry),
 			})
 		}
 

client/command/completers/completers.go

@@ -22,7 +22,6 @@ import (
 	"net"
 
 	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
 )
 
 // ClientInterfacesCompleter completes interface addresses on the client host.
@@ -85,60 +84,3 @@ func LocalProxyCompleter() carapace.Action {
 		}).Invoke(c).Prefix(prefix).ToA()
 	})
 }
-
-// LocalFilePathCompleter completes local file and directory paths.
-func LocalFilePathCompleter() carapace.Action {
-	return carapace.ActionFiles().Tag("local file path")
-}
-
-// RegisterLocalFilePathFlagCompletion registers local file-path completion for a flag.
-func RegisterLocalFilePathFlagCompletion(cmd *cobra.Command, name string) {
-	if cmd == nil {
-		return
-	}
-	if _, ok := cmd.GetFlagCompletionFunc(name); ok {
-		return
-	}
-	if cmd.Flags().Lookup(name) == nil && cmd.PersistentFlags().Lookup(name) == nil {
-		return
-	}
-	_ = cmd.RegisterFlagCompletionFunc(name, func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
-		return nil, cobra.ShellCompDirectiveDefault
-	})
-}
-
-// RegisterLocalFilePathFlagCompletions registers local file-path completion for a list of flags.
-func RegisterLocalFilePathFlagCompletions(cmd *cobra.Command, names ...string) {
-	for _, name := range names {
-		RegisterLocalFilePathFlagCompletion(cmd, name)
-	}
-}
-
-// RegisterLocalFilePathPositionalCompletion registers local file-path completion for a positional argument index.
-func RegisterLocalFilePathPositionalCompletion(cmd *cobra.Command, index int) {
-	if cmd == nil || index < 0 {
-		return
-	}
-	if cmd.ValidArgsFunction != nil {
-		return
-	}
-	cmd.ValidArgsFunction = func(_ *cobra.Command, args []string, _ string) ([]string, cobra.ShellCompDirective) {
-		if len(args) == index {
-			return nil, cobra.ShellCompDirectiveDefault
-		}
-		return nil, cobra.ShellCompDirectiveNoFileComp
-	}
-}
-
-// RegisterLocalFilePathPositionalAnyCompletion registers local file-path completion for all positional arguments.
-func RegisterLocalFilePathPositionalAnyCompletion(cmd *cobra.Command) {
-	if cmd == nil {
-		return
-	}
-	if cmd.ValidArgsFunction != nil {
-		return
-	}
-	cmd.ValidArgsFunction = func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
-		return nil, cobra.ShellCompDirectiveDefault
-	}
-}

client/command/crack/commands.go

@@ -1,7 +1,6 @@
 package crack
 
 import (
-	"github.com/bishopfox/sliver/client/command/completers"
 	"github.com/rsteube/carapace"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -25,7 +24,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	}
 	flags.Bind("", true, crackCmd, func(f *pflag.FlagSet) {
 		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-		bindCrackFlags(f)
 	})
 
 	crackStationsCmd := &cobra.Command{
@@ -36,9 +34,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 			CrackStationsCmd(cmd, con, args)
 		},
 	}
-	flags.Bind("", false, crackStationsCmd, func(f *pflag.FlagSet) {
-		f.Bool("show-benchmarks", false, "show benchmark rates for crackstations")
-	})
 	crackCmd.AddCommand(crackStationsCmd)
 
 	wordlistsCmd := &cobra.Command{
@@ -62,7 +57,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		f.StringP("name", "n", "", "wordlist name (blank = filename)")
 	})
 	carapace.Gen(wordlistsAddCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to local wordlist file"))
-	completers.RegisterLocalFilePathPositionalCompletion(wordlistsAddCmd, 0)
 	wordlistsCmd.AddCommand(wordlistsAddCmd)
 
 	wordlistsRmCmd := &cobra.Command{
@@ -97,7 +91,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		f.StringP("name", "n", "", "rules name (blank = filename)")
 	})
 	carapace.Gen(rulesAddCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to local rules file"))
-	completers.RegisterLocalFilePathPositionalCompletion(rulesAddCmd, 0)
 	rulesCmd.AddCommand(rulesAddCmd)
 
 	rulesRmCmd := &cobra.Command{
@@ -133,7 +126,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		f.StringP("name", "n", "", "hcstat2 name (blank = filename)")
 	})
 	carapace.Gen(hcstat2AddCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to local hcstat2 file"))
-	completers.RegisterLocalFilePathPositionalCompletion(hcstat2AddCmd, 0)
 	hcstat2Cmd.AddCommand(hcstat2AddCmd)
 
 	hcstat2RmCmd := &cobra.Command{

client/command/crack/crack-command.go

@@ -1,326 +0,0 @@
-package crack
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-func shouldRunCrack(cmd *cobra.Command, args []string) bool {
-	if len(args) > 0 {
-		return true
-	}
-
-	hasFlag := false
-	cmd.Flags().VisitAll(func(flag *pflag.Flag) {
-		if flag.Changed && flag.Name != "timeout" {
-			hasFlag = true
-		}
-	})
-	return hasFlag
-}
-
-func buildCrackCommand(cmd *cobra.Command, args []string) (*clientpb.CrackCommand, error) {
-	flags := cmd.Flags()
-	req := &clientpb.CrackCommand{}
-
-	if flags.Changed("attack-mode") {
-		raw, _ := flags.GetString("attack-mode")
-		attackMode, err := parseCrackAttackMode(raw)
-		if err != nil {
-			return nil, err
-		}
-		req.AttackMode = attackMode
-	}
-
-	if flags.Changed("hash-type") {
-		raw, _ := flags.GetString("hash-type")
-		hashType, err := parseHashType(raw)
-		if err != nil {
-			return nil, err
-		}
-		req.HashType = hashType
-	}
-
-	hashes, _ := flags.GetStringSlice("hash")
-	if len(args) > 0 {
-		hashes = append(hashes, args...)
-	}
-	req.Hashes = hashes
-
-	req.Quiet, _ = flags.GetBool("quiet")
-	req.HexCharset, _ = flags.GetBool("hex-charset")
-	req.HexSalt, _ = flags.GetBool("hex-salt")
-	req.HexWordlist, _ = flags.GetBool("hex-wordlist")
-	req.Force, _ = flags.GetBool("force")
-	req.DeprecatedCheckDisable, _ = flags.GetBool("deprecated-check-disable")
-	req.Status, _ = flags.GetBool("status")
-	req.StatusJSON, _ = flags.GetBool("status-json")
-	req.StatusTimer, _ = flags.GetUint32("status-timer")
-	req.StdinTimeoutAbort, _ = flags.GetUint32("stdin-timeout-abort")
-	req.MachineReadable, _ = flags.GetBool("machine-readable")
-	req.KeepGuessing, _ = flags.GetBool("keep-guessing")
-	req.SelfTestDisable, _ = flags.GetBool("self-test-disable")
-	req.Loopback, _ = flags.GetBool("loopback")
-
-	if raw, _ := flags.GetString("markov-hcstat2"); raw != "" {
-		req.MarkovHcstat2 = []byte(raw)
-	}
-	req.MarkovDisable, _ = flags.GetBool("markov-disable")
-	req.MarkovClassic, _ = flags.GetBool("markov-classic")
-	req.MarkovInverse, _ = flags.GetBool("markov-inverse")
-	req.MarkovThreshold, _ = flags.GetUint32("markov-threshold")
-	req.Runtime, _ = flags.GetUint32("runtime")
-	req.Session, _ = flags.GetString("session")
-	req.Restore, _ = flags.GetBool("restore")
-	req.RestoreDisable, _ = flags.GetBool("restore-disable")
-	if raw, _ := flags.GetString("restore-file"); raw != "" {
-		req.RestoreFile = []byte(raw)
-	}
-
-	if formats, _ := flags.GetStringSlice("outfile-format"); len(formats) > 0 {
-		for _, raw := range formats {
-			format, err := parseCrackOutfileFormat(raw)
-			if err != nil {
-				return nil, err
-			}
-			req.OutfileFormat = append(req.OutfileFormat, format)
-		}
-	}
-	req.OutfileAutohexDisable, _ = flags.GetBool("outfile-autohex-disable")
-	req.OutfileCheckTimer, _ = flags.GetUint32("outfile-check-timer")
-	req.WordlistAutohexDisable, _ = flags.GetBool("wordlist-autohex-disable")
-	req.Separator, _ = flags.GetString("separator")
-	req.Stdout, _ = flags.GetBool("stdout")
-	req.Show, _ = flags.GetBool("show")
-	req.Left, _ = flags.GetBool("left")
-	req.Username, _ = flags.GetBool("username")
-	req.Remove, _ = flags.GetBool("remove")
-	req.RemoveTimer, _ = flags.GetUint32("remove-timer")
-	req.PotfileDisable, _ = flags.GetBool("potfile-disable")
-	if raw, _ := flags.GetString("potfile"); raw != "" {
-		req.Potfile = []byte(raw)
-	}
-
-	if flags.Changed("encoding-from") {
-		raw, _ := flags.GetString("encoding-from")
-		enc, err := parseCrackEncoding(raw)
-		if err != nil {
-			return nil, err
-		}
-		req.EncodingFrom = enc
-	}
-	if flags.Changed("encoding-to") {
-		raw, _ := flags.GetString("encoding-to")
-		enc, err := parseCrackEncoding(raw)
-		if err != nil {
-			return nil, err
-		}
-		req.EncodingTo = enc
-	}
-
-	req.DebugMode, _ = flags.GetUint32("debug-mode")
-	req.LogfileDisable, _ = flags.GetBool("logfile-disable")
-	req.HccapxMessagePair, _ = flags.GetUint32("hccapx-message-pair")
-	req.NonceErrorCorrections, _ = flags.GetUint32("nonce-error-corrections")
-	if raw, _ := flags.GetString("keyboard-layout-mapping"); raw != "" {
-		req.KeyboardLayoutMapping = []byte(raw)
-	}
-
-	req.Benchmark, _ = flags.GetBool("benchmark")
-	req.BenchmarkAll, _ = flags.GetBool("benchmark-all")
-	req.SpeedOnly, _ = flags.GetBool("speed-only")
-	req.ProgressOnly, _ = flags.GetBool("progress-only")
-	req.SegmentSize, _ = flags.GetUint32("segment-size")
-	req.BitmapMin, _ = flags.GetUint32("bitmap-min")
-	req.BitmapMax, _ = flags.GetUint32("bitmap-max")
-	req.CPUAffinity = uintSliceToUint32(flags, "cpu-affinity")
-	req.HookThreads, _ = flags.GetUint32("hook-threads")
-	req.HashInfo, _ = flags.GetBool("hash-info")
-	req.BackendIgnoreCUDA, _ = flags.GetBool("backend-ignore-cuda")
-	req.BackendIgnoreHip, _ = flags.GetBool("backend-ignore-hip")
-	req.BackendIgnoreMetal, _ = flags.GetBool("backend-ignore-metal")
-	req.BackendIgnoreOpenCL, _ = flags.GetBool("backend-ignore-opencl")
-	req.BackendInfo, _ = flags.GetBool("backend-info")
-	req.BackendDevices = uintSliceToUint32(flags, "backend-devices")
-	req.OpenCLDeviceTypes = uintSliceToUint32(flags, "opencl-device-types")
-	req.OptimizedKernelEnable, _ = flags.GetBool("optimized-kernel-enable")
-	req.MultiplyAccelDisabled, _ = flags.GetBool("multiply-accel-disabled")
-
-	if flags.Changed("workload-profile") {
-		raw, _ := flags.GetString("workload-profile")
-		profile, err := parseCrackWorkloadProfile(raw)
-		if err != nil {
-			return nil, err
-		}
-		req.WorkloadProfile = profile
-	}
-
-	req.KernelAccel, _ = flags.GetUint32("kernel-accel")
-	req.KernelLoops, _ = flags.GetUint32("kernel-loops")
-	req.KernelThreads, _ = flags.GetUint32("kernel-threads")
-	req.BackendVectorWidth, _ = flags.GetUint32("backend-vector-width")
-	req.SpinDamp, _ = flags.GetUint32("spin-damp")
-	req.HwmonDisable, _ = flags.GetBool("hwmon-disable")
-	req.HwmonTempAbort, _ = flags.GetUint32("hwmon-temp-abort")
-	req.ScryptTMTO, _ = flags.GetUint32("scrypt-tmto")
-	req.Skip, _ = flags.GetUint64("skip")
-	req.Limit, _ = flags.GetUint64("limit")
-	req.Keyspace, _ = flags.GetBool("keyspace")
-
-	if raw, _ := flags.GetString("rules-file"); raw != "" {
-		req.RulesFile = []byte(raw)
-	}
-	req.GenerateRules, _ = flags.GetUint32("generate-rules")
-	req.GenerateRulesFunMin, _ = flags.GetUint32("generate-rules-fun-min")
-	req.GenerateRulesFunMax, _ = flags.GetUint32("generate-rules-fun-max")
-	req.GenerateRulesFuncSel, _ = flags.GetString("generate-rules-func-sel")
-	req.GenerateRulesSeed, _ = flags.GetInt32("generate-rules-seed")
-	req.CustomCharset1, _ = flags.GetString("custom-charset1")
-	req.CustomCharset2, _ = flags.GetString("custom-charset2")
-	req.CustomCharset3, _ = flags.GetString("custom-charset3")
-	req.CustomCharset4, _ = flags.GetString("custom-charset4")
-	req.Identify, _ = flags.GetString("identify")
-	req.Increment, _ = flags.GetBool("increment")
-	req.IncrementMin, _ = flags.GetUint32("increment-min")
-	req.IncrementMax, _ = flags.GetUint32("increment-max")
-	req.SlowCandidates, _ = flags.GetBool("slow-candidates")
-	req.BrainServer, _ = flags.GetBool("brain-server")
-	req.BrainServerTimer, _ = flags.GetUint32("brain-server-timer")
-	req.BrainClient, _ = flags.GetBool("brain-client")
-	req.BrainClientFeatures, _ = flags.GetString("brain-client-features")
-	req.BrainHost, _ = flags.GetString("brain-host")
-	req.BrainPort, _ = flags.GetUint32("brain-port")
-	req.BrainPassword, _ = flags.GetString("brain-password")
-	req.BrainSession, _ = flags.GetString("brain-session")
-	req.BrainSessionWhitelist, _ = flags.GetString("brain-session-whitelist")
-
-	return req, nil
-}
-
-func uintSliceToUint32(flags *pflag.FlagSet, name string) []uint32 {
-	values, _ := flags.GetUintSlice(name)
-	if len(values) == 0 {
-		return nil
-	}
-	out := make([]uint32, len(values))
-	for i, value := range values {
-		out[i] = uint32(value)
-	}
-	return out
-}
-
-func parseCrackAttackMode(raw string) (clientpb.CrackAttackMode, error) {
-	if raw == "" {
-		return clientpb.CrackAttackMode_STRAIGHT, nil
-	}
-	if numeric, err := strconv.ParseInt(raw, 10, 32); err == nil {
-		return clientpb.CrackAttackMode(numeric), nil
-	}
-
-	normalized := strings.ToLower(strings.TrimSpace(raw))
-	normalized = strings.NewReplacer("-", "_", " ", "_").Replace(normalized)
-	switch normalized {
-	case "straight":
-		return clientpb.CrackAttackMode_STRAIGHT, nil
-	case "combination":
-		return clientpb.CrackAttackMode_COMBINATION, nil
-	case "bruteforce", "brute_force", "brute-force":
-		return clientpb.CrackAttackMode_BRUTEFORCE, nil
-	case "hybrid_wordlist_mask":
-		return clientpb.CrackAttackMode_HYBRID_WORDLIST_MASK, nil
-	case "hybrid_mask_wordlist":
-		return clientpb.CrackAttackMode_HYBRID_MASK_WORDLIST, nil
-	case "association":
-		return clientpb.CrackAttackMode_ASSOCIATION, nil
-	case "no_attack", "none":
-		return clientpb.CrackAttackMode_NO_ATTACK, nil
-	default:
-		return clientpb.CrackAttackMode_STRAIGHT, fmt.Errorf("unknown attack mode: %s", raw)
-	}
-}
-
-func parseHashType(raw string) (clientpb.HashType, error) {
-	if raw == "" {
-		return clientpb.HashType_MD5, nil
-	}
-	if numeric, err := strconv.ParseInt(raw, 10, 32); err == nil {
-		return clientpb.HashType(numeric), nil
-	}
-	key := normalizeEnumKey(raw)
-	if value, ok := clientpb.HashType_value[key]; ok {
-		return clientpb.HashType(value), nil
-	}
-	return clientpb.HashType_MD5, fmt.Errorf("unknown hash type: %s", raw)
-}
-
-func parseCrackEncoding(raw string) (clientpb.CrackEncoding, error) {
-	if raw == "" {
-		return clientpb.CrackEncoding_INVALID_ENCODING, nil
-	}
-	if numeric, err := strconv.ParseInt(raw, 10, 32); err == nil {
-		return clientpb.CrackEncoding(numeric), nil
-	}
-	key := normalizeEnumKey(raw)
-	if value, ok := clientpb.CrackEncoding_value[key]; ok {
-		return clientpb.CrackEncoding(value), nil
-	}
-	return clientpb.CrackEncoding_INVALID_ENCODING, fmt.Errorf("unknown encoding: %s", raw)
-}
-
-func parseCrackOutfileFormat(raw string) (clientpb.CrackOutfileFormat, error) {
-	if raw == "" {
-		return clientpb.CrackOutfileFormat_INVALID_FORMAT, nil
-	}
-	if numeric, err := strconv.ParseInt(raw, 10, 32); err == nil {
-		return clientpb.CrackOutfileFormat(numeric), nil
-	}
-	key := normalizeEnumKey(raw)
-	if value, ok := clientpb.CrackOutfileFormat_value[key]; ok {
-		return clientpb.CrackOutfileFormat(value), nil
-	}
-	return clientpb.CrackOutfileFormat_INVALID_FORMAT, fmt.Errorf("unknown outfile format: %s", raw)
-}
-
-func parseCrackWorkloadProfile(raw string) (clientpb.CrackWorkloadProfile, error) {
-	if raw == "" {
-		return clientpb.CrackWorkloadProfile_INVALID_WORKLOAD_PROFILE, nil
-	}
-	if numeric, err := strconv.ParseInt(raw, 10, 32); err == nil {
-		return clientpb.CrackWorkloadProfile(numeric), nil
-	}
-	key := normalizeEnumKey(raw)
-	if value, ok := clientpb.CrackWorkloadProfile_value[key]; ok {
-		return clientpb.CrackWorkloadProfile(value), nil
-	}
-	return clientpb.CrackWorkloadProfile_INVALID_WORKLOAD_PROFILE, fmt.Errorf("unknown workload profile: %s", raw)
-}
-
-func normalizeEnumKey(value string) string {
-	if value == "" {
-		return ""
-	}
-	var builder strings.Builder
-	builder.Grow(len(value))
-	underscore := false
-	for i := 0; i < len(value); i++ {
-		ch := value[i]
-		if (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') {
-			if ch >= 'a' && ch <= 'z' {
-				ch -= 'a' - 'A'
-			}
-			builder.WriteByte(ch)
-			underscore = false
-			continue
-		}
-		if !underscore {
-			builder.WriteByte('_')
-			underscore = true
-		}
-	}
-	return strings.Trim(builder.String(), "_")
-}

client/command/crack/crack-files.go

@@ -106,17 +106,17 @@ func PrintCrackFiles(crackFiles *clientpb.CrackFiles, con *console.SliverClient)
 
 func PrintCrackFilesByType(crackFiles *clientpb.CrackFiles, con *console.SliverClient) {
 	wordlistTable := table.NewWriter()
-	wordlistTable.SetTitle(console.StyleBold.Render("Wordlists"))
+	wordlistTable.SetTitle(console.Bold + "Wordlists" + console.Normal)
 	wordlistTable.SetStyle(settings.GetTableStyle(con))
 	wordlistTable.AppendHeader(table.Row{"Name", "Size"})
 
 	rulesTable := table.NewWriter()
-	rulesTable.SetTitle(console.StyleBold.Render("Rules"))
+	rulesTable.SetTitle(console.Bold + "Rules" + console.Normal)
 	rulesTable.SetStyle(settings.GetTableStyle(con))
 	rulesTable.AppendHeader(table.Row{"Name", "Size"})
 
 	hcTable := table.NewWriter()
-	hcTable.SetTitle(console.StyleBold.Render("Markov Hcstat2"))
+	hcTable.SetTitle(console.Bold + "Markov Hcstat2" + console.Normal)
 	hcTable.SetStyle(settings.GetTableStyle(con))
 	hcTable.AppendHeader(table.Row{"Name", "Size"})
 

client/command/crack/crack-flags.go

@@ -1,108 +0,0 @@
-package crack
-
-import "github.com/spf13/pflag"
-
-func bindCrackFlags(f *pflag.FlagSet) {
-	f.String("attack-mode", "", "crack attack mode (straight, combination, bruteforce, hybrid-wordlist-mask, hybrid-mask-wordlist, association, no-attack, or numeric)")
-	f.String("hash-type", "", "hashcat hash type (number or enum name)")
-	f.StringSlice("hash", nil, "hashes to crack (repeatable)")
-	f.Bool("quiet", false, "quiet mode")
-	f.Bool("hex-charset", false, "treat charset as hex")
-	f.Bool("hex-salt", false, "treat salt as hex")
-	f.Bool("hex-wordlist", false, "treat wordlist as hex")
-	f.Bool("force", false, "ignore warnings")
-	f.Bool("deprecated-check-disable", false, "disable deprecated check")
-	f.Bool("status", false, "enable status")
-	f.Bool("status-json", false, "emit status in JSON")
-	f.Uint32("status-timer", 0, "status timer interval (seconds)")
-	f.Uint32("stdin-timeout-abort", 0, "abort after stdin timeout (seconds)")
-	f.Bool("machine-readable", false, "machine readable output")
-	f.Bool("keep-guessing", false, "keep guessing")
-	f.Bool("self-test-disable", false, "disable self-test")
-	f.Bool("loopback", false, "use loopback mode")
-	f.String("markov-hcstat2", "", "markov hcstat2 filename or identifier")
-	f.Bool("markov-disable", false, "disable markov mode")
-	f.Bool("markov-classic", false, "use classic markov")
-	f.Bool("markov-inverse", false, "use inverse markov")
-	f.Uint32("markov-threshold", 0, "markov threshold")
-	f.Uint32("runtime", 0, "runtime in seconds")
-	f.String("session", "", "session name")
-	f.Bool("restore", false, "restore session")
-	f.Bool("restore-disable", false, "disable restore")
-	f.String("restore-file", "", "restore file path or identifier")
-	f.StringSlice("outfile-format", nil, "outfile formats (hash-salt, plain, hex-plain, crack-pos, timestamp-absolute, timestamp-relative, or numeric)")
-	f.Bool("outfile-autohex-disable", false, "disable outfile autohex")
-	f.Uint32("outfile-check-timer", 0, "outfile check timer interval (seconds)")
-	f.Bool("wordlist-autohex-disable", false, "disable wordlist autohex")
-	f.String("separator", "", "separator character")
-	f.Bool("stdout", false, "stdout output")
-	f.Bool("show", false, "show cracked hashes")
-	f.Bool("left", false, "show uncracked hashes")
-	f.Bool("username", false, "enable username handling")
-	f.Bool("remove", false, "remove cracked hashes")
-	f.Uint32("remove-timer", 0, "remove timer interval (seconds)")
-	f.Bool("potfile-disable", false, "disable potfile")
-	f.String("potfile", "", "potfile path or identifier")
-	f.String("encoding-from", "", "input encoding (iso-8859-15, utf-32le, or numeric)")
-	f.String("encoding-to", "", "output encoding (iso-8859-15, utf-32le, or numeric)")
-	f.Uint32("debug-mode", 0, "debug mode mask")
-	f.Bool("logfile-disable", false, "disable logfile")
-	f.Uint32("hccapx-message-pair", 0, "hccapx message pair")
-	f.Uint32("nonce-error-corrections", 0, "nonce error corrections")
-	f.String("keyboard-layout-mapping", "", "keyboard layout mapping file or identifier")
-	f.Bool("benchmark", false, "run benchmark")
-	f.Bool("benchmark-all", false, "run full benchmark")
-	f.Bool("speed-only", false, "show speed only")
-	f.Bool("progress-only", false, "show progress only")
-	f.Uint32("segment-size", 0, "segment size")
-	f.Uint32("bitmap-min", 0, "bitmap min")
-	f.Uint32("bitmap-max", 0, "bitmap max")
-	f.UintSlice("cpu-affinity", nil, "CPU affinity list")
-	f.Uint32("hook-threads", 0, "hook threads")
-	f.Bool("hash-info", false, "show hash information")
-	f.Bool("backend-ignore-cuda", false, "ignore CUDA backend")
-	f.Bool("backend-ignore-hip", false, "ignore HIP backend")
-	f.Bool("backend-ignore-metal", false, "ignore Metal backend")
-	f.Bool("backend-ignore-opencl", false, "ignore OpenCL backend")
-	f.Bool("backend-info", false, "show backend info")
-	f.UintSlice("backend-devices", nil, "backend device IDs")
-	f.UintSlice("opencl-device-types", nil, "OpenCL device types")
-	f.Bool("optimized-kernel-enable", false, "enable optimized kernels")
-	f.Bool("multiply-accel-disabled", false, "disable multiply accel")
-	f.String("workload-profile", "", "workload profile (low, default, high, nightmare, or numeric)")
-	f.Uint32("kernel-accel", 0, "kernel acceleration")
-	f.Uint32("kernel-loops", 0, "kernel loops")
-	f.Uint32("kernel-threads", 0, "kernel threads")
-	f.Uint32("backend-vector-width", 0, "backend vector width")
-	f.Uint32("spin-damp", 0, "spin damp")
-	f.Bool("hwmon-disable", false, "disable hardware monitoring")
-	f.Uint32("hwmon-temp-abort", 0, "hardware monitor temperature abort")
-	f.Uint32("scrypt-tmto", 0, "scrypt tmto")
-	f.Uint64("skip", 0, "skip count")
-	f.Uint64("limit", 0, "limit count")
-	f.Bool("keyspace", false, "show keyspace")
-	f.String("rules-file", "", "rules file path or identifier")
-	f.Uint32("generate-rules", 0, "generate rules")
-	f.Uint32("generate-rules-fun-min", 0, "generate rules function min")
-	f.Uint32("generate-rules-fun-max", 0, "generate rules function max")
-	f.String("generate-rules-func-sel", "", "generate rules function selection")
-	f.Int32("generate-rules-seed", 0, "generate rules seed")
-	f.String("custom-charset1", "", "custom charset 1")
-	f.String("custom-charset2", "", "custom charset 2")
-	f.String("custom-charset3", "", "custom charset 3")
-	f.String("custom-charset4", "", "custom charset 4")
-	f.String("identify", "", "identify hash")
-	f.Bool("increment", false, "incremental mode")
-	f.Uint32("increment-min", 0, "increment min")
-	f.Uint32("increment-max", 0, "increment max")
-	f.Bool("slow-candidates", false, "slow candidates")
-	f.Bool("brain-server", false, "brain server mode")
-	f.Uint32("brain-server-timer", 0, "brain server timer")
-	f.Bool("brain-client", false, "brain client mode")
-	f.String("brain-client-features", "", "brain client features")
-	f.String("brain-host", "", "brain host")
-	f.Uint32("brain-port", 0, "brain port")
-	f.String("brain-password", "", "brain password")
-	f.String("brain-session", "", "brain session")
-	f.String("brain-session-whitelist", "", "brain session whitelist")
-}

client/command/crack/crack.go

@@ -22,7 +22,6 @@ import (
 	"context"
 	"fmt"
 	"sort"
-	"time"
 
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
@@ -35,37 +34,6 @@ import (
 
 // CrackCmd - GPU password cracking interface
 func CrackCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	if shouldRunCrack(cmd, args) {
-		crackCmd, err := buildCrackCommand(cmd, args)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-
-		timeoutSeconds, _ := cmd.Flags().GetInt64("timeout")
-		ctx := context.Background()
-		if timeoutSeconds > 0 {
-			var cancel context.CancelFunc
-			ctx, cancel = context.WithTimeout(ctx, time.Duration(timeoutSeconds)*time.Second)
-			defer cancel()
-		}
-
-		resp, err := con.Rpc.Crack(ctx, crackCmd)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		if resp == nil || resp.Job == nil {
-			con.PrintInfof("Crack request submitted\n")
-			return
-		}
-		con.PrintInfof("Crack job %s created (status: %s)\n", resp.Job.ID, resp.Job.Status.String())
-		if resp.Job.Err != "" {
-			con.PrintErrorf("Crack job error: %s\n", resp.Job.Err)
-		}
-		return
-	}
-
 	if !AreCrackersOnline(con) {
 		PrintNoCrackstations(con)
 	} else {
@@ -96,11 +64,10 @@ func CrackStationsCmd(cmd *cobra.Command, con *console.SliverClient, args []stri
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	showBenchmarks, _ := cmd.Flags().GetBool("show-benchmarks")
 	if len(crackers.Crackstations) == 0 {
 		PrintNoCrackstations(con)
 	} else {
-		PrintCrackers(crackers.Crackstations, con, showBenchmarks)
+		PrintCrackers(crackers.Crackstations, con)
 	}
 }
 
@@ -116,12 +83,12 @@ func AreCrackersOnline(con *console.SliverClient) bool {
 	return len(crackers.Crackstations) > 0
 }
 
-func PrintCrackers(crackers []*clientpb.Crackstation, con *console.SliverClient, showBenchmarks bool) {
+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, showBenchmarks)
+		printCracker(cracker, index, con)
 		if index < len(crackers)-1 {
 			con.Println()
 			con.Println()
@@ -129,63 +96,53 @@ func PrintCrackers(crackers []*clientpb.Crackstation, con *console.SliverClient,
 	}
 }
 
-func printCracker(cracker *clientpb.Crackstation, index int, con *console.SliverClient, showBenchmarks bool) {
+func printCracker(cracker *clientpb.Crackstation, index int, con *console.SliverClient) {
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
-	tw.SetTitle(console.StyleBoldOrange.Render(fmt.Sprintf(">>> Crackstation %02d - %s (%s)", index+1, cracker.Name, cracker.OperatorName)) + "\n")
+	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.StyleBold.Render("Operating System"), fmt.Sprintf("%s/%s", cracker.GOOS, cracker.GOARCH)})
-	tw.AppendRow(table.Row{console.StyleBold.Render("Hashcat Version"), cracker.HashcatVersion})
+	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.StyleBold.Render("CUDA Device"), console.StyleBoldGreen.Render(fmt.Sprintf("%s (%s)", cuda.Name, cuda.Version))})
-			tw.AppendRow(table.Row{console.StyleBold.Render("Memory"), fmt.Sprintf("%s free of %s", cuda.MemoryFree, cuda.MemoryTotal)})
-			tw.AppendRow(table.Row{console.StyleBold.Render("Clock"), fmt.Sprintf("%d", cuda.Clock)})
-			tw.AppendRow(table.Row{console.StyleBold.Render("Processors"), fmt.Sprintf("%d", cuda.Processors)})
+			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.StyleBold.Render("Metal Device"), console.StyleBoldGreen.Render(fmt.Sprintf("%s (%s)", metal.Name, metal.Version))})
-			tw.AppendRow(table.Row{console.StyleBold.Render("Memory"), fmt.Sprintf("%s free of %s", metal.MemoryFree, metal.MemoryTotal)})
-			tw.AppendRow(table.Row{console.StyleBold.Render("Clock"), fmt.Sprintf("%d", metal.Clock)})
-			tw.AppendRow(table.Row{console.StyleBold.Render("Processors"), fmt.Sprintf("%d", metal.Processors)})
+			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.StyleBold.Render("OpenCL Device"), console.StyleBoldGreen.Render(fmt.Sprintf("%s (%s)", openCL.Name, openCL.Version))})
-			tw.AppendRow(table.Row{console.StyleBold.Render("Memory"), fmt.Sprintf("%s free of %s", openCL.MemoryFree, openCL.MemoryTotal)})
-			tw.AppendRow(table.Row{console.StyleBold.Render("Clock"), fmt.Sprintf("%d", openCL.Clock)})
-			tw.AppendRow(table.Row{console.StyleBold.Render("Processors"), fmt.Sprintf("%d", openCL.Processors)})
+			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())
-	if showBenchmarks {
-		con.Println()
-		printBenchmarks(cracker, con)
-	}
+	con.Println()
+	printBenchmarks(cracker, con)
 }
 
 func printBenchmarks(cracker *clientpb.Crackstation, con *console.SliverClient) {
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
-	tw.SetTitle(console.StyleBold.Render("Benchmarks"))
+	tw.SetTitle(console.Bold + "Benchmarks" + console.Normal)
 	tw.SortBy([]table.SortBy{{Name: "Hash Type"}})
-	tw.AppendHeader(table.Row{"Hash Type", "Rate"})
-	if len(cracker.Benchmarks) == 0 {
-		tw.AppendRow(table.Row{"No benchmarks reported", "-"})
-	} else {
-		for hashType, speed := range cracker.Benchmarks {
-			name, ok := hashcatHashTypeName(hashType)
-			if !ok {
-				name = clientpb.HashType(hashType).String()
-			}
-			tw.AppendRow(table.Row{name, humanizeHashRate(speed)})
-		}
+	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/hashcat_types.go

@@ -1,419 +0,0 @@
-package crack
-
-import "fmt"
-
-// Hashcat mode names sourced from client/credentials/EXAMPLES.md.
-var hashcatHashTypes = map[int32]string{
-	0:     "MD5",
-	10:    "md5($pass.$salt)",
-	11:    "Joomla < 2.5.18",
-	12:    "PostgreSQL",
-	20:    "md5($salt.$pass)",
-	21:    "osCommerce, xt:Commerce",
-	22:    "Juniper NetScreen/SSG (ScreenOS)",
-	23:    "Skype",
-	24:    "SolarWinds Serv-U",
-	30:    "md5(utf16le($pass).$salt)",
-	40:    "md5($salt.utf16le($pass))",
-	50:    "HMAC-MD5 (key = $pass)",
-	60:    "HMAC-MD5 (key = $salt)",
-	70:    "md5(utf16le($pass))",
-	100:   "SHA1",
-	101:   "nsldap, SHA-1(Base64), Netscape LDAP SHA",
-	110:   "sha1($pass.$salt)",
-	111:   "nsldaps, SSHA-1(Base64), Netscape LDAP SSHA",
-	112:   "Oracle S: Type (Oracle 11+)",
-	120:   "sha1($salt.$pass)",
-	121:   "SMF (Simple Machines Forum) > v1.1",
-	122:   "macOS v10.4, macOS v10.5, macOS v10.6",
-	123:   "EPi",
-	124:   "Django (SHA-1)",
-	125:   "ArubaOS",
-	130:   "sha1(utf16le($pass).$salt)",
-	131:   "MSSQL (2000)",
-	132:   "MSSQL (2005)",
-	133:   "PeopleSoft",
-	140:   "sha1($salt.utf16le($pass))",
-	141:   "Episerver 6.x < .NET 4",
-	150:   "HMAC-SHA1 (key = $pass)",
-	160:   "HMAC-SHA1 (key = $salt)",
-	170:   "sha1(utf16le($pass))",
-	190:   "sha1(LinkedIn)",
-	200:   "MySQL323",
-	300:   "MySQL4.1/MySQL5",
-	400:   "phpass, phpBB3 (MD5)",
-	500:   "md5crypt, MD5 (Unix), Cisco-IOS $1$ (MD5)",
-	501:   "Juniper IVE",
-	600:   "BLAKE2b-512",
-	900:   "MD4",
-	1000:  "NTLM",
-	1100:  "Domain Cached Credentials (DCC), MS Cache",
-	1300:  "SHA2-224",
-	1400:  "SHA2-256",
-	1410:  "sha256($pass.$salt)",
-	1411:  "SSHA-256(Base64), LDAP {SSHA256}",
-	1420:  "sha256($salt.$pass)",
-	1421:  "hMailServer",
-	1430:  "sha256(utf16le($pass).$salt)",
-	1431:  "base64(sha256(unicode($pass)))",
-	1440:  "sha256($salt.utf16le($pass))",
-	1441:  "Episerver 6.x >= .NET 4",
-	1450:  "HMAC-SHA256 (key = $pass)",
-	1460:  "HMAC-SHA256 (key = $salt)",
-	1470:  "sha256(utf16le($pass))",
-	1500:  "descrypt, DES (Unix), Traditional DES",
-	1600:  "Apache $apr1$ MD5, md5apr1, MD5 (APR)",
-	1700:  "SHA2-512",
-	1710:  "sha512($pass.$salt)",
-	1711:  "SSHA-512(Base64), LDAP {SSHA512}",
-	1720:  "sha512($salt.$pass)",
-	1722:  "macOS v10.7",
-	1730:  "sha512(utf16le($pass).$salt)",
-	1731:  "MSSQL (2012, 2014)",
-	1740:  "sha512($salt.utf16le($pass))",
-	1750:  "HMAC-SHA512 (key = $pass)",
-	1760:  "HMAC-SHA512 (key = $salt)",
-	1770:  "sha512(utf16le($pass))",
-	1800:  "sha512crypt $6$, SHA512 (Unix)",
-	2000:  "STDOUT",
-	2100:  "Domain Cached Credentials 2 (DCC2), MS Cache 2",
-	2400:  "Cisco-PIX MD5",
-	2410:  "Cisco-ASA MD5",
-	2500:  "WPA-EAPOL-PBKDF2",
-	2501:  "WPA-EAPOL-PMK",
-	2600:  "md5(md5($pass))",
-	2611:  "vBulletin < v3.8.5",
-	2612:  "PHPS",
-	2711:  "vBulletin >= v3.8.5",
-	2811:  "MyBB 1.2+, IPB2+ (Invision Power Board)",
-	3000:  "LM",
-	3100:  "Oracle H: Type (Oracle 7+)",
-	3200:  "bcrypt $2\\*$, Blowfish (Unix)",
-	3300:  "MD5(Sun)",
-	3500:  "md5(md5(md5($pass)))",
-	3610:  "md5(md5($salt).$pass )",
-	3710:  "md5($salt.md5($pass))",
-	3711:  "MediaWiki B type",
-	3720:  "md5($pass.md5($salt))",
-	3721:  "WebEdition CMS",
-	3800:  "md5($salt.$pass.$salt)",
-	3910:  "md5(md5($pass).md5($salt))",
-	4010:  "md5($salt.md5($salt.$pass))",
-	4110:  "md5($salt.md5($pass.$salt))",
-	4210:  "md5($username.0.$pass)",
-	4300:  "md5(strtoupper(md5($pass)))",
-	4400:  "md5(sha1($pass))",
-	4500:  "sha1(sha1($pass))",
-	4510:  "sha1(sha1($pass).$salt)",
-	4520:  "sha1($salt.sha1($pass))",
-	4521:  "Redmine",
-	4522:  "PunBB",
-	4600:  "sha1(sha1(sha1($pass)))",
-	4700:  "sha1(md5($pass))",
-	4710:  "sha1(md5($pass).$salt)",
-	4711:  "Huawei sha1(md5($pass).$salt)",
-	4800:  "iSCSI CHAP authentication, MD5(CHAP)",
-	4900:  "sha1($salt.$pass.$salt)",
-	5000:  "sha1(sha1($salt.$pass.$salt))",
-	5100:  "Half MD5",
-	5200:  "Password Safe v3",
-	5300:  "IKE-PSK MD5",
-	5400:  "IKE-PSK SHA1",
-	5500:  "NetNTLMv1 / NetNTLMv1+ESS",
-	5600:  "NetNTLMv2",
-	5700:  "Cisco-IOS type 4 (SHA256)",
-	5800:  "Samsung Android Password/PIN",
-	6000:  "RIPEMD-160",
-	6100:  "Whirlpool",
-	6211:  "TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + AES / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Serpent / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Twofish",
-	6212:  "TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + AES-Twofish / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Serpent-AES / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Twofish-Serpent",
-	6213:  "TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + AES-Twofish-Serpent / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Serpent-Twofish-AES",
-	6221:  "TrueCrypt 5.0+ SHA512 + AES / TrueCrypt 5.0+ SHA512 + Serpent / TrueCrypt 5.0+ SHA512 + Twofish",
-	6222:  "TrueCrypt 5.0+ SHA512 + AES-Twofish / TrueCrypt 5.0+ SHA512 + Serpent-AES / TrueCrypt 5.0+ SHA512 + Twofish-Serpent",
-	6223:  "TrueCrypt 5.0+ SHA512 + AES-Twofish-Serpent / TrueCrypt 5.0+ SHA512 + Serpent-Twofish-AES",
-	6231:  "TrueCrypt 5.0+ Whirlpool + AES / TrueCrypt 5.0+ Whirlpool + Serpent / TrueCrypt 5.0+ Whirlpool + Twofish",
-	6232:  "TrueCrypt 5.0+ Whirlpool + AES-Twofish / TrueCrypt 5.0+ Whirlpool + Serpent-AES / TrueCrypt 5.0+ Whirlpool + Twofish-Serpent",
-	6233:  "TrueCrypt 5.0+ Whirlpool + AES-Twofish-Serpent / TrueCrypt 5.0+ Whirlpool + Serpent-Twofish-AES",
-	6241:  "TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + AES + boot / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Serpent + boot / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Twofish + boot",
-	6242:  "TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + AES-Twofish + boot / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Serpent-AES + boot / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Twofish-Serpent + boot",
-	6243:  "TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + AES-Twofish-Serpent + boot / TrueCrypt 5.0+ PBKDF2-HMAC-RIPEMD160 + Serpent-Twofish-AES + boot",
-	6300:  "AIX {smd5}",
-	6400:  "AIX {ssha256}",
-	6500:  "AIX {ssha512}",
-	6600:  "1Password, agilekeychain",
-	6700:  "AIX {ssha1}",
-	6800:  "LastPass + LastPass sniffed",
-	6900:  "GOST R 34.11-94",
-	7000:  "FortiGate (FortiOS)",
-	7100:  "macOS v10.8+ (PBKDF2-SHA512)",
-	7200:  "GRUB 2",
-	7300:  "IPMI2 RAKP HMAC-SHA1",
-	7400:  "sha256crypt $5$, SHA256 (Unix)",
-	7401:  "MySQL $A$ (sha256crypt)",
-	7500:  "Kerberos 5, etype 23, AS-REQ Pre-Auth",
-	7700:  "SAP CODVN B (BCODE)",
-	7701:  "SAP CODVN B (BCODE) from RFC_READ_TABLE",
-	7800:  "SAP CODVN F/G (PASSCODE)",
-	7801:  "SAP CODVN F/G (PASSCODE) from RFC_READ_TABLE",
-	7900:  "Drupal7",
-	8000:  "Sybase ASE",
-	8100:  "Citrix NetScaler (SHA1)",
-	8200:  "1Password, cloudkeychain",
-	8300:  "DNSSEC (NSEC3)",
-	8400:  "WBB3 (Woltlab Burning Board)",
-	8500:  "RACF",
-	8600:  "Lotus Notes/Domino 5",
-	8700:  "Lotus Notes/Domino 6",
-	8800:  "Android FDE <= 4.3",
-	8900:  "scrypt",
-	9000:  "Password Safe v2",
-	9100:  "Lotus Notes/Domino 8",
-	9200:  "Cisco-IOS $8$ (PBKDF2-SHA256)",
-	9300:  "Cisco-IOS $9$ (scrypt)",
-	9400:  "MS Office 2007",
-	9500:  "MS Office 2010",
-	9600:  "MS Office 2013",
-	9700:  "MS Office <= 2003 MD5 + RC4, oldoffice$0, oldoffice$1",
-	9710:  "MS Office <= 2003 $0/$1, MD5 + RC4, collider #1",
-	9720:  "MS Office <= 2003 $0/$1, MD5 + RC4, collider #2",
-	9800:  "MS Office <= 2003 SHA1 + RC4, oldoffice$3, oldoffice$4",
-	9810:  "MS Office <= 2003 $3, SHA1 + RC4, collider #1",
-	9820:  "MS Office <= 2003 $3, SHA1 + RC4, collider #2",
-	9900:  "Radmin2",
-	10000: "Django (PBKDF2-SHA256)",
-	10100: "SipHash",
-	10200: "CRAM-MD5",
-	10300: "SAP CODVN H (PWDSALTEDHASH) iSSHA-1",
-	10400: "PDF 1.1 - 1.3 (Acrobat 2 - 4)",
-	10410: "PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1",
-	10420: "PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2",
-	10500: "PDF 1.4 - 1.6 (Acrobat 5 - 8)",
-	10600: "PDF 1.7 Level 3 (Acrobat 9)",
-	10700: "PDF 1.7 Level 8 (Acrobat 10 - 11)",
-	10800: "SHA2-384",
-	10810: "sha384($pass.$salt)",
-	10820: "sha384($salt.$pass)",
-	10830: "sha384(utf16le($pass).$salt)",
-	10840: "sha384($salt.utf16le($pass))",
-	10870: "sha384(utf16le($pass))",
-	10900: "PBKDF2-HMAC-SHA256",
-	10901: "RedHat 389-DS LDAP (PBKDF2-HMAC-SHA256)",
-	11000: "PrestaShop",
-	11100: "PostgreSQL CRAM (MD5)",
-	11200: "MySQL CRAM (SHA1)",
-	11300: "Bitcoin/Litecoin wallet.dat",
-	11400: "SIP digest authentication (MD5)",
-	11500: "CRC32",
-	11600: "7-Zip",
-	11700: "GOST R 34.11-2012 (Streebog) 256-bit, big-endian",
-	11750: "HMAC-Streebog-256 (key = $pass), big-endian",
-	11760: "HMAC-Streebog-256 (key = $salt), big-endian",
-	11800: "GOST R 34.11-2012 (Streebog) 512-bit, big-endian",
-	11850: "HMAC-Streebog-512 (key = $pass), big-endian",
-	11860: "HMAC-Streebog-512 (key = $salt), big-endian",
-	11900: "PBKDF2-HMAC-MD5",
-	12000: "PBKDF2-HMAC-SHA1",
-	12001: "Atlassian (PBKDF2-HMAC-SHA1)",
-	12100: "PBKDF2-HMAC-SHA512",
-	12200: "eCryptfs",
-	12300: "Oracle T: Type (Oracle 12+)",
-	12400: "BSDi Crypt, Extended DES",
-	12500: "RAR3-hp",
-	12600: "ColdFusion 10+",
-	12700: "Blockchain, My Wallet",
-	12800: "MS-AzureSync PBKDF2-HMAC-SHA256",
-	12900: "Android FDE (Samsung DEK)",
-	13000: "RAR5",
-	13100: "Kerberos 5, etype 23, TGS-REP",
-	13200: "AxCrypt 1",
-	13300: "AxCrypt 1 in-memory SHA1",
-	13400: "KeePass 1 AES / without keyfile / KeePass 2 AES / without keyfile / KeePass 1 Twofish / with keyfile / Keepass 2 AES / with keyfile",
-	13500: "PeopleSoft PS_TOKEN",
-	13600: "WinZip",
-	13711: "VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES / VeraCrypt PBKDF2-HMAC-RIPEMD160 + Serpent / VeraCrypt PBKDF2-HMAC-RIPEMD160 + Twofish",
-	13712: "VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES-Twofish / VeraCrypt PBKDF2-HMAC-RIPEMD160 + Serpent-AES / VeraCrypt PBKDF2-HMAC-RIPEMD160 + Twofish-Serpent",
-	13713: "VeraCrypt PBKDF2-HMAC-RIPEMD160 + Serpent-Twofish-AES",
-	13721: "VeraCrypt PBKDF2-HMAC-SHA512 + AES / VeraCrypt PBKDF2-HMAC-SHA512 + Serpent / VeraCrypt PBKDF2-HMAC-SHA512 + Twofish",
-	13722: "VeraCrypt PBKDF2-HMAC-SHA512 + AES-Twofish / VeraCrypt PBKDF2-HMAC-SHA512 + Serpent-AES / VeraCrypt PBKDF2-HMAC-SHA512 + Twofish-Serpent",
-	13723: "VeraCrypt PBKDF2-HMAC-SHA512 + Serpent-Twofish-AES",
-	13731: "VeraCrypt PBKDF2-HMAC-Whirlpool + AES / VeraCrypt PBKDF2-HMAC-Whirlpool + Serpent / VeraCrypt PBKDF2-HMAC-Whirlpool + Twofish",
-	13732: "VeraCrypt PBKDF2-HMAC-Whirlpool + AES-Twofish / VeraCrypt PBKDF2-HMAC-Whirlpool + Serpent-AES / VeraCrypt PBKDF2-HMAC-Whirlpool + Twofish-Serpent",
-	13733: "VeraCrypt PBKDF2-HMAC-Whirlpool + Serpent-Twofish-AES",
-	13741: "VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES",
-	13742: "VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES-Twofish",
-	13743: "VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES-Twofish-Serpent",
-	13751: "VeraCrypt PBKDF2-HMAC-SHA256 + AES / VeraCrypt PBKDF2-HMAC-SHA256 + Serpent / VeraCrypt PBKDF2-HMAC-SHA256 + Twofish",
-	13752: "VeraCrypt PBKDF2-HMAC-SHA256 + AES-Twofish / VeraCrypt PBKDF2-HMAC-SHA256 + Serpent-AES / VeraCrypt PBKDF2-HMAC-SHA256 + Twofish-Serpent",
-	13753: "VeraCrypt PBKDF2-HMAC-SHA256 + Serpent-Twofish-AES",
-	13761: "VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + Twofish / VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + PIM + AES",
-	13762: "VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + Serpent-AES",
-	13763: "VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + Serpent-Twofish-AES",
-	13771: "VeraCrypt Streebog-512 + XTS 512 bit",
-	13772: "VeraCrypt Streebog-512 + XTS 1024 bit",
-	13773: "VeraCrypt Streebog-512 + XTS 1536 bit",
-	13800: "Windows Phone 8+ PIN/password",
-	13900: "OpenCart",
-	14000: "DES (PT = $salt, key = $pass)",
-	14100: "3DES (PT = $salt, key = $pass)",
-	14400: "sha1(CX)",
-	14500: "Linux Kernel Crypto API (2.4)",
-	14600: "LUKS",
-	14700: "iTunes backup < 10.0",
-	14800: "iTunes backup >= 10.0",
-	14900: "Skip32 (PT = $salt, key = $pass)",
-	15000: "FileZilla Server >= 0.9.55",
-	15100: "Juniper/NetBSD sha1crypt",
-	15200: "Blockchain, My Wallet, V2",
-	15300: "DPAPI masterkey file v1 + local context",
-	15400: "ChaCha20",
-	15500: "JKS Java Key Store Private Keys (SHA1)",
-	15600: "Ethereum Wallet, PBKDF2-HMAC-SHA256",
-	15700: "Ethereum Wallet, SCRYPT",
-	15900: "DPAPI masterkey file v2 + Active Directory domain context",
-	16000: "Tripcode",
-	16100: "TACACS+",
-	16200: "Apple Secure Notes",
-	16300: "Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256",
-	16400: "CRAM-MD5 Dovecot",
-	16500: "JWT (JSON Web Token)",
-	16600: "Electrum Wallet (Salt-Type 1-3)",
-	16700: "FileVault 2",
-	16800: "WPA-PMKID-PBKDF2",
-	16801: "WPA-PMKID-PMK",
-	16900: "Ansible Vault",
-	17200: "PKZIP (Compressed)",
-	17210: "PKZIP (Uncompressed)",
-	17220: "PKZIP (Compressed Multi-File)",
-	17225: "PKZIP (Mixed Multi-File)",
-	17230: "PKZIP (Mixed Multi-File Checksum-Only)",
-	17300: "SHA3-224",
-	17400: "SHA3-256",
-	17500: "SHA3-384",
-	17600: "SHA3-512",
-	17700: "Keccak-224",
-	17800: "Keccak-256",
-	17900: "Keccak-384",
-	18000: "Keccak-512",
-	18100: "TOTP (HMAC-SHA1)",
-	18200: "Kerberos 5, etype 23, AS-REP",
-	18300: "Apple File System (APFS)",
-	18400: "Open Document Format (ODF) 1.2 (SHA-256, AES)",
-	18500: "sha1(md5(md5($pass)))",
-	18600: "Open Document Format (ODF) 1.1 (SHA-1, Blowfish)",
-	18700: "Java Object hashCode()",
-	18800: "Blockchain, My Wallet, Second Password (SHA256)",
-	18900: "Android Backup",
-	19000: "QNX /etc/shadow (MD5)",
-	19100: "QNX /etc/shadow (SHA256)",
-	19200: "QNX /etc/shadow (SHA512)",
-	19300: "sha1($salt1.$pass.$salt2)",
-	19500: "Ruby on Rails Restful-Authentication",
-	19600: "Kerberos 5, etype 17, TGS-REP (AES128-CTS-HMAC-SHA1-96)",
-	19700: "Kerberos 5, etype 18, TGS-REP (AES256-CTS-HMAC-SHA1-96)",
-	19800: "Kerberos 5, etype 17, Pre-Auth",
-	19900: "Kerberos 5, etype 18, Pre-Auth",
-	20011: "DiskCryptor SHA512 + XTS 512 bit (AES) / DiskCryptor SHA512 + XTS 512 bit (Twofish) / DiskCryptor SHA512 + XTS 512 bit (Serpent)",
-	20012: "DiskCryptor SHA512 + XTS 1024 bit (AES-Twofish) / DiskCryptor SHA512 + XTS 1024 bit (Twofish-Serpent) / DiskCryptor SHA512 + XTS 1024 bit (Serpent-AES)",
-	20013: "DiskCryptor SHA512 + XTS 1536 bit (AES-Twofish-Serpent)",
-	20200: "Python passlib pbkdf2-sha512",
-	20300: "Python passlib pbkdf2-sha256",
-	20400: "Python passlib pbkdf2-sha1",
-	20500: "PKZIP Master Key",
-	20510: "PKZIP Master Key (6 byte optimization)",
-	20600: "Oracle Transportation Management (SHA256)",
-	20710: "sha256(sha256($pass).$salt)",
-	20711: "AuthMe sha256",
-	20720: "sha256($salt.sha256($pass))",
-	20800: "sha256(md5($pass))",
-	20900: "md5(sha1($pass).md5($pass).sha1($pass))",
-	21000: "BitShares v0.x - sha512(sha512_bin(pass))",
-	21100: "sha1(md5($pass.$salt))",
-	21200: "md5(sha1($salt).md5($pass))",
-	21300: "md5($salt.sha1($salt.$pass))",
-	21400: "sha256(sha256_bin($pass))",
-	21500: "SolarWinds Orion",
-	21501: "SolarWinds Orion v2",
-	21600: "Web2py pbkdf2-sha512",
-	21700: "Electrum Wallet (Salt-Type 4)",
-	21800: "Electrum Wallet (Salt-Type 5)",
-	22000: "WPA-PBKDF2-PMKID+EAPOL",
-	22001: "WPA-PMK-PMKID+EAPOL",
-	22100: "BitLocker",
-	22200: "Citrix NetScaler (SHA512)",
-	22300: "sha256($salt.$pass.$salt)",
-	22301: "Telegram Mobile App Passcode (SHA256)",
-	22400: "AES Crypt (SHA256)",
-	22500: "MultiBit Classic .key (MD5)",
-	22600: "Telegram Desktop < v2.1.14 (PBKDF2-HMAC-SHA1)",
-	22700: "MultiBit HD (scrypt)",
-	22911: "RSA/DSA/EC/OpenSSH Private Keys ($0$)",
-	22921: "RSA/DSA/EC/OpenSSH Private Keys ($6$)",
-	22931: "RSA/DSA/EC/OpenSSH Private Keys ($1, $3$)",
-	22941: "RSA/DSA/EC/OpenSSH Private Keys ($4$)",
-	22951: "RSA/DSA/EC/OpenSSH Private Keys ($5$)",
-	23001: "SecureZIP AES-128",
-	23002: "SecureZIP AES-192",
-	23003: "SecureZIP AES-256",
-	23100: "Apple Keychain",
-	23200: "XMPP SCRAM PBKDF2-SHA1",
-	23300: "Apple iWork",
-	23400: "Bitwarden",
-	23500: "AxCrypt 2 AES-128",
-	23600: "AxCrypt 2 AES-256",
-	23700: "RAR3-p (Uncompressed)",
-	23800: "RAR3-p (Compressed)",
-	23900: "BestCrypt v3 Volume Encryption",
-	24100: "MongoDB ServerKey SCRAM-SHA-1",
-	24200: "MongoDB ServerKey SCRAM-SHA-256",
-	24300: "sha1($salt.sha1($pass.$salt))",
-	24410: "PKCS#8 Private Keys (PBKDF2-HMAC-SHA1 + 3DES/AES)",
-	24420: "PKCS#8 Private Keys (PBKDF2-HMAC-SHA256 + 3DES/AES)",
-	24500: "Telegram Desktop >= v2.1.14 (PBKDF2-HMAC-SHA512)",
-	24600: "SQLCipher",
-	24700: "Stuffit5",
-	24800: "Umbraco HMAC-SHA1",
-	24900: "Dahua Authentication MD5",
-	25300: "MS Office 2016 - SheetProtection",
-	25400: "PDF 1.4 - 1.6 (Acrobat 5 - 8) - edit password",
-	25500: "Stargazer Stellar Wallet XLM",
-	25600: "bcrypt(md5($pass)) / bcryptmd5",
-	25700: "MurmurHash",
-	25800: "bcrypt(sha1($pass)) / bcryptsha1",
-	25900: "KNX IP Secure - Device Authentication Code",
-	26000: "Mozilla key3.db",
-	26100: "Mozilla key4.db",
-	26200: "OpenEdge Progress Encode",
-	26300: "FortiGate256 (FortiOS256)",
-	26401: "AES-128-ECB NOKDF (PT = $salt, key = $pass)",
-	26402: "AES-192-ECB NOKDF (PT = $salt, key = $pass)",
-	26403: "AES-256-ECB NOKDF (PT = $salt, key = $pass)",
-	26500: "iPhone passcode (UID key + System Keybag)",
-	26600: "MetaMask Wallet",
-	99999: "Plaintext",
-}
-
-func hashcatHashTypeName(mode int32) (string, bool) {
-	name, ok := hashcatHashTypes[mode]
-	return name, ok
-}
-
-func humanizeHashRate(rate uint64) string {
-	const unit = 1000
-	if rate < unit {
-		return fmt.Sprintf("%d H/s", rate)
-	}
-	value := float64(rate)
-	exp := 0
-	for value >= unit && exp < 5 {
-		value /= unit
-		exp++
-	}
-	suffixes := []string{"kH/s", "MH/s", "GH/s", "TH/s", "PH/s"}
-	if exp == 0 {
-		return fmt.Sprintf("%d H/s", rate)
-	}
-	if exp > len(suffixes) {
-		exp = len(suffixes)
-	}
-	return fmt.Sprintf("%.2f %s", value, suffixes[exp-1])
-}

client/command/crack/helpers.go

@@ -25,7 +25,7 @@ func CrackHcstat2Completer(con *console.SliverClient) carapace.Action {
 			}
 
 			results = append(results, file.Name)
-			desc := fmt.Sprintf("%s (%d chunks, chunk size: %s)", byteCountSI(file.UncompressedSize), len(file.Chunks), byteCountSI(file.ChunkSize))
+			desc := fmt.Sprintf("%s (%s chunks, chunk size: %s)", byteCountSI(file.UncompressedSize), len(file.Chunks), byteCountSI(file.ChunkSize))
 			results = append(results, desc)
 		}
 

client/command/creds/commands.go

@@ -1,7 +1,6 @@
 package creds
 
 import (
-	"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"
@@ -66,7 +65,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		(*comp)["hash-type"] = CredsHashTypeCompleter(con)
 	})
 	carapace.Gen(credsAddFileCmd).PositionalCompletion(carapace.ActionFiles().Tag("credential file"))
-	completers.RegisterLocalFilePathPositionalCompletion(credsAddFileCmd, 0)
 	credsAddCmd.AddCommand(credsAddFileCmd)
 
 	credsRmCmd := &cobra.Command{

client/command/creds/creds.go

@@ -61,9 +61,9 @@ func printCollection(collection string, creds []*clientpb.Credential, con *conso
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
 	if collection != "" {
-		tw.SetTitle(console.StyleBold.Render(collection))
+		tw.SetTitle(console.Bold + collection + console.Normal)
 	} else {
-		tw.SetTitle(console.StyleBold.Render("Default Collection"))
+		tw.SetTitle(console.Bold + "Default Collection" + console.Normal)
 	}
 	tw.AppendHeader(table.Row{
 		"ID",

client/command/cursed/commands.go

@@ -1,7 +1,6 @@
 package cursed
 
 import (
-	"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"
@@ -76,7 +75,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	flags.BindFlagCompletions(cursedChromeCmd, func(comp *carapace.ActionMap) {
 		(*comp)["payload"] = carapace.ActionFiles("js").Tag("javascript files")
 	})
-	completers.RegisterLocalFilePathFlagCompletion(cursedChromeCmd, "payload")
 	cursedChromeCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
 	carapace.Gen(cursedChromeCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("additional Chrome CLI arguments"))
 
@@ -101,7 +99,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	flags.BindFlagCompletions(cursedEdgeCmd, func(comp *carapace.ActionMap) {
 		(*comp)["payload"] = carapace.ActionFiles("js").Tag("javascript files")
 	})
-	completers.RegisterLocalFilePathFlagCompletion(cursedEdgeCmd, "payload")
 	cursedEdgeCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
 	carapace.Gen(cursedEdgeCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("additional Edge CLI arguments"))
 
@@ -133,7 +130,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	flags.Bind("", false, CursedCookiesCmd, func(f *pflag.FlagSet) {
 		f.StringP("save", "s", "", "save to file")
 	})
-	completers.RegisterLocalFilePathFlagCompletion(CursedCookiesCmd, "save")
 
 	cursedScreenshotCmd := &cobra.Command{
 		Use:   consts.ScreenshotStr,
@@ -148,7 +144,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		f.Int64P("quality", "q", 100, "screenshot quality (1 - 100)")
 		f.StringP("save", "s", "", "save to file")
 	})
-	completers.RegisterLocalFilePathFlagCompletion(cursedScreenshotCmd, "save")
 
 	return []*cobra.Command{cursedCmd}
 }

client/command/cursed/cursed-chrome.go

@@ -94,7 +94,7 @@ func CursedChromeCmd(cmd *cobra.Command, con *console.SliverClient, args []strin
 	}
 	if chromeExt != nil {
 		con.Printf("success!\n")
-		con.PrintInfof("Found viable Chrome extension %s (%s)\n", console.StyleBold.Render(chromeExt.Title), chromeExt.ID)
+		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)
@@ -120,7 +120,7 @@ func avadaKedavraChrome(session *clientpb.Session, cmd *cobra.Command, con *cons
 	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 %s\n", console.StyleBold.Render("DATA LOSS MAY OCCUR!"))
+		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 = forms.Confirm("Kill and restore existing Chrome process?", &confirm)

client/command/cursed/cursed-console.go

@@ -93,7 +93,7 @@ func startCursedConsole(curse *core.CursedProcess, helpers bool, target *overlor
 	tmpFile, _ := os.CreateTemp("", "cursed")
 	shell := readline.NewShell()
 	shell.History.AddFromFile("cursed history", tmpFile.Name())
-	shell.Prompt.Primary(func() string { return console.StyleRed.Render("cursed »") + " " })
+	shell.Prompt.Primary(func() string { return "\033[31mcursed »\033[0m " })
 	// 	EOFPrompt:         "exit",
 
 	if con.Settings.VimMode {
@@ -111,7 +111,7 @@ func startCursedConsole(curse *core.CursedProcess, helpers bool, target *overlor
 		}
 	}
 
-	con.Printf("%s\n\n", console.StyleBold.Render(">>> Cursed Console, use ':help' for options"))
+	con.Printf(console.Bold+">>> Cursed Console, use ':help' for options%s\n\n", console.Normal)
 
 	for {
 		line, err := shell.Readline()

client/command/cursed/cursed-edge.go

@@ -77,7 +77,7 @@ func CursedEdgeCmd(cmd *cobra.Command, con *console.SliverClient, args []string)
 	}
 	if chromeExt != nil {
 		con.Printf("success!\n")
-		con.PrintInfof("Found viable Edge extension %s (%s)\n", console.StyleBold.Render(chromeExt.Title), chromeExt.ID)
+		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)
@@ -103,7 +103,7 @@ func avadaKedavraEdge(session *clientpb.Session, cmd *cobra.Command, con *consol
 	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 %s\n", console.StyleBold.Render("DATA LOSS MAY OCCUR!"))
+		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 = forms.Confirm("Kill and restore existing Edge process?", &confirm)

client/command/cursed/cursed-electron.go

@@ -85,7 +85,7 @@ func avadaKedavraElectron(electronExe string, session *clientpb.Session, cmd *co
 	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("%s\n", console.StyleBold.Render("DATA LOSS MAY OCCUR!"))
+		con.PrintWarnf("%sDATA LOSS MAY OCCUR!%s\n", console.Bold, console.Normal)
 		con.Printf("\n")
 		confirm := false
 		err = forms.Confirm("Kill and restart the process?", &confirm)

client/command/dllhijack/commands.go

@@ -1,7 +1,6 @@
 package dllhijack
 
 import (
-	"github.com/bishopfox/sliver/client/command/completers"
 	"github.com/rsteube/carapace"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -38,7 +37,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		(*comp)["file"] = carapace.ActionFiles()
 		(*comp)["profile"] = generate.ProfileNameCompleter(con)
 	})
-	completers.RegisterLocalFilePathFlagCompletions(dllhijackCmd, "reference-file", "file")
 	carapace.Gen(dllhijackCmd).PositionalCompletion(carapace.ActionValues().Usage("Path to upload the DLL to on the remote system"))
 
 	return []*cobra.Command{dllhijackCmd}

client/command/docs/commands.go

@@ -1,31 +0,0 @@
-package docs
-
-import (
-	"github.com/bishopfox/sliver/client/command/help"
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/spf13/cobra"
-)
-
-// Commands returns the docs command.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	return []*cobra.Command{newDocsCommand(consts.SliverCoreHelpGroup, con)}
-}
-
-// ServerCommands returns the docs command for the top-level client REPL.
-func ServerCommands(con *console.SliverClient) []*cobra.Command {
-	return []*cobra.Command{newDocsCommand(consts.GenericHelpGroup, con)}
-}
-
-func newDocsCommand(groupID string, con *console.SliverClient) *cobra.Command {
-	return &cobra.Command{
-		Use:     consts.DocsStr,
-		Short:   "Browse the embedded Sliver docs in a TUI",
-		Long:    help.GetHelpFor([]string{consts.DocsStr}),
-		Args:    cobra.NoArgs,
-		GroupID: groupID,
-		Run: func(cmd *cobra.Command, args []string) {
-			DocsCmd(cmd, con, args)
-		},
-	}
-}

client/command/docs/docs.go

@@ -1,36 +0,0 @@
-package docs
-
-import (
-	tea "charm.land/bubbletea/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/charmbracelet/colorprofile"
-	"github.com/spf13/cobra"
-	"golang.org/x/term"
-)
-
-// DocsCmd launches the embedded docs browser TUI.
-func DocsCmd(_ *cobra.Command, con *console.SliverClient, _ []string) {
-	entries, err := loadDocEntries()
-	if err != nil {
-		if con != nil {
-			con.PrintErrorf("Failed to load embedded docs: %s\n", err)
-		}
-		return
-	}
-
-	model := newDocsModel(entries)
-
-	width, height := 100, 32
-	if w, h, err := term.GetSize(0); err == nil && w > 0 && h > 0 {
-		width, height = w, h
-	}
-
-	program := tea.NewProgram(
-		model,
-		tea.WithWindowSize(width, height),
-		tea.WithColorProfile(colorprofile.TrueColor),
-	)
-	if _, err := program.Run(); err != nil && con != nil {
-		con.PrintErrorf("Docs TUI error: %s\n", err)
-	}
-}

client/command/docs/model_test.go

@@ -1,199 +0,0 @@
-package docs
-
-import (
-	"strings"
-	"testing"
-
-	tea "charm.land/bubbletea/v2"
-	"github.com/charmbracelet/x/ansi"
-)
-
-func sampleDocs() []docEntry {
-	return []docEntry{
-		{
-			Name:        "Getting Started",
-			Content:     "# Getting Started\n\n- first step\n- second step",
-			Description: "Getting Started",
-		},
-		{
-			Name:        "Operators",
-			Content:     "# Operators\n\nTeam workflows",
-			Description: "Team workflows",
-		},
-		{
-			Name:        "Networking",
-			Content:     "# Networking\n\nTransport details",
-			Description: "Transport details",
-		},
-	}
-}
-
-func TestRenderMarkdownWithGlowRendersBulletLists(t *testing.T) {
-	rendered, err := renderMarkdownWithGlow(48, "# Title\n\n- first item")
-	if err != nil {
-		t.Fatalf("renderMarkdownWithGlow(): %v", err)
-	}
-
-	plain := ansi.Strip(rendered)
-	if !strings.Contains(plain, "Title") {
-		t.Fatalf("expected heading text, got %q", plain)
-	}
-	if !strings.Contains(plain, "• first item") {
-		t.Fatalf("expected glow-style bullet rendering, got %q", plain)
-	}
-}
-
-func TestSummarizeMarkdownPrefersFirstMeaningfulLine(t *testing.T) {
-	summary := summarizeMarkdown("# Title\n\n- Bullet\n\nParagraph")
-	if summary != "Title" {
-		t.Fatalf("expected first heading summary, got %q", summary)
-	}
-}
-
-func TestSummarizeMarkdownStripsMarkdownAndUnicodeSymbols(t *testing.T) {
-	summary := summarizeMarkdown("⚠️ **IMPORTANT:** This content was NOT created by the Sliver authors.")
-	if summary != "IMPORTANT: This content was NOT created by the Sliver authors." {
-		t.Fatalf("expected sanitized browser summary, got %q", summary)
-	}
-}
-
-func TestDocsModelDefaultsToGettingStarted(t *testing.T) {
-	model := newDocsModel(sampleDocs())
-	model.applyWindowSize(120, 32)
-
-	if model.currentDocName != "Getting Started" {
-		t.Fatalf("expected Getting Started to be selected, got %q", model.currentDocName)
-	}
-	plain := ansi.Strip(model.viewer.View())
-	if !strings.Contains(plain, "first step") {
-		t.Fatalf("expected initial viewer content to render selected doc, got %q", plain)
-	}
-}
-
-func TestDocsModelSlashFocusesBrowserAndStartsFiltering(t *testing.T) {
-	model := newDocsModel(sampleDocs())
-	model.applyWindowSize(120, 32)
-	model.focus = docsFocusViewer
-
-	updated, cmd := model.Update(tea.KeyPressMsg{Text: "/", Code: '/'})
-	if cmd == nil {
-		t.Fatal("expected slash to focus the search input")
-	}
-
-	updatedModel := updated.(*docsModel)
-	if updatedModel.focus != docsFocusBrowser {
-		t.Fatalf("expected slash to move focus to browser, got %v", updatedModel.focus)
-	}
-	if updatedModel.filterState != docsFilterStateFiltering {
-		t.Fatalf("expected slash to enter filtering state, got %v", updatedModel.filterState)
-	}
-}
-
-func TestDocsModelFilteringUpdatesVisibleEntries(t *testing.T) {
-	model := newDocsModel(sampleDocs())
-	model.applyWindowSize(120, 32)
-
-	model.startFiltering()
-	model.browserFilter.SetValue("oper")
-	model.updateFilteredEntries(false)
-
-	visible := model.visibleEntries()
-	if len(visible) != 1 || visible[0].Name != "Operators" {
-		t.Fatalf("expected Operators to be the only filtered result, got %+v", visible)
-	}
-	if model.currentDocName != "Operators" {
-		t.Fatalf("expected filtering to sync selection to Operators, got %q", model.currentDocName)
-	}
-}
-
-func TestDocsModelEnterMovesFocusToViewer(t *testing.T) {
-	model := newDocsModel(sampleDocs())
-	model.applyWindowSize(120, 32)
-
-	updated, _ := model.Update(tea.KeyPressMsg{Code: tea.KeyEnter})
-	updatedModel := updated.(*docsModel)
-	if updatedModel.focus != docsFocusViewer {
-		t.Fatalf("expected enter to focus viewer, got %v", updatedModel.focus)
-	}
-}
-
-func TestDocsModelEscClearsAppliedFilter(t *testing.T) {
-	model := newDocsModel(sampleDocs())
-	model.applyWindowSize(120, 32)
-
-	model.startFiltering()
-	model.browserFilter.SetValue("net")
-	model.finishFiltering(false)
-
-	updated, _ := model.Update(tea.KeyPressMsg{Code: tea.KeyEsc})
-	updatedModel := updated.(*docsModel)
-	if updatedModel.filterState != docsFilterStateUnfiltered {
-		t.Fatalf("expected esc to clear the filter, got %v", updatedModel.filterState)
-	}
-	if len(updatedModel.visibleEntries()) != len(sampleDocs()) {
-		t.Fatalf("expected filter clear to restore all docs, got %d visible", len(updatedModel.visibleEntries()))
-	}
-}
-
-func TestDocsModelBrowserBodyPinsHelpToBottom(t *testing.T) {
-	model := newDocsModel(sampleDocs())
-	model.applyWindowSize(120, 28)
-
-	body := ansi.Strip(model.renderBrowserBody(model.browserWidth, model.browserHeight))
-	lines := strings.Split(body, "\n")
-	if len(lines) != model.browserHeight {
-		t.Fatalf("expected browser body height %d, got %d lines", model.browserHeight, len(lines))
-	}
-	if !strings.Contains(lines[len(lines)-1], "q quit") {
-		t.Fatalf("expected help controls on the last browser line, got %q", lines[len(lines)-1])
-	}
-}
-
-func TestDocsWindowPollSchedulesResizeAndKeepsPolling(t *testing.T) {
-	model := newDocsModel(sampleDocs())
-	model.applyWindowSize(100, 28)
-
-	updated, cmd := model.Update(docsWindowPollMsg{width: 120, height: 34})
-	if cmd == nil {
-		t.Fatal("expected window poll to schedule resize handling")
-	}
-
-	updatedModel := updated.(*docsModel)
-	if updatedModel.width != 100 || updatedModel.height != 28 {
-		t.Fatalf("expected poll tick to leave dimensions unchanged until WindowSizeMsg, got %dx%d", updatedModel.width, updatedModel.height)
-	}
-
-	msg := cmd()
-	batch, ok := msg.(tea.BatchMsg)
-	if !ok {
-		t.Fatalf("expected poll tick to return tea.BatchMsg, got %T", msg)
-	}
-	if len(batch) != 2 {
-		t.Fatalf("expected poll tick batch size 2, got %d", len(batch))
-	}
-
-	var sawWindowSize bool
-	var sawPollTick bool
-	for _, subcmd := range batch {
-		if subcmd == nil {
-			continue
-		}
-		submsg := subcmd()
-		switch msg := submsg.(type) {
-		case tea.WindowSizeMsg:
-			sawWindowSize = true
-			if msg.Width != 120 || msg.Height != 34 {
-				t.Fatalf("expected resize 120x34, got %dx%d", msg.Width, msg.Height)
-			}
-		case docsWindowPollMsg:
-			sawPollTick = true
-		}
-	}
-
-	if !sawWindowSize {
-		t.Fatal("expected poll tick to emit WindowSizeMsg")
-	}
-	if !sawPollTick {
-		t.Fatal("expected poll tick to schedule another poll")
-	}
-}

client/command/edit/commands.go

@@ -1,38 +0,0 @@
-package edit
-
-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 edit command.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	editCmd := &cobra.Command{
-		Use:   consts.EditStr,
-		Short: "Edit a remote text file",
-		Long:  help.GetHelpFor([]string{consts.EditStr}),
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			EditCmd(cmd, con, args)
-		},
-		GroupID: consts.FilesystemHelpGroup,
-	}
-
-	flags.Bind("", false, editCmd, func(f *pflag.FlagSet) {
-		f.String("syntax", "", "syntax highlighting lexer name (optional)")
-		f.Bool("syntax-select", false, "prompt to select syntax highlighting lexer")
-		f.Bool("line-numbers", false, "show line numbers")
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-
-	carapace.Gen(editCmd).PositionalCompletion(
-		carapace.ActionValues().Usage("path to the remote file to edit"),
-	)
-
-	return []*cobra.Command{editCmd}
-}

client/command/edit/edit.go

@@ -1,390 +0,0 @@
-package edit
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"sort"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	tea "charm.land/bubbletea/v2"
-	"github.com/alecthomas/chroma/v2"
-	"github.com/alecthomas/chroma/v2/lexers"
-	"github.com/bishopfox/sliver/client/command/filesystem"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/forms"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/bishopfox/sliver/util/encoders"
-	"github.com/charmbracelet/colorprofile"
-	"github.com/spf13/cobra"
-	"golang.org/x/term"
-	"google.golang.org/protobuf/proto"
-)
-
-const beaconPollInterval = 1 * time.Second
-
-// EditCmd downloads a remote text file, opens it in a TUI editor, and optionally uploads changes.
-func EditCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
-		return
-	}
-
-	remotePath := strings.TrimSpace(args[0])
-	if remotePath == "" {
-		con.PrintErrorf("Missing parameter: remote path\n")
-		return
-	}
-
-	ctx, cancel := con.GrpcContext(cmd)
-	defer cancel()
-
-	ctrl := make(chan bool)
-	con.SpinUntil(fmt.Sprintf("Downloading %s ...", remotePath), ctrl)
-	download, err := downloadRemote(ctx, con, cmd, remotePath)
-	ctrl <- true
-	<-ctrl
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if download.Response != nil && download.Response.Err != "" {
-		con.PrintErrorf("%s\n", download.Response.Err)
-		return
-	}
-	if !download.Exists {
-		con.PrintErrorf("Remote file does not exist: %s\n", remotePath)
-		return
-	}
-	if download.IsDir {
-		con.PrintErrorf("Remote path is a directory: %s\n", download.Path)
-		return
-	}
-
-	data := download.Data
-	if download.Encoder == "gzip" {
-		data, err = new(encoders.Gzip).Decode(download.Data)
-		if err != nil {
-			con.PrintErrorf("Decoding failed %s\n", err)
-			return
-		}
-	}
-	if !isText(data) {
-		con.PrintErrorf("Refusing to edit non-text file: %s\n", download.Path)
-		return
-	}
-
-	path := download.Path
-	if path == "" {
-		path = remotePath
-	}
-
-	lineEnding := detectLineEnding(data)
-	content := normalizeLineEndings(data)
-
-	lexer, lexerName, err := resolveSyntax(cmd, path, string(data))
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	showLineNumbers, _ := cmd.Flags().GetBool("line-numbers")
-
-	for {
-		result, err := runEditor(content, path, lexer, lexerName, showLineNumbers)
-		if err != nil {
-			con.PrintErrorf("Editor error: %s\n", err)
-			return
-		}
-		content = result.Content
-
-		if result.Action == actionNone {
-			return
-		}
-
-		if !result.Modified {
-			if result.Action == actionSaveQuit {
-				con.PrintInfof("No changes to upload for %s\n", path)
-			}
-			return
-		}
-
-		switch result.Action {
-		case actionSaveQuit:
-			uploadNow, err := confirm("Upload changes to remote file (overwrite)?")
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				return
-			}
-			if !uploadNow {
-				keepEditing, err := confirm("Continue editing?")
-				if err != nil {
-					con.PrintErrorf("%s\n", err)
-					return
-				}
-				if keepEditing {
-					continue
-				}
-				return
-			}
-
-			uploadData := applyLineEnding(content, lineEnding)
-			if err := uploadEditedContent(cmd, con, path, uploadData); err != nil {
-				con.PrintErrorf("%s\n", err)
-			}
-			return
-		case actionQuit:
-			if result.Force {
-				return
-			}
-			discard, err := confirm("Discard changes?")
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				return
-			}
-			if discard {
-				return
-			}
-		}
-	}
-}
-
-func runEditor(content, filename string, lexer chroma.Lexer, lexerName string, showLineNumbers bool) (editorResult, error) {
-	model := newEditorModel(content, filename, lexer, lexerName, showLineNumbers)
-	width, height := 80, 24
-	if w, h, err := term.GetSize(0); err == nil && w > 0 && h > 0 {
-		width, height = w, h
-	}
-	program := tea.NewProgram(
-		model,
-		tea.WithWindowSize(width, height),
-		tea.WithColorProfile(colorprofile.TrueColor),
-	)
-	finalModel, err := program.Run()
-	if err != nil {
-		return editorResult{}, err
-	}
-	editor, ok := finalModel.(*editorModel)
-	if !ok {
-		return editorResult{}, fmt.Errorf("unexpected editor state")
-	}
-	return editor.result(), nil
-}
-
-func downloadRemote(ctx context.Context, con *console.SliverClient, cmd *cobra.Command, path string) (*sliverpb.Download, error) {
-	download, err := con.Rpc.Download(ctx, &sliverpb.DownloadReq{
-		Request:          con.ActiveTarget.Request(cmd),
-		Path:             path,
-		RestrictedToFile: true,
-	})
-	if err != nil {
-		return nil, err
-	}
-	if download.Response != nil && download.Response.Async {
-		taskID := download.Response.TaskID
-		download = &sliverpb.Download{}
-		if err := waitForBeaconTaskResponse(ctx, con, taskID, download); err != nil {
-			return nil, err
-		}
-	}
-	return download, nil
-}
-
-func uploadEditedContent(cmd *cobra.Command, con *console.SliverClient, path string, data []byte) error {
-	ctx, cancel := con.GrpcContext(cmd)
-	defer cancel()
-
-	uploadData, err := new(encoders.Gzip).Encode(data)
-	if err != nil {
-		return err
-	}
-
-	ctrl := make(chan bool)
-	con.SpinUntil(fmt.Sprintf("Uploading %s ...", path), ctrl)
-	upload, err := con.Rpc.Upload(ctx, &sliverpb.UploadReq{
-		Request:     con.ActiveTarget.Request(cmd),
-		Path:        path,
-		Data:        uploadData,
-		Encoder:     "gzip",
-		IsDirectory: false,
-		Overwrite:   true,
-	})
-	if err == nil && upload.Response != nil && upload.Response.Async {
-		taskID := upload.Response.TaskID
-		upload = &sliverpb.Upload{}
-		err = waitForBeaconTaskResponse(ctx, con, taskID, upload)
-	}
-	ctrl <- true
-	<-ctrl
-
-	if err != nil {
-		return err
-	}
-	filesystem.PrintUpload(upload, con)
-	return nil
-}
-
-func waitForBeaconTaskResponse(ctx context.Context, con *console.SliverClient, taskID string, out proto.Message) error {
-	task, err := waitForBeaconTask(ctx, con, taskID)
-	if err != nil {
-		return err
-	}
-	state := strings.ToLower(task.State)
-	if state != "completed" {
-		if state == "" {
-			state = "unknown"
-		}
-		return fmt.Errorf("beacon task %s %s", task.ID, state)
-	}
-	if len(task.Response) == 0 {
-		return fmt.Errorf("beacon task %s returned empty response", task.ID)
-	}
-	return proto.Unmarshal(task.Response, out)
-}
-
-func waitForBeaconTask(ctx context.Context, con *console.SliverClient, taskID string) (*clientpb.BeaconTask, error) {
-	ticker := time.NewTicker(beaconPollInterval)
-	defer ticker.Stop()
-
-	for {
-		task, err := con.Rpc.GetBeaconTaskContent(ctx, &clientpb.BeaconTask{ID: taskID})
-		if err != nil {
-			return nil, err
-		}
-		state := strings.ToLower(task.State)
-		if state == "completed" || state == "failed" || state == "canceled" {
-			return task, nil
-		}
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		case <-ticker.C:
-		}
-	}
-}
-
-func resolveSyntax(cmd *cobra.Command, path string, content string) (chroma.Lexer, string, error) {
-	syntaxName, _ := cmd.Flags().GetString("syntax")
-	selectSyntax, _ := cmd.Flags().GetBool("syntax-select")
-
-	syntaxName = strings.TrimSpace(syntaxName)
-	if strings.EqualFold(syntaxName, "auto") {
-		syntaxName = ""
-	}
-
-	if syntaxName != "" {
-		if strings.EqualFold(syntaxName, "none") {
-			return nil, "none", nil
-		}
-		lexer := lexers.Get(syntaxName)
-		if lexer == nil {
-			return nil, "", fmt.Errorf("unknown syntax lexer: %s", syntaxName)
-		}
-		name := lexer.Config().Name
-		if name == "" {
-			name = syntaxName
-		}
-		return lexer, name, nil
-	}
-
-	if selectSyntax {
-		options := syntaxOptions()
-		selection := "auto"
-		if err := forms.Select("Syntax highlighting", options, &selection); err != nil {
-			if errors.Is(err, forms.ErrUserAborted) {
-				return detectSyntax(path, content)
-			}
-			return nil, "", err
-		}
-		if strings.EqualFold(selection, "none") {
-			return nil, "none", nil
-		}
-		if strings.EqualFold(selection, "auto") {
-			return detectSyntax(path, content)
-		}
-		lexer := lexers.Get(selection)
-		if lexer == nil {
-			return nil, "", fmt.Errorf("unknown syntax lexer: %s", selection)
-		}
-		name := lexer.Config().Name
-		if name == "" {
-			name = selection
-		}
-		return lexer, name, nil
-	}
-
-	return detectSyntax(path, content)
-}
-
-func detectSyntax(path string, content string) (chroma.Lexer, string, error) {
-	lexer := lexers.Match(path)
-	if lexer == nil {
-		lexer = lexers.Analyse(content)
-	}
-	if lexer == nil {
-		lexer = lexers.Fallback
-	}
-	name := lexer.Config().Name
-	if name == "" {
-		name = "auto"
-	}
-	return lexer, name, nil
-}
-
-func syntaxOptions() []string {
-	names := lexers.Names(true)
-	sort.Strings(names)
-	options := make([]string, 0, len(names)+2)
-	options = append(options, "auto", "none")
-	options = append(options, names...)
-	return options
-}
-
-func confirm(title string) (bool, error) {
-	answer := false
-	if err := forms.Confirm(title, &answer); err != nil {
-		if errors.Is(err, forms.ErrUserAborted) {
-			return false, nil
-		}
-		return false, err
-	}
-	return answer, nil
-}
-
-func detectLineEnding(data []byte) string {
-	if strings.Contains(string(data), "\r\n") {
-		return "\r\n"
-	}
-	return "\n"
-}
-
-func normalizeLineEndings(data []byte) string {
-	content := strings.ReplaceAll(string(data), "\r\n", "\n")
-	content = strings.ReplaceAll(content, "\r", "\n")
-	return content
-}
-
-func applyLineEnding(content, lineEnding string) []byte {
-	if lineEnding == "\r\n" {
-		content = strings.ReplaceAll(content, "\n", "\r\n")
-	}
-	return []byte(content)
-}
-
-func isText(sample []byte) bool {
-	const max = 1024
-	if len(sample) > max {
-		sample = sample[:max]
-	}
-	for i, c := range string(sample) {
-		if i+utf8.UTFMax > len(sample) {
-			break
-		}
-		if c == 0xFFFD || c < ' ' && c != '\n' && c != '\t' && c != '\f' && c != '\r' {
-			return false
-		}
-	}
-	return true
-}

client/command/exec/commands.go

@@ -1,11 +1,9 @@
 package exec
 
 import (
-	"github.com/bishopfox/sliver/client/command/completers"
 	"github.com/bishopfox/sliver/client/command/flags"
 	"github.com/bishopfox/sliver/client/command/generate"
 	"github.com/bishopfox/sliver/client/command/help"
-	shellcodeencoders "github.com/bishopfox/sliver/client/command/shellcode-encoders"
 	"github.com/bishopfox/sliver/client/console"
 	consts "github.com/bishopfox/sliver/client/constants"
 	"github.com/rsteube/carapace"
@@ -28,13 +26,12 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	flags.Bind("", false, executeCmd, func(f *pflag.FlagSet) {
 		f.BoolP("token", "T", false, "execute command with current token (Windows only)")
 		f.BoolP("output", "o", true, "capture command output")
-		f.Bool("background", false, "start the process in the background and track it")
 		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.Bool("env-inheritance", false, "inherit environment variables from the current process")
+		f.Bool("env-inheritance", true, "inherit environment variables from the current process")
 		f.StringArray("env", nil, "set an environment variable for the child process (key=value)")
 		f.StringP("name", "n", "", "name to assign loot (optional)")
 		f.Uint32P("ppid", "P", 0, "parent process id (optional, Windows only)")
@@ -47,20 +44,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	carapace.Gen(executeCmd).PositionalCompletion(carapace.ActionValues().Usage("command to execute (required)"))
 	carapace.Gen(executeCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("arguments to the command (optional)"))
 
-	executeChildrenCmd := &cobra.Command{
-		Use:   consts.ExecuteChildrenStr,
-		Short: "List tracked background execute child processes",
-		Long:  help.GetHelpFor([]string{consts.ExecuteStr, consts.ExecuteChildrenStr}),
-		Args:  cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
-			ExecuteChildrenCmd(cmd, con, args)
-		},
-	}
-	flags.Bind("", false, executeChildrenCmd, func(f *pflag.FlagSet) {
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-	executeCmd.AddCommand(executeChildrenCmd)
-
 	executeAssemblyCmd := &cobra.Command{
 		Use:   consts.ExecuteAssemblyStr,
 		Short: "Loads and executes a .NET assembly in a child process (Windows Only)",
@@ -94,7 +77,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 
 	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)"))
-	completers.RegisterLocalFilePathPositionalCompletion(executeAssemblyCmd, 0)
 
 	executeShellcodeCmd := &cobra.Command{
 		Use:   consts.ExecuteShellcodeStr,
@@ -114,14 +96,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		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.Uint32("shellcode-entropy", 1, "Shellcode entropy (Donut: 1=none, 2=random names, 3=random+encrypt) (windows PE input only)")
-		f.Bool("shellcode-compress", false, "Enable shellcode compression (aPLib) (windows PE input only)")
-		f.Uint32("shellcode-exitopt", 1, "Shellcode exit option (Donut: 1=exit thread, 2=exit process, 3=block) (windows PE input only)")
-		f.Uint32("shellcode-bypass", 3, "Shellcode bypass mode (Donut: 1=none, 2=abort, 3=continue) (windows PE input only)")
-		f.Uint32("shellcode-headers", 1, "Shellcode headers handling (Donut: 1=overwrite, 2=keep) (windows PE input only)")
-		f.Bool("shellcode-thread", false, "Run unmanaged EXE entrypoint as a new thread (Donut) (windows PE input only)")
-		f.Bool("shellcode-unicode", false, "Use Unicode command line for unmanaged DLL entrypoints (Donut) (windows PE input only)")
-		f.Uint32("shellcode-oep", 0, "Override original entry point (OEP) (Donut) (windows PE input only)")
 
 		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
 	})
@@ -129,7 +103,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		(*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)"))
-	completers.RegisterLocalFilePathPositionalCompletion(executeShellcodeCmd, 0)
 
 	sideloadCmd := &cobra.Command{
 		Use:   consts.SideloadStr,
@@ -158,7 +131,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 
 	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)"))
-	completers.RegisterLocalFilePathPositionalCompletion(sideloadCmd, 0)
 
 	spawnDllCmd := &cobra.Command{
 		Use:   consts.SpawnDllStr,
@@ -187,7 +159,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 
 	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)"))
-	completers.RegisterLocalFilePathPositionalCompletion(spawnDllCmd, 0)
 
 	migrateCmd := &cobra.Command{
 		Use:   consts.MigrateStr,
@@ -200,14 +171,11 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		Annotations: flags.RestrictTargets(consts.WindowsCmdsFilter),
 	}
 	flags.Bind("", false, migrateCmd, func(f *pflag.FlagSet) {
-		f.String("shellcode-encoder", "", "shellcode encoder to apply (optional; see `shellcode-encoders`)")
+		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")
 	})
-	flags.BindFlagCompletions(migrateCmd, func(comp *carapace.ActionMap) {
-		(*comp)["shellcode-encoder"] = shellcodeencoders.ShellcodeEncoderNameCompleter(con)
-	})
 	carapace.Gen(migrateCmd).PositionalCompletion(carapace.ActionValues().Usage("PID of process to migrate into"))
 
 	msfCmd := &cobra.Command{
@@ -273,7 +241,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		(*comp)["custom-exe"] = carapace.ActionFiles()
 		(*comp)["profile"] = generate.ProfileNameCompleter(con)
 	})
-	completers.RegisterLocalFilePathFlagCompletion(psExecCmd, "custom-exe")
 	carapace.Gen(psExecCmd).PositionalCompletion(carapace.ActionValues().Usage("hostname (required)"))
 
 	sshCmd := &cobra.Command{
@@ -304,7 +271,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		(*comp)["private-key"] = carapace.ActionFiles()
 		(*comp)["kerberos-keytab"] = carapace.ActionFiles()
 	})
-	completers.RegisterLocalFilePathFlagCompletions(sshCmd, "private-key", "kerberos-keytab")
 
 	carapace.Gen(sshCmd).PositionalCompletion(carapace.ActionValues().Usage("remote host to SSH to (required)"))
 	carapace.Gen(sshCmd).PositionalAnyCompletion(carapace.ActionValues().Usage("command line with arguments"))

client/command/exec/execute-children.go

@@ -1,106 +0,0 @@
-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"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
-)
-
-// ExecuteChildrenCmd - List tracked background execute child processes on the implant.
-func ExecuteChildrenCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
-		return
-	}
-
-	ctrl := make(chan bool)
-	con.SpinUntil("Querying execute children ...", ctrl)
-	execChildren, err := con.Rpc.ExecuteChildren(context.Background(), &sliverpb.ExecuteChildrenReq{
-		Request: con.ActiveTarget.Request(cmd),
-	})
-	ctrl <- true
-	<-ctrl
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	if execChildren.Response != nil && execChildren.Response.Async {
-		con.AddBeaconCallback(execChildren.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, execChildren)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-			PrintExecuteChildren(execChildren, con)
-		})
-		con.PrintAsyncResponse(execChildren.Response)
-		return
-	}
-
-	PrintExecuteChildren(execChildren, con)
-}
-
-// PrintExecuteChildren - Render execute children output.
-func PrintExecuteChildren(execChildren *sliverpb.ExecuteChildren, con *console.SliverClient) {
-	if execChildren == nil || len(execChildren.Children) == 0 {
-		con.PrintInfof("No tracked background execute children\n")
-		return
-	}
-
-	children := append([]*sliverpb.ExecuteChild(nil), execChildren.Children...)
-	sort.Slice(children, func(i, j int) bool {
-		return children[i].StartTime < children[j].StartTime
-	})
-
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{"pid", "state", "exit", "started", "command", "stdout", "stderr"})
-
-	for _, child := range children {
-		state := "running"
-		exitCode := "-"
-		if child.Exited {
-			state = "exited"
-			exitCode = fmt.Sprintf("%d", child.ExitCode)
-		}
-
-		started := "-"
-		if child.StartTime != 0 {
-			started = time.Unix(child.StartTime, 0).Local().Format("2006-01-02 15:04:05")
-		}
-
-		command := strings.TrimSpace(fmt.Sprintf("%s %s", child.Path, strings.Join(child.Args, " ")))
-		tw.AppendRow(table.Row{child.Pid, state, exitCode, started, command, child.Stdout, child.Stderr})
-	}
-
-	con.Printf("%s\n", tw.Render())
-}

client/command/exec/execute-shellcode.go

@@ -20,44 +20,27 @@ package exec
 
 import (
 	"bufio"
-	"bytes"
 	"context"
 	"fmt"
 	"io"
 	"log"
 	"os"
-	"path/filepath"
-	"strings"
 
-	"github.com/Binject/debug/pe"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/client/core"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	wasmdonut "github.com/sliverarmory/wasm-donut"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 	"google.golang.org/protobuf/proto"
 )
 
-const (
-	defaultExecuteShellcodeDonutEntropy  = wasmdonut.DonutEntropyNone
-	defaultExecuteShellcodeDonutCompress = wasmdonut.DonutCompressNone
-	defaultExecuteShellcodeDonutExitOpt  = wasmdonut.DonutExitThread
-	defaultExecuteShellcodeDonutBypass   = wasmdonut.DonutBypassContinue
-	defaultExecuteShellcodeDonutHeaders  = wasmdonut.DonutHeadersOverwrite
-	imageFileDLLMask                     = 0x2000
-)
-
 // 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 {
 		return
 	}
-	targetName := activeTargetName(session, beacon)
-	targetOS := activeTargetOS(session, beacon)
-	targetArch := activeTargetArch(session, beacon)
 
 	rwxPages, _ := cmd.Flags().GetBool("rwx-pages")
 	interactive, _ := cmd.Flags().GetBool("interactive")
@@ -77,27 +60,6 @@ func ExecuteShellcodeCmd(cmd *cobra.Command, con *console.SliverClient, args []s
 		con.PrintErrorf("Cannot use both `--pid` and `--interactive`\n")
 		return
 	}
-
-	shellcodeConfig, shellcodeFlagsChanged, err := parseExecuteShellcodeFlags(cmd)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	shouldConvertPE, isDLLHint := shouldConvertExecuteShellcodePE(shellcodePath, shellcodeFlagsChanged)
-	if shouldConvertPE {
-		if targetOS != "windows" {
-			con.PrintErrorf("PE input and --shellcode-* options are only supported for Windows targets in execute-shellcode\n")
-			return
-		}
-		con.PrintInfof("Converting PE input to shellcode ...\n")
-		shellcodeBin, err = donutShellcodeFromPE(shellcodeBin, targetArch, isDLLHint, shellcodeConfig)
-		if err != nil {
-			con.PrintErrorf("Failed to convert PE input to shellcode: %s\n", err)
-			return
-		}
-	}
-
 	shikataGaNai, _ := cmd.Flags().GetBool("shikata-ga-nai")
 	if shikataGaNai {
 		if !rwxPages {
@@ -134,7 +96,7 @@ func ExecuteShellcodeCmd(cmd *cobra.Command, con *console.SliverClient, args []s
 		return
 	}
 	ctrl := make(chan bool)
-	msg := fmt.Sprintf("Sending shellcode to %s ...", targetName)
+	msg := fmt.Sprintf("Sending shellcode to %s ...", session.GetName())
 	con.SpinUntil(msg, ctrl)
 	shellcodeTask, err := con.Rpc.Task(context.Background(), &sliverpb.TaskReq{
 		Data:     shellcodeBin,
@@ -173,186 +135,6 @@ func PrintExecuteShellcode(task *sliverpb.Task, con *console.SliverClient) {
 	}
 }
 
-func parseExecuteShellcodeFlags(cmd *cobra.Command) (*clientpb.ShellcodeConfig, bool, error) {
-	shellcodeEntropy, _ := cmd.Flags().GetUint32("shellcode-entropy")
-	shellcodeCompressEnabled, _ := cmd.Flags().GetBool("shellcode-compress")
-	shellcodeExitOpt, _ := cmd.Flags().GetUint32("shellcode-exitopt")
-	shellcodeBypass, _ := cmd.Flags().GetUint32("shellcode-bypass")
-	shellcodeHeaders, _ := cmd.Flags().GetUint32("shellcode-headers")
-	shellcodeThread, _ := cmd.Flags().GetBool("shellcode-thread")
-	shellcodeUnicode, _ := cmd.Flags().GetBool("shellcode-unicode")
-	shellcodeOEP, _ := cmd.Flags().GetUint32("shellcode-oep")
-
-	anyChanged := cmd.Flags().Changed("shellcode-entropy") ||
-		cmd.Flags().Changed("shellcode-compress") ||
-		cmd.Flags().Changed("shellcode-exitopt") ||
-		cmd.Flags().Changed("shellcode-bypass") ||
-		cmd.Flags().Changed("shellcode-headers") ||
-		cmd.Flags().Changed("shellcode-thread") ||
-		cmd.Flags().Changed("shellcode-unicode") ||
-		cmd.Flags().Changed("shellcode-oep")
-
-	if shellcodeEntropy < 1 || shellcodeEntropy > 3 {
-		return nil, false, fmt.Errorf("shellcode-entropy must be between 1 and 3")
-	}
-	if shellcodeExitOpt < 1 || shellcodeExitOpt > 3 {
-		return nil, false, fmt.Errorf("shellcode-exitopt must be between 1 and 3")
-	}
-	if shellcodeBypass < 1 || shellcodeBypass > 3 {
-		return nil, false, fmt.Errorf("shellcode-bypass must be between 1 and 3")
-	}
-	if shellcodeHeaders < 1 || shellcodeHeaders > 2 {
-		return nil, false, fmt.Errorf("shellcode-headers must be 1 or 2")
-	}
-
-	shellcodeCompress := uint32(1)
-	if shellcodeCompressEnabled {
-		shellcodeCompress = 2
-	}
-
-	return &clientpb.ShellcodeConfig{
-		Entropy:  shellcodeEntropy,
-		Compress: shellcodeCompress,
-		ExitOpt:  shellcodeExitOpt,
-		Bypass:   shellcodeBypass,
-		Headers:  shellcodeHeaders,
-		Thread:   shellcodeThread,
-		Unicode:  shellcodeUnicode,
-		OEP:      shellcodeOEP,
-	}, anyChanged, nil
-}
-
-func shouldConvertExecuteShellcodePE(shellcodePath string, shellcodeFlagsChanged bool) (bool, bool) {
-	ext := strings.ToLower(filepath.Ext(shellcodePath))
-	isPEByExt := ext == ".exe" || ext == ".dll"
-	return isPEByExt || shellcodeFlagsChanged, ext == ".dll"
-}
-
-func activeTargetName(session *clientpb.Session, beacon *clientpb.Beacon) string {
-	if session != nil {
-		return session.GetName()
-	}
-	if beacon != nil {
-		return beacon.GetName()
-	}
-	return "target"
-}
-
-func activeTargetOS(session *clientpb.Session, beacon *clientpb.Beacon) string {
-	if session != nil {
-		return strings.ToLower(session.GetOS())
-	}
-	if beacon != nil {
-		return strings.ToLower(beacon.GetOS())
-	}
-	return ""
-}
-
-func activeTargetArch(session *clientpb.Session, beacon *clientpb.Beacon) string {
-	if session != nil {
-		return session.GetArch()
-	}
-	if beacon != nil {
-		return beacon.GetArch()
-	}
-	return ""
-}
-
-type executeShellcodeDonutOptions struct {
-	entropy  int
-	compress int
-	exitOpt  int
-	bypass   int
-	headers  int
-	thread   bool
-	unicode  bool
-	oep      uint32
-}
-
-func normalizeExecuteShellcodeDonutConfig(config *clientpb.ShellcodeConfig) executeShellcodeDonutOptions {
-	opts := executeShellcodeDonutOptions{
-		entropy:  defaultExecuteShellcodeDonutEntropy,
-		compress: defaultExecuteShellcodeDonutCompress,
-		exitOpt:  defaultExecuteShellcodeDonutExitOpt,
-		bypass:   defaultExecuteShellcodeDonutBypass,
-		headers:  defaultExecuteShellcodeDonutHeaders,
-	}
-	if config == nil {
-		return opts
-	}
-	if config.Entropy >= 1 && config.Entropy <= 3 {
-		opts.entropy = int(config.Entropy)
-	}
-	if config.Compress >= 1 && config.Compress <= 2 {
-		opts.compress = int(config.Compress)
-	}
-	if config.ExitOpt >= 1 && config.ExitOpt <= 3 {
-		opts.exitOpt = int(config.ExitOpt)
-	}
-	if config.Bypass >= 1 && config.Bypass <= 3 {
-		opts.bypass = int(config.Bypass)
-	}
-	if config.Headers >= 1 && config.Headers <= 2 {
-		opts.headers = int(config.Headers)
-	}
-	opts.thread = config.Thread
-	opts.unicode = config.Unicode
-	if config.OEP > 0 {
-		opts.oep = config.OEP
-	}
-	return opts
-}
-
-func donutShellcodeFromPE(data []byte, arch string, isDLLHint bool, config *clientpb.ShellcodeConfig) ([]byte, error) {
-	peFile, err := pe.NewFile(bytes.NewReader(data))
-	if err != nil {
-		return nil, err
-	}
-	isDLL := isDLLHint || ((peFile.FileHeader.Characteristics & imageFileDLLMask) != 0)
-	ext := ".exe"
-	if isDLL {
-		ext = ".dll"
-	}
-	opts := normalizeExecuteShellcodeDonutConfig(config)
-	result, err := wasmdonut.Generate(context.Background(), data, ext, wasmdonut.GenerateOptions{
-		Ext:      ext,
-		Arch:     getExecuteShellcodeDonutArch(arch),
-		Bypass:   opts.bypass,
-		Headers:  opts.headers,
-		Entropy:  opts.entropy,
-		Compress: opts.compress,
-		ExitOpt:  opts.exitOpt,
-		Thread:   opts.thread,
-		Unicode:  opts.unicode,
-		OEP:      opts.oep,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return addExecuteShellcodeStackCheck(result.Loader), nil
-}
-
-func getExecuteShellcodeDonutArch(arch string) int {
-	donutArch := wasmdonut.DonutArchX84
-	switch strings.ToLower(arch) {
-	case "x32", "x86", "386":
-		donutArch = wasmdonut.DonutArchX86
-	case "x64", "amd64":
-		donutArch = wasmdonut.DonutArchX64
-	case "x84":
-		donutArch = wasmdonut.DonutArchX84
-	}
-	return donutArch
-}
-
-func addExecuteShellcodeStackCheck(shellcode []byte) []byte {
-	stackCheckPrologue := []byte{
-		0x48, 0x83, 0xE4, 0xF0, // and rsp,0xfffffffffffffff0
-		0x48, 0x83, 0xC4, 0x08, // add rsp,0x8
-	}
-	return append(stackCheckPrologue, shellcode...)
-}
-
 func executeInteractive(cmd *cobra.Command, hostProc string, shellcode []byte, rwxPages bool, con *console.SliverClient) {
 	// Check active session
 	session := con.ActiveTarget.GetSessionInteractive()
@@ -375,25 +157,10 @@ func executeInteractive(cmd *cobra.Command, hostProc string, shellcode []byte, r
 
 	tunnel := core.GetTunnels().Start(rpcTunnel.GetTunnelID(), rpcTunnel.GetSessionID())
 
-	var rows uint32
-	var cols uint32
-	if !noPty {
-		colsInt, rowsInt, err := term.GetSize(int(os.Stdout.Fd()))
-		if err != nil || rowsInt <= 0 || colsInt <= 0 {
-			colsInt, rowsInt, err = term.GetSize(int(os.Stdin.Fd()))
-		}
-		if err == nil && rowsInt > 0 && colsInt > 0 {
-			rows = uint32(rowsInt)
-			cols = uint32(colsInt)
-		}
-	}
-
 	shell, err := con.Rpc.Shell(context.Background(), &sliverpb.ShellReq{
 		Request:   con.ActiveTarget.Request(cmd),
 		Path:      hostProc,
 		EnablePTY: !noPty,
-		Rows:      rows,
-		Cols:      cols,
 		TunnelID:  tunnel.ID,
 	})
 	if err != nil {
@@ -433,12 +200,6 @@ func executeInteractive(cmd *cobra.Command, hostProc string, shellcode []byte, r
 		}
 	}
 
-	stopPtyResize := func() {}
-	if !noPty {
-		stopPtyResize = startPtyResizeWatcher(con, cmd, tunnel.ID)
-	}
-	defer stopPtyResize()
-
 	log.Printf("Starting stdin/stdout shell ...")
 	go func() {
 		n, err := io.Copy(os.Stdout, tunnel)

client/command/exec/execute-shellcode_test.go

@@ -1,100 +0,0 @@
-package exec
-
-import (
-	"testing"
-
-	"github.com/spf13/cobra"
-)
-
-func TestParseExecuteShellcodeFlagsDefaults(t *testing.T) {
-	cmd := newExecuteShellcodeFlagsTestCommand(t)
-
-	cfg, changed, err := parseExecuteShellcodeFlags(cmd)
-	if err != nil {
-		t.Fatalf("parseExecuteShellcodeFlags returned error: %v", err)
-	}
-	if changed {
-		t.Fatalf("expected changed=false with defaults")
-	}
-	if cfg == nil {
-		t.Fatalf("expected non-nil config")
-	}
-	if cfg.Entropy != 1 || cfg.Compress != 1 || cfg.ExitOpt != 1 || cfg.Bypass != 3 || cfg.Headers != 1 {
-		t.Fatalf("unexpected defaults: %+v", cfg)
-	}
-	if cfg.Thread || cfg.Unicode || cfg.OEP != 0 {
-		t.Fatalf("unexpected default bool/OEP values: %+v", cfg)
-	}
-}
-
-func TestParseExecuteShellcodeFlagsChanged(t *testing.T) {
-	cmd := newExecuteShellcodeFlagsTestCommand(t)
-	if err := cmd.Flags().Set("shellcode-entropy", "2"); err != nil {
-		t.Fatalf("set shellcode-entropy: %v", err)
-	}
-	if err := cmd.Flags().Set("shellcode-compress", "true"); err != nil {
-		t.Fatalf("set shellcode-compress: %v", err)
-	}
-	if err := cmd.Flags().Set("shellcode-thread", "true"); err != nil {
-		t.Fatalf("set shellcode-thread: %v", err)
-	}
-
-	cfg, changed, err := parseExecuteShellcodeFlags(cmd)
-	if err != nil {
-		t.Fatalf("parseExecuteShellcodeFlags returned error: %v", err)
-	}
-	if !changed {
-		t.Fatalf("expected changed=true")
-	}
-	if cfg.Entropy != 2 || cfg.Compress != 2 || !cfg.Thread {
-		t.Fatalf("unexpected changed config: %+v", cfg)
-	}
-}
-
-func TestParseExecuteShellcodeFlagsValidation(t *testing.T) {
-	cmd := newExecuteShellcodeFlagsTestCommand(t)
-	if err := cmd.Flags().Set("shellcode-bypass", "9"); err != nil {
-		t.Fatalf("set shellcode-bypass: %v", err)
-	}
-	if _, _, err := parseExecuteShellcodeFlags(cmd); err == nil {
-		t.Fatalf("expected validation error for shellcode-bypass")
-	}
-}
-
-func TestShouldConvertExecuteShellcodePE(t *testing.T) {
-	testCases := []struct {
-		name         string
-		path         string
-		flagsChanged bool
-		wantConvert  bool
-		wantDLL      bool
-	}{
-		{name: "exe by extension", path: "/tmp/payload.exe", flagsChanged: false, wantConvert: true, wantDLL: false},
-		{name: "dll by extension", path: "/tmp/payload.dll", flagsChanged: false, wantConvert: true, wantDLL: true},
-		{name: "raw shellcode", path: "/tmp/payload.bin", flagsChanged: false, wantConvert: false, wantDLL: false},
-		{name: "flags force conversion", path: "/tmp/payload.bin", flagsChanged: true, wantConvert: true, wantDLL: false},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			gotConvert, gotDLL := shouldConvertExecuteShellcodePE(tc.path, tc.flagsChanged)
-			if gotConvert != tc.wantConvert || gotDLL != tc.wantDLL {
-				t.Fatalf("unexpected result convert=%v dll=%v, expected convert=%v dll=%v", gotConvert, gotDLL, tc.wantConvert, tc.wantDLL)
-			}
-		})
-	}
-}
-
-func newExecuteShellcodeFlagsTestCommand(t *testing.T) *cobra.Command {
-	t.Helper()
-
-	cmd := &cobra.Command{Use: "execute-shellcode"}
-	cmd.Flags().Uint32("shellcode-entropy", 1, "")
-	cmd.Flags().Bool("shellcode-compress", false, "")
-	cmd.Flags().Uint32("shellcode-exitopt", 1, "")
-	cmd.Flags().Uint32("shellcode-bypass", 3, "")
-	cmd.Flags().Uint32("shellcode-headers", 1, "")
-	cmd.Flags().Bool("shellcode-thread", false, "")
-	cmd.Flags().Bool("shellcode-unicode", false, "")
-	cmd.Flags().Uint32("shellcode-oep", 0, "")
-	return cmd
-}

client/command/exec/execute.go

@@ -44,7 +44,6 @@ func ExecuteCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 	token, _ := cmd.Flags().GetBool("token")
 	hidden, _ := cmd.Flags().GetBool("hidden")
 	output, _ := cmd.Flags().GetBool("output")
-	background, _ := cmd.Flags().GetBool("background")
 	stdout, _ := cmd.Flags().GetString("stdout")
 	stderr, _ := cmd.Flags().GetString("stderr")
 	saveLoot, _ := cmd.Flags().GetBool("loot")
@@ -59,15 +58,10 @@ func ExecuteCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 	}
 	hostName := getHostname(session, beacon)
 
-	if background && (saveLoot || saveOutput) {
-		con.PrintErrorf("The loot and save options are not supported with --background\n")
-		return
-	}
-
 	// If the user wants to loot or save the output, we have to capture it regardless of if they specified -o
-	captureOutput := !background && (output || saveLoot || saveOutput)
+	captureOutput := output || saveLoot || saveOutput
 
-	if captureOutput && beacon != nil {
+	if output && beacon != nil {
 		con.PrintWarnf("Using --output in beacon mode, if the command blocks the task will never complete\n\n")
 	}
 
@@ -79,14 +73,10 @@ func ExecuteCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 	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)
-			ctrl <- true
-			<-ctrl
 			return
 		}
 		if envInheritance || len(envVars) > 0 {
 			con.PrintErrorf("The env and env-inheritance options are not supported with token, hidden, or ppid\n")
-			ctrl <- true
-			<-ctrl
 			return
 		}
 		exec, err = con.Rpc.ExecuteWindows(context.Background(), &sliverpb.ExecuteWindowsReq{
@@ -94,7 +84,6 @@ func ExecuteCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 			Path:       cmdPath,
 			Args:       args,
 			Output:     captureOutput,
-			Background: background,
 			Stderr:     stderr,
 			Stdout:     stdout,
 			UseToken:   token,
@@ -107,7 +96,6 @@ func ExecuteCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 			Path:           cmdPath,
 			Args:           args,
 			Output:         captureOutput,
-			Background:     background,
 			Stderr:         stderr,
 			Stdout:         stdout,
 			EnvInheritance: envInheritance,
@@ -166,23 +154,11 @@ func PrintExecute(exec *sliverpb.Execute, cmd *cobra.Command, con *console.Slive
 	stderr, _ := cmd.Flags().GetString("stderr")
 
 	output, _ := cmd.Flags().GetBool("output")
-	background := false
-	if cmd.Flags().Lookup("background") != nil {
-		background, _ = cmd.Flags().GetBool("background")
-	}
-	if background {
-		// Background execution never returns inline output.
-		output = false
-	}
 	if !output {
-		if exec.Pid != 0 {
-			if background {
-				con.PrintInfof("Started background process (pid: %d)\n", exec.Pid)
-				return
-			}
-			con.PrintInfof("Started process (pid: %d)\n", exec.Pid)
+		if exec.Status == 0 {
+			con.PrintInfof("Command executed successfully\n")
 		} else {
-			con.PrintInfof("Process started\n")
+			con.PrintErrorf("Exit code %d\n", exec.Status)
 		}
 		return
 	}

client/command/exec/migrate.go

@@ -20,19 +20,14 @@ package exec
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"sort"
-	"strings"
 
 	"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/client/forms"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
 )
 
 // MigrateCmd - Windows only, inject an implant into another process
@@ -60,17 +55,9 @@ func MigrateCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 		implantName = beacon.Name
 	}
 
-	targetArch := config.GetGOARCH()
-	if session != nil && session.Arch != "" {
-		targetArch = session.Arch
-	} else if beacon != nil && beacon.Arch != "" {
-		targetArch = beacon.Arch
-	}
-
-	encoder, err := parseShellcodeEncoderFlag(cmd, targetArch, con)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
+	encoder := clientpb.ShellcodeEncoder_SHIKATA_GA_NAI
+	if disableSgn, _ := cmd.Flags().GetBool("disable-sgn"); disableSgn {
+		encoder = clientpb.ShellcodeEncoder_NONE
 	}
 
 	ctrl := make(chan bool)
@@ -133,118 +120,3 @@ func MigrateCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 		con.PrintInfof("Successfully migrated to %d\n", migrate.Pid)
 	}
 }
-
-func normalizeShellcodeEncoderName(name string) string {
-	normalized := strings.ToLower(strings.TrimSpace(name))
-	normalized = strings.ReplaceAll(normalized, "-", "_")
-	return normalized
-}
-
-func normalizeShellcodeArch(arch string) string {
-	normalized := strings.ToLower(strings.TrimSpace(arch))
-	switch normalized {
-	case "amd64", "x64", "x86_64":
-		return "amd64"
-	case "386", "x86", "i386":
-		return "386"
-	case "arm64", "aarch64":
-		return "arm64"
-	default:
-		return normalized
-	}
-}
-
-func fetchShellcodeEncoderMap(con *console.SliverClient) (*clientpb.ShellcodeEncoderMap, error) {
-	if con == nil || con.Rpc == nil {
-		return nil, errors.New("no RPC client")
-	}
-	grpcCtx, cancel := con.GrpcContext(nil)
-	defer cancel()
-	return con.Rpc.ShellcodeEncoderMap(grpcCtx, &commonpb.Empty{})
-}
-
-func compatibleShellcodeEncoderNames(encoderMap *clientpb.ShellcodeEncoderMap, arch string) []string {
-	if encoderMap == nil {
-		return nil
-	}
-	arch = normalizeShellcodeArch(arch)
-	archMap := encoderMap.GetEncoders()[arch]
-	if archMap == nil {
-		return nil
-	}
-
-	names := make([]string, 0, len(archMap.GetEncoders()))
-	for name := range archMap.GetEncoders() {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	return names
-}
-
-func shellcodeEncoderEnumForArch(encoderMap *clientpb.ShellcodeEncoderMap, arch, name string) (clientpb.ShellcodeEncoder, bool) {
-	if encoderMap == nil {
-		return clientpb.ShellcodeEncoder_NONE, false
-	}
-	arch = normalizeShellcodeArch(arch)
-	name = normalizeShellcodeEncoderName(name)
-	archMap := encoderMap.GetEncoders()[arch]
-	if archMap == nil {
-		return clientpb.ShellcodeEncoder_NONE, false
-	}
-	encoder, ok := archMap.GetEncoders()[name]
-	return encoder, ok
-}
-
-func parseShellcodeEncoderFlag(cmd *cobra.Command, targetArch string, con *console.SliverClient) (clientpb.ShellcodeEncoder, error) {
-	rawEncoder, _ := cmd.Flags().GetString("shellcode-encoder")
-	rawEncoder = strings.TrimSpace(rawEncoder)
-
-	if cmd.Flags().Changed("shellcode-encoder") && rawEncoder == "" {
-		return clientpb.ShellcodeEncoder_NONE, fmt.Errorf("shellcode-encoder cannot be empty; use 'none' to disable encoding")
-	}
-
-	normalized := normalizeShellcodeEncoderName(rawEncoder)
-	if normalized == "none" {
-		return clientpb.ShellcodeEncoder_NONE, nil
-	}
-
-	encoderMap, err := fetchShellcodeEncoderMap(con)
-	if err != nil {
-		return clientpb.ShellcodeEncoder_NONE, err
-	}
-
-	// If no encoder specified, prompt for a compatible encoder (or none).
-	if rawEncoder == "" && !cmd.Flags().Changed("shellcode-encoder") {
-		compatible := compatibleShellcodeEncoderNames(encoderMap, targetArch)
-		if len(compatible) == 0 {
-			// No known compatible encoders for this arch.
-			return clientpb.ShellcodeEncoder_NONE, nil
-		}
-
-		options := append([]string{"none"}, compatible...)
-		choice := "none"
-		if err := forms.Select("Select a shellcode encoder (optional)", options, &choice); err != nil {
-			return clientpb.ShellcodeEncoder_NONE, err
-		}
-		if normalizeShellcodeEncoderName(choice) == "none" {
-			return clientpb.ShellcodeEncoder_NONE, nil
-		}
-
-		encoder, ok := shellcodeEncoderEnumForArch(encoderMap, targetArch, choice)
-		if !ok {
-			return clientpb.ShellcodeEncoder_NONE, fmt.Errorf("unsupported shellcode encoder %q for arch %s", choice, normalizeShellcodeArch(targetArch))
-		}
-		return encoder, nil
-	}
-
-	// Encoder explicitly specified by name.
-	encoder, ok := shellcodeEncoderEnumForArch(encoderMap, targetArch, rawEncoder)
-	if !ok {
-		compatible := compatibleShellcodeEncoderNames(encoderMap, targetArch)
-		if len(compatible) == 0 {
-			return clientpb.ShellcodeEncoder_NONE, fmt.Errorf("no shellcode encoders are available for arch %s", normalizeShellcodeArch(targetArch))
-		}
-		return clientpb.ShellcodeEncoder_NONE, fmt.Errorf("unsupported shellcode encoder %q for arch %s (valid: %s)", rawEncoder, normalizeShellcodeArch(targetArch), strings.Join(compatible, ", "))
-	}
-	return encoder, nil
-}

client/command/exec/resize_unix.go

@@ -1,97 +0,0 @@
-//go:build !windows
-
-package exec
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-	"golang.org/x/term"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-func startPtyResizeWatcher(con *console.SliverClient, cmd *cobra.Command, tunnelID uint64) func() {
-	if con == nil || con.Rpc == nil {
-		return func() {}
-	}
-
-	stdoutFd := int(os.Stdout.Fd())
-	stdinFd := int(os.Stdin.Fd())
-	if !term.IsTerminal(stdoutFd) && !term.IsTerminal(stdinFd) {
-		return func() {}
-	}
-
-	sigCh := make(chan os.Signal, 1)
-	signal.Notify(sigCh, syscall.SIGWINCH)
-
-	stopCh := make(chan struct{})
-	doneCh := make(chan struct{})
-
-	go func() {
-		defer close(doneCh)
-
-		lastCols, lastRows := -1, -1
-		send := func() bool {
-			cols, rows, err := term.GetSize(stdoutFd)
-			if err != nil || cols <= 0 || rows <= 0 {
-				cols, rows, err = term.GetSize(stdinFd)
-			}
-			if err != nil || cols <= 0 || rows <= 0 {
-				return true
-			}
-			if cols == lastCols && rows == lastRows {
-				return true
-			}
-			lastCols, lastRows = cols, rows
-
-			req := con.ActiveTarget.Request(cmd)
-			if req == nil {
-				return false
-			}
-			req.Timeout = int64(2 * time.Second)
-
-			_, err = con.Rpc.ShellResize(context.Background(), &sliverpb.ShellResizeReq{
-				Request:  req,
-				TunnelID: tunnelID,
-				Rows:     uint32(rows),
-				Cols:     uint32(cols),
-			})
-			if status.Code(err) == codes.Unimplemented {
-				return false
-			}
-			return true
-		}
-
-		if !send() {
-			return
-		}
-
-		for {
-			select {
-			case <-stopCh:
-				return
-			case <-sigCh:
-				if !send() {
-					return
-				}
-			}
-		}
-	}()
-
-	var once sync.Once
-	return func() {
-		once.Do(func() {
-			signal.Stop(sigCh)
-			close(stopCh)
-			<-doneCh
-		})
-	}
-}

client/command/exec/resize_windows.go

@@ -1,93 +0,0 @@
-//go:build windows
-
-package exec
-
-import (
-	"context"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/spf13/cobra"
-	"golang.org/x/term"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"os"
-	"sync"
-	"time"
-)
-
-func startPtyResizeWatcher(con *console.SliverClient, cmd *cobra.Command, tunnelID uint64) func() {
-	if con == nil || con.Rpc == nil {
-		return func() {}
-	}
-
-	stdoutFd := int(os.Stdout.Fd())
-	stdinFd := int(os.Stdin.Fd())
-	if !term.IsTerminal(stdoutFd) && !term.IsTerminal(stdinFd) {
-		return func() {}
-	}
-
-	stopCh := make(chan struct{})
-	doneCh := make(chan struct{})
-
-	go func() {
-		defer close(doneCh)
-
-		ticker := time.NewTicker(250 * time.Millisecond)
-		defer ticker.Stop()
-
-		lastCols, lastRows := -1, -1
-		send := func() bool {
-			cols, rows, err := term.GetSize(stdoutFd)
-			if err != nil || cols <= 0 || rows <= 0 {
-				cols, rows, err = term.GetSize(stdinFd)
-			}
-			if err != nil || cols <= 0 || rows <= 0 {
-				return true
-			}
-			if cols == lastCols && rows == lastRows {
-				return true
-			}
-			lastCols, lastRows = cols, rows
-
-			req := con.ActiveTarget.Request(cmd)
-			if req == nil {
-				return false
-			}
-			req.Timeout = int64(2 * time.Second)
-
-			_, err = con.Rpc.ShellResize(context.Background(), &sliverpb.ShellResizeReq{
-				Request:  req,
-				TunnelID: tunnelID,
-				Rows:     uint32(rows),
-				Cols:     uint32(cols),
-			})
-			if status.Code(err) == codes.Unimplemented {
-				return false
-			}
-			return true
-		}
-
-		if !send() {
-			return
-		}
-
-		for {
-			select {
-			case <-stopCh:
-				return
-			case <-ticker.C:
-				if !send() {
-					return
-				}
-			}
-		}
-	}()
-
-	var once sync.Once
-	return func() {
-		once.Do(func() {
-			close(stopCh)
-			<-doneCh
-		})
-	}
-}

client/command/extensions/args.go

@@ -1,123 +0,0 @@
-package extensions
-
-/*
-	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 (
-	"strconv"
-	"strings"
-
-	"github.com/spf13/cobra"
-)
-
-// splitExtensionArgs separates Sliver-owned flags (--save, --timeout, --help)
-// from the extension's own arguments in a raw argument slice.
-//
-// Extension commands run with cobra's DisableFlagParsing enabled (see
-// ExtensionRegisterCommand). Without it, pflag parses the command line first
-// and, because the extension's own flags (e.g. --type, --fqdn) are unknown to
-// pflag, ParseErrorsWhitelist.UnknownFlags causes pflag to silently drop each
-// unknown flag together with its value; the BOF argument parser never saw them
-// unless the operator injected cobra's "--" separator (#2309). Running with
-// flag parsing disabled hands us the raw, unstripped slice, so we separate the
-// Sliver-owned flags ourselves here.
-//
-// A literal "--" stops Sliver-flag scanning; every token after it is passed
-// through verbatim, preserving the long-standing workaround syntax. Unknown
-// tokens (the extension's named flags, their values and positional arguments)
-// are never consumed or reordered, so both forms work:
-//
-//	delegationbof --timeout 30 --type 6 --fqdn child.htb.local
-//	delegationbof -- --type 6 --fqdn child.htb.local
-func splitExtensionArgs(raw []string) (save bool, timeout int64, help bool, extArgs []string) {
-	timeout = defaultTimeout
-	extArgs = make([]string, 0, len(raw))
-
-	passthrough := false
-	for i := 0; i < len(raw); i++ {
-		tok := raw[i]
-
-		// Once we have seen "--", copy everything through untouched so the
-		// existing `ext -- --foo bar` syntax keeps working identically.
-		if passthrough {
-			extArgs = append(extArgs, tok)
-			continue
-		}
-
-		switch {
-		case tok == "--":
-			passthrough = true
-
-		case tok == "--help" || tok == "-h":
-			help = true
-
-		case tok == "--save" || tok == "-s":
-			save = true
-
-		case strings.HasPrefix(tok, "--save="):
-			save = parseBoolValue(tok[len("--save="):], true)
-
-		case tok == "--timeout" || tok == "-t":
-			// Consume the following token as the value, mirroring pflag. If no
-			// token follows, leave the default in place rather than erroring.
-			if i+1 < len(raw) {
-				if n, err := strconv.ParseInt(raw[i+1], 10, 64); err == nil {
-					timeout = n
-				}
-				i++
-			}
-
-		case strings.HasPrefix(tok, "--timeout="):
-			if n, err := strconv.ParseInt(tok[len("--timeout="):], 10, 64); err == nil {
-				timeout = n
-			}
-
-		default:
-			// Not a Sliver-owned flag: hand it to the extension parser untouched.
-			extArgs = append(extArgs, tok)
-		}
-	}
-
-	return save, timeout, help, extArgs
-}
-
-// applyOwnedFlags republishes the manually parsed Sliver-owned flag values back
-// onto the command's flag set. DisableFlagParsing prevents pflag from populating
-// them, so helpers that read them via cmd.Flags() (notably ActiveTarget.Request,
-// which derives the gRPC timeout from --timeout) would otherwise observe only the
-// defaults.
-func applyOwnedFlags(cmd *cobra.Command, save bool, timeout int64) {
-	if flag := cmd.Flags().Lookup("timeout"); flag != nil {
-		_ = flag.Value.Set(strconv.FormatInt(timeout, 10))
-	}
-	if flag := cmd.Flags().Lookup("save"); flag != nil {
-		_ = flag.Value.Set(strconv.FormatBool(save))
-	}
-}
-
-// parseBoolValue parses a --flag=value bool, defaulting to defVal when the value
-// is empty (the bare-flag form). It accepts the same spellings pflag does.
-func parseBoolValue(v string, defVal bool) bool {
-	switch strings.ToLower(v) {
-	case "", "true", "t", "1":
-		return true
-	case "false", "f", "0":
-		return false
-	}
-	return defVal
-}

client/command/extensions/args_test.go

@@ -1,149 +0,0 @@
-package extensions
-
-/*
-	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 (
-	"reflect"
-	"testing"
-)
-
-// TestSplitExtensionArgs covers the argument-passthrough regression from #2309:
-// the extension's own named flags must reach the BOF parser intact regardless of
-// the cobra "--" separator, while Sliver-owned flags are still honoured.
-func TestSplitExtensionArgs(t *testing.T) {
-	cases := []struct {
-		name    string
-		in      []string
-		save    bool
-		timeout int64
-		help    bool
-		extArgs []string
-	}{
-		{
-			name:    "named extension flags without -- separator (#2309 regression)",
-			in:      []string{"--type", "6", "--fqdn", "child.htb.local"},
-			timeout: defaultTimeout,
-			extArgs: []string{"--type", "6", "--fqdn", "child.htb.local"},
-		},
-		{
-			name:    "named extension flags with -- separator (existing workaround)",
-			in:      []string{"--", "--type", "6", "--fqdn", "child.htb.local"},
-			timeout: defaultTimeout,
-			extArgs: []string{"--type", "6", "--fqdn", "child.htb.local"},
-		},
-		{
-			name:    "sliver-owned flags precede extension arguments",
-			in:      []string{"--timeout", "30", "--save", "--type", "6"},
-			save:    true,
-			timeout: 30,
-			extArgs: []string{"--type", "6"},
-		},
-		{
-			name:    "quoted value containing spaces stays a single argument",
-			in:      []string{"--name", "hello world", "--type", "6"},
-			timeout: defaultTimeout,
-			extArgs: []string{"--name", "hello world", "--type", "6"},
-		},
-		{
-			name:    "positional extension arguments are preserved",
-			in:      []string{"foo", "bar", "baz"},
-			timeout: defaultTimeout,
-			extArgs: []string{"foo", "bar", "baz"},
-		},
-		{
-			name:    "single-dash and double-dash forms are preserved",
-			in:      []string{"-type", "6", "--fqdn", "child.htb.local"},
-			timeout: defaultTimeout,
-			extArgs: []string{"-type", "6", "--fqdn", "child.htb.local"},
-		},
-		{
-			name:    "equals form for timeout",
-			in:      []string{"--timeout=120", "--type", "6"},
-			timeout: 120,
-			extArgs: []string{"--type", "6"},
-		},
-		{
-			name:    "short -s save flag",
-			in:      []string{"-s", "--type", "6"},
-			save:    true,
-			timeout: defaultTimeout,
-			extArgs: []string{"--type", "6"},
-		},
-		{
-			name:    "help flag is detected",
-			in:      []string{"--help"},
-			help:    true,
-			timeout: defaultTimeout,
-			extArgs: []string{},
-		},
-		{
-			name:    "empty input",
-			in:      nil,
-			timeout: defaultTimeout,
-			extArgs: []string{},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			save, timeout, help, extArgs := splitExtensionArgs(tc.in)
-
-			if save != tc.save {
-				t.Errorf("save: got %v, want %v", save, tc.save)
-			}
-			if timeout != tc.timeout {
-				t.Errorf("timeout: got %d, want %d", timeout, tc.timeout)
-			}
-			if help != tc.help {
-				t.Errorf("help: got %v, want %v", help, tc.help)
-			}
-			if !reflect.DeepEqual(extArgs, tc.extArgs) {
-				t.Errorf("extArgs: got %#v, want %#v", extArgs, tc.extArgs)
-			}
-		})
-	}
-}
-
-// TestParseBoolValue checks the --flag=value helper used for --save=value.
-func TestParseBoolValue(t *testing.T) {
-	cases := []struct {
-		in   string
-		want bool
-	}{
-		{"", true},
-		{"true", true},
-		{"TRUE", true},
-		{"1", true},
-		{"t", true},
-		{"false", false},
-		{"0", false},
-		{"no", false}, // unsupported spellings keep the default
-	}
-	for _, tc := range cases {
-		got := parseBoolValue(tc.in, true)
-		// "no" is not a pflag spelling, so it falls through to the default (true).
-		want := tc.want
-		if tc.in == "no" {
-			want = true
-		}
-		if got != want {
-			t.Errorf("parseBoolValue(%q): got %v, want %v", tc.in, got, want)
-		}
-	}
-}

client/command/extensions/commands.go

@@ -1,7 +1,6 @@
 package extensions
 
 import (
-	"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/command/use"
@@ -34,7 +33,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	}
 	extensionCmd.AddCommand(extensionLoadCmd)
 	carapace.Gen(extensionLoadCmd).PositionalCompletion(carapace.ActionDirectories().Usage("path to the extension directory"))
-	completers.RegisterLocalFilePathPositionalCompletion(extensionLoadCmd, 0)
 
 	extensionInstallCmd := &cobra.Command{
 		Use:   consts.InstallStr,
@@ -47,7 +45,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	}
 	extensionCmd.AddCommand(extensionInstallCmd)
 	carapace.Gen(extensionInstallCmd).PositionalCompletion(carapace.ActionFiles().Usage("path to the extension .tar.gz or directory"))
-	completers.RegisterLocalFilePathPositionalCompletion(extensionInstallCmd, 0)
 
 	extensionRmCmd := &cobra.Command{
 		Use:   consts.RmStr,

client/command/extensions/extensions_test.go

@@ -3,8 +3,6 @@ package extensions
 import (
 	"encoding/json"
 	"testing"
-
-	"github.com/bishopfox/sliver/util"
 )
 
 /*
@@ -116,8 +114,6 @@ const (
 )
 
 func TestParseExtensionManifest(t *testing.T) {
-	expectedPath := util.ResolvePath("foo/test1.dll")
-
 	extManifest, err := ParseExtensionManifest([]byte(sample1))
 	if err != nil {
 		t.Fatalf("Error parsing extension manifest: %s", err)
@@ -154,8 +150,8 @@ func TestParseExtensionManifest(t *testing.T) {
 		if extCmd.Files[0].Arch != "amd64" {
 			t.Errorf("Expected Arch 'amd64', got '%s'", extCmd.Files[0].Arch)
 		}
-		if extCmd.Files[0].Path != expectedPath {
-			t.Errorf("Expected path '%s', got '%s'", expectedPath, extCmd.Files[0].Path)
+		if extCmd.Files[0].Path != "/foo/test1.dll" {
+			t.Errorf("Expected path '/foo/test1.dll', got '%s'", extCmd.Files[0].Path)
 		}
 	}
 
@@ -182,16 +178,14 @@ func TestParseExtensionManifest(t *testing.T) {
 		if extManifest2.Files[0].Arch != "amd64" {
 			t.Errorf("Expected Arch 'amd64', got '%s'", extManifest2.Files[0].Arch)
 		}
-		if extManifest2.Files[0].Path != expectedPath {
-			t.Errorf("Expected path '%s', got '%s'", expectedPath, extManifest2.Files[0].Path)
+		if extManifest2.Files[0].Path != "/foo/test1.dll" {
+			t.Errorf("Expected path '/foo/test1.dll', got '%s'", extManifest2.Files[0].Path)
 		}
 	}
 
 }
 
 func TestParseMultipleCmdManifest(t *testing.T) {
-	expectedPath := util.ResolvePath("ex.dll")
-
 	mextManifest, err := ParseExtensionManifest([]byte(multicmd))
 	if err != nil {
 		t.Errorf("error parsing manifest: %s", err)
@@ -212,11 +206,11 @@ func TestParseMultipleCmdManifest(t *testing.T) {
 	if mextManifest.ExtCommand[1].Entrypoint != "Test2" {
 		t.Errorf("expected entrypoint Test2, got %s", mextManifest.ExtCommand[1].Entrypoint)
 	}
-	if mextManifest.ExtCommand[0].Files[0].Path != expectedPath { // path normalization is platform-specific
-		t.Errorf("expected path %s, got %s", expectedPath, mextManifest.ExtCommand[0].Files[0].Path)
+	if mextManifest.ExtCommand[0].Files[0].Path != "/ex.dll" { //path cleaning adds a root path here? I am not sure if this should be a bug or not... works fine in prod
+		t.Errorf("expected path ex.dll, got %s", mextManifest.ExtCommand[0].Files[0].Path)
 	}
-	if mextManifest.ExtCommand[1].Files[0].Path != expectedPath { // path normalization is platform-specific
-		t.Errorf("expected path %s, got %s", expectedPath, mextManifest.ExtCommand[1].Files[0].Path)
+	if mextManifest.ExtCommand[1].Files[0].Path != "/ex.dll" { //path cleaning adds a root path here? I am not sure if this should be a bug or not... works fine in prod
+		t.Errorf("expected path ex.dll, got %s", mextManifest.ExtCommand[0].Files[0].Path)
 	}
 	//maybe some more? args?
 }

client/command/extensions/load.go

@@ -370,19 +370,16 @@ func ExtensionRegisterCommand(extCmd *ExtCommand, cmd *cobra.Command, con *conso
 		Run: func(cmd *cobra.Command, args []string) {
 			runExtensionCmd(cmd, con, args)
 		},
-		GroupID: consts.ExtensionHelpGroup,
-		// DisableFlagParsing keeps the extension's own flags (which are unknown to
-		// pflag) from being silently stripped together with their values. We split
-		// Sliver-owned flags out of the raw slice ourselves in runExtensionCmd (#2309).
-		DisableFlagParsing: true,
-		Annotations:        makeCommandPlatformFilters(extCmd),
+		GroupID:     consts.ExtensionHelpGroup,
+		Annotations: makeCommandPlatformFilters(extCmd),
 	}
 
 	// Flags
 	f := pflag.NewFlagSet(extCmd.CommandName, pflag.ContinueOnError)
 	f.BoolP("save", "s", false, "Save output to disk")
-	f.Int64P("timeout", "t", defaultTimeout, "command timeout in seconds")
+	f.IntP("timeout", "t", defaultTimeout, "command timeout in seconds")
 	extensionCmd.Flags().AddFlagSet(f)
+	extensionCmd.Flags().ParseErrorsWhitelist.UnknownFlags = true
 
 	// Completions
 	comps := carapace.Gen(extensionCmd)
@@ -532,18 +529,6 @@ func loadDep(goos string, goarch string, depName string, cmd *cobra.Command, con
 }
 
 func runExtensionCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	// The command runs with DisableFlagParsing, so args is the raw, unstripped
-	// slice. Separate Sliver-owned flags from the extension's own arguments and
-	// re-publish them on the flag set (so Request()'s --timeout still works),
-	// then feed only the extension arguments to the BOF/DLL parsers (#2309).
-	save, timeout, helpRequested, extArgs := splitExtensionArgs(args)
-	if helpRequested {
-		_ = cmd.Help()
-		return
-	}
-	applyOwnedFlags(cmd, save, timeout)
-	args = extArgs
-
 	var (
 		err           error
 		extensionArgs []byte

client/command/filesystem/chtimes.go

@@ -19,8 +19,6 @@ package filesystem
 
 import (
 	"context"
-	"fmt"
-	"strconv"
 	"time"
 
 	"github.com/bishopfox/sliver/client/console"
@@ -30,77 +28,14 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-const chtimesDefaultLayout = "2006-01-02 15:04:05"
-
-type chtimesTimeFormat struct {
-	name  string
-	parse func(string) (int64, error)
-}
-
-func chtimesParseUnixSeconds(value string) (int64, error) {
-	parsed, err := strconv.ParseInt(value, 10, 64)
-	if err != nil {
-		return 0, err
-	}
-	return parsed, nil
-}
-
-func chtimesParseUnixMillis(value string) (int64, error) {
-	parsed, err := strconv.ParseInt(value, 10, 64)
-	if err != nil {
-		return 0, err
-	}
-	return time.UnixMilli(parsed).Unix(), nil
-}
-
-func chtimesParseLayout(layout string) func(string) (int64, error) {
-	return func(value string) (int64, error) {
-		parsed, err := time.Parse(layout, value)
-		if err != nil {
-			return 0, err
-		}
-		return parsed.Unix(), nil
-	}
-}
-
-func chtimesFormatFromFlags(cmd *cobra.Command) (chtimesTimeFormat, error) {
-	formatFlags := []struct {
-		flag   string
-		format chtimesTimeFormat
-	}{
-		{flag: "unix", format: chtimesTimeFormat{name: "unix", parse: chtimesParseUnixSeconds}},
-		{flag: "unix-ms", format: chtimesTimeFormat{name: "unix-ms", parse: chtimesParseUnixMillis}},
-		{flag: "rfc3339", format: chtimesTimeFormat{name: "rfc3339", parse: chtimesParseLayout(time.RFC3339)}},
-		{flag: "rfc1123", format: chtimesTimeFormat{name: "rfc1123", parse: chtimesParseLayout(time.RFC1123)}},
-	}
-
-	var selected *chtimesTimeFormat
-	selectedFlag := ""
-	for _, candidate := range formatFlags {
-		enabled, _ := cmd.Flags().GetBool(candidate.flag)
-		if !enabled {
-			continue
-		}
-		if selected != nil {
-			return chtimesTimeFormat{}, fmt.Errorf("only one time format flag can be used (--%s and --%s are both set)", selectedFlag, candidate.flag)
-		}
-		selected = &candidate.format
-		selectedFlag = candidate.flag
-	}
-
-	if selected == nil {
-		return chtimesTimeFormat{name: "datetime", parse: chtimesParseLayout(chtimesDefaultLayout)}, nil
-	}
-
-	return *selected, nil
-}
-
 // ChtimesCmd - Change the access and modified time of a file on the remote file system.
 func ChtimesCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 	session, beacon := con.ActiveTarget.GetInteractive()
 	if session == nil && beacon == nil {
 		return
 	}
+	// DateTime layout (https://pkg.go.dev/time)
+	layout := "2006-01-02 15:04:05"
 	filePath := args[0]
 
 	if filePath == "" {
@@ -108,35 +43,33 @@ func ChtimesCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
 		return
 	}
 
-	format, err := chtimesFormatFromFlags(cmd)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
 	atime := args[1]
+
 	if atime == "" {
 		con.PrintErrorf("Missing parameter: Last accessed time id\n")
 		return
 	}
 
-	unixAtime, err := format.parse(atime)
+	t_a, err := time.Parse(layout, atime)
 	if err != nil {
-		con.PrintErrorf("Invalid access time (%s): %s\n", format.name, err)
+		con.PrintErrorf("%s\n", err)
 		return
 	}
+	unixAtime := t_a.Unix()
 
 	mtime := args[2]
+
 	if mtime == "" {
 		con.PrintErrorf("Missing parameter: Last modified time id\n")
 		return
 	}
 
-	unixMtime, err := format.parse(mtime)
+	t_b, err := time.Parse(layout, mtime)
 	if err != nil {
-		con.PrintErrorf("Invalid modified time (%s): %s\n", format.name, err)
+		con.PrintErrorf("%s\n", err)
 		return
 	}
+	unixMtime := t_b.Unix()
 
 	chtimes, err := con.Rpc.Chtimes(context.Background(), &sliverpb.ChtimesReq{
 		Request: con.ActiveTarget.Request(cmd),

client/command/filesystem/commands.go

@@ -1,7 +1,6 @@
 package filesystem
 
 import (
-	"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/command/loot"
@@ -175,7 +174,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		carapace.ActionValues().Usage("path to the file or directory to download"),
 		carapace.ActionFiles().Usage("local path where the downloaded file will be saved (optional)"),
 	)
-	completers.RegisterLocalFilePathPositionalCompletion(downloadCmd, 1)
 
 	uploadCmd := &cobra.Command{
 		Use:   consts.UploadStr,
@@ -196,7 +194,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		carapace.ActionFiles().Usage("local path to the file to upload"),
 		carapace.ActionValues().Usage("path to the file or directory to upload to (optional)"),
 	)
-	completers.RegisterLocalFilePathPositionalCompletion(uploadCmd, 0)
 
 	memfilesCmd := &cobra.Command{
 		Use:     consts.MemfilesStr,

client/command/filesystem/grep.go

@@ -29,6 +29,7 @@ import (
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/proto"
 )
@@ -238,19 +239,19 @@ func printGrep(grep *sliverpb.Grep, searchPattern string, searchPath string, cmd
 // grepLineResult - Add color or formatting for results for console output
 func grepLineResult(positions []*sliverpb.GrepLinePosition, line string, colorize bool, allowFormatting bool) string {
 	var result string = ""
+	var matchOutput func(a ...interface{}) string
 	var previousPositionEnd int32 = 0
 
-	matchStyle := console.StyleNormal
 	if colorize {
-		matchStyle = console.StyleBoldRed
+		matchOutput = color.New(color.FgRed, color.Bold).SprintFunc()
 	} else if allowFormatting {
-		matchStyle = console.StyleBold
+		matchOutput = color.New(color.Bold).SprintFunc()
 	}
 
 	for idx, position := range positions {
 		if colorize || allowFormatting {
 			result += line[previousPositionEnd:position.Start]
-			result += matchStyle.Render(line[position.Start:position.End])
+			result += matchOutput(line[position.Start:position.End])
 			if idx == len(positions)-1 {
 				result += line[position.End:]
 			} else {

client/command/generate/canaries.go

@@ -42,20 +42,20 @@ func PrintCanaries(con *console.SliverClient, canaries []*clientpb.DNSCanary, bu
 		if burnedOnly && !canary.Triggered {
 			continue
 		}
-		lineStyle := console.StyleNormal
+		lineColor := console.Normal
 		if canary.Triggered {
-			lineStyle = console.StyleBoldRed
+			lineColor = console.Bold + console.Red
 		}
 		firstTrigger := "Never"
 		latestTrigger := "Never"
 		if canary.Triggered {
-			firstTrigger = lineStyle.Render(canary.FirstTriggered)
-			latestTrigger = lineStyle.Render(canary.LatestTrigger)
+			firstTrigger = fmt.Sprintf(lineColor+"%s"+console.Normal, canary.FirstTriggered)
+			latestTrigger = fmt.Sprintf(lineColor+"%s"+console.Normal, canary.LatestTrigger)
 		}
 		row := table.Row{
-			lineStyle.Render(canary.ImplantName),
-			lineStyle.Render(canary.Domain),
-			lineStyle.Render(fmt.Sprintf("%v", canary.Triggered)),
+			fmt.Sprintf(lineColor+"%s"+console.Normal, canary.ImplantName),
+			fmt.Sprintf(lineColor+"%s"+console.Normal, canary.Domain),
+			fmt.Sprintf(lineColor+"%v"+console.Normal, canary.Triggered),
 			firstTrigger,
 			latestTrigger,
 		}

client/command/generate/commands.go

@@ -1,12 +1,8 @@
 package generate
 
 import (
-	"strings"
-
-	"github.com/bishopfox/sliver/client/command/completers"
 	"github.com/bishopfox/sliver/client/command/flags"
 	"github.com/bishopfox/sliver/client/command/help"
-	shellcodeencoders "github.com/bishopfox/sliver/client/command/shellcode-encoders"
 	"github.com/bishopfox/sliver/client/console"
 	consts "github.com/bishopfox/sliver/client/constants"
 	"github.com/rsteube/carapace"
@@ -14,15 +10,6 @@ import (
 	"github.com/spf13/pflag"
 )
 
-const spoofMetadataLongHelp = `
-
-Spoof Metadata:
-  --spoof-metadata
-    Use metadata settings from <client app dir>/spoof-metadata.yaml.
-  --spoof-metadata /path/to/donor.exe
-    Use metadata from the specified donor file. The donor must match the target format/goos/goarch.
-`
-
 // Commands returns the “ command and its subcommands.
 func Commands(con *console.SliverClient) []*cobra.Command {
 	// [ Generate ] --------------------------------------------------------------
@@ -36,7 +23,7 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		GroupID: consts.PayloadsHelpGroup,
 	}
 	flags.Bind("generate", true, generateCmd, func(f *pflag.FlagSet) {
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
+		f.IntP("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
 	})
 
 	// Session flags and completions.
@@ -95,7 +82,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		f.BoolP("skip-tests", "s", false, "skip testing the traffic encoder (not recommended)")
 	})
 	carapace.Gen(trafficEncodersAddCmd).PositionalCompletion(carapace.ActionFiles("wasm").Tag("wasm files").Usage("local file path (expects .wasm)"))
-	completers.RegisterLocalFilePathPositionalCompletion(trafficEncodersAddCmd, 0)
 	trafficEncodersCmd.AddCommand(trafficEncodersAddCmd)
 
 	trafficEncodersRmCmd := &cobra.Command{
@@ -128,7 +114,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	flags.BindFlagCompletions(regenerateCmd, func(comp *carapace.ActionMap) {
 		(*comp)["save"] = carapace.ActionFiles().Tag("directory/file to save implant")
 	})
-	completers.RegisterLocalFilePathFlagCompletion(regenerateCmd, "save")
 	carapace.Gen(regenerateCmd).PositionalCompletion(ImplantBuildNameCompleter(con))
 
 	// [ Profiles ] --------------------------------------------------------------
@@ -157,15 +142,13 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 	}
 	flags.Bind("profiles", false, profilesGenerateCmd, func(f *pflag.FlagSet) {
 		f.StringP("save", "s", "", "directory/file to the binary to")
-		f.String("shellcode-encoder", "", "shellcode encoder to apply (optional; see `shellcode-encoders`)")
+		f.BoolP("disable-sgn", "G", false, "disable shikata ga nai shellcode encoder")
 		f.StringP("name", "n", "", "Implant name")
-		f.BoolP("external-builder", "E", false, "use an external builder")
+
 	})
 	flags.BindFlagCompletions(profilesGenerateCmd, func(comp *carapace.ActionMap) {
 		(*comp)["save"] = carapace.ActionFiles().Tag("directory/file to save implant")
-		(*comp)["shellcode-encoder"] = shellcodeencoders.ShellcodeEncoderNameCompleter(con)
 	})
-	completers.RegisterLocalFilePathFlagCompletion(profilesGenerateCmd, "save")
 	carapace.Gen(profilesGenerateCmd).PositionalCompletion(ProfileNameCompleter(con))
 	profilesCmd.AddCommand(profilesGenerateCmd)
 
@@ -197,7 +180,6 @@ func Commands(con *console.SliverClient) []*cobra.Command {
 		f.BoolP("prepend-size", "p", false, "Prepend stage size")
 		f.StringP("compress", "c", "", "Compress stage (zlib, gzip, deflate9 or deflate)")
 	})
-	completers.RegisterLocalFilePathFlagCompletion(profilesStageCmd, "save")
 
 	carapace.Gen(profilesStageCmd).PositionalCompletion(ProfileNameCompleter(con))
 	profilesCmd.AddCommand(profilesStageCmd)
@@ -326,7 +308,7 @@ func coreImplantFlags(name string, cmd *cobra.Command) {
 		f.StringP("debug-file", "O", "", "path to debug output")
 		f.BoolP("evasion", "e", false, "enable evasion features (e.g. overwrite user space hooks)")
 		f.BoolP("skip-symbols", "l", false, "skip symbol obfuscation")
-		f.String("shellcode-encoder", "", "shellcode encoder to apply (optional; see `shellcode-encoders`)")
+		f.BoolP("disable-sgn", "G", false, "disable shikata ga nai shellcode encoder")
 		f.StringP("exports", "v", "StartW,VoidFunc,DllInstall,DllRegisterServer,DllUnregisterServer", "comma separated list of exports to include in the binary")
 		f.StringP("canary", "c", "", "canary domain(s)")
 
@@ -340,13 +322,6 @@ func coreImplantFlags(name string, cmd *cobra.Command) {
 
 		f.Uint32P("key-exchange", "X", DefaultWGKeyExPort, "wg key-exchange port")
 		f.Uint32P("tcp-comms", "T", DefaultWGNPort, "wg c2 comms port")
-		f.Bool("include-mtls", false, "force include mtls transport")
-		f.Bool("include-http", false, "force include http transport")
-		f.Bool("include-wg", false, "force include wireguard transport")
-		f.Bool("include-dns", false, "force include dns transport")
-		f.Bool("include-named-pipe", false, "force include named-pipe transport")
-		f.Bool("include-tcp-pivot", false, "force include tcp-pivot transport")
-		f.Bool("all-protocols", false, "force include all transport protocols")
 
 		f.BoolP("run-at-load", "R", false, "run the implant entrypoint from DllMain/Constructor (shared library only)")
 		f.BoolP("netgo", "q", false, "force the use of netgo")
@@ -365,75 +340,9 @@ func coreImplantFlags(name string, cmd *cobra.Command) {
 		f.StringP("limit-hostname", "z", "", "limit execution to specified hostname")
 		f.StringP("limit-fileexists", "F", "", "limit execution to hosts with this file in the filesystem")
 		f.StringP("limit-locale", "L", "", "limit execution to hosts that match this locale")
-		bindSpoofMetadataFlag(f)
 
-		f.StringP("format", "f", "exe", "Specifies the output formats, valid values are: 'exe', 'shared' (for dynamic libraries), 'archive' (for Go c-archives), 'service' (see: `psexec` for more info) and 'shellcode' (windows, darwin/arm64, linux/amd64, linux/arm64)")
-
-		// Shellcode generation options:
-		// - Windows: Donut
-		// - macOS: beignet
-		// - Linux: malasada
-		f.Uint32("shellcode-entropy", 1, "Shellcode entropy (Donut: 1=none, 2=random names, 3=random+encrypt) (windows shellcode only)")
-		f.Bool("shellcode-compress", false, "Enable shellcode compression (aPLib) (windows, macOS, and Linux shellcode)")
-		f.Uint32("shellcode-exitopt", 1, "Shellcode exit option (Donut: 1=exit thread, 2=exit process, 3=block) (windows shellcode only)")
-		f.Uint32("shellcode-bypass", 3, "Shellcode bypass mode (Donut: 1=none, 2=abort, 3=continue) (windows shellcode only)")
-		f.Uint32("shellcode-headers", 1, "Shellcode headers handling (Donut: 1=overwrite, 2=keep) (windows shellcode only)")
-		f.Bool("shellcode-thread", false, "Run unmanaged EXE entrypoint as a new thread (Donut) (windows shellcode only)")
-		f.Bool("shellcode-unicode", false, "Use Unicode command line for unmanaged DLL entrypoints (Donut) (windows shellcode only)")
-		f.Uint32("shellcode-oep", 0, "Override original entry point (OEP) (Donut) (windows shellcode only)")
-
-		// Backwards-compatible deprecated Donut flags (hidden).
-		f.Uint32("donut-entropy", 1, "Deprecated (use --shellcode-entropy)")
-		_ = f.MarkDeprecated("donut-entropy", "use --shellcode-entropy")
-		_ = f.MarkHidden("donut-entropy")
-		f.Bool("donut-compress", false, "Deprecated (use --shellcode-compress)")
-		_ = f.MarkDeprecated("donut-compress", "use --shellcode-compress")
-		_ = f.MarkHidden("donut-compress")
-		f.Uint32("donut-exitopt", 1, "Deprecated (use --shellcode-exitopt)")
-		_ = f.MarkDeprecated("donut-exitopt", "use --shellcode-exitopt")
-		_ = f.MarkHidden("donut-exitopt")
-		f.Uint32("donut-bypass", 3, "Deprecated (use --shellcode-bypass)")
-		_ = f.MarkDeprecated("donut-bypass", "use --shellcode-bypass")
-		_ = f.MarkHidden("donut-bypass")
-		f.Uint32("donut-headers", 1, "Deprecated (use --shellcode-headers)")
-		_ = f.MarkDeprecated("donut-headers", "use --shellcode-headers")
-		_ = f.MarkHidden("donut-headers")
-		f.Bool("donut-thread", false, "Deprecated (use --shellcode-thread)")
-		_ = f.MarkDeprecated("donut-thread", "use --shellcode-thread")
-		_ = f.MarkHidden("donut-thread")
-		f.Bool("donut-unicode", false, "Deprecated (use --shellcode-unicode)")
-		_ = f.MarkDeprecated("donut-unicode", "use --shellcode-unicode")
-		_ = f.MarkHidden("donut-unicode")
-		f.Uint32("donut-oep", 0, "Deprecated (use --shellcode-oep)")
-		_ = f.MarkDeprecated("donut-oep", "use --shellcode-oep")
-		_ = f.MarkHidden("donut-oep")
+		f.StringP("format", "f", "exe", "Specifies the output formats, valid values are: 'exe', 'shared' (for dynamic libraries), 'service' (see: `psexec` for more info) and 'shellcode' (windows only)")
 	})
-	appendSpoofMetadataLongHelp(cmd)
-}
-
-func bindSpoofMetadataFlag(f *pflag.FlagSet) {
-	if f == nil {
-		return
-	}
-	spoofMetadataFlag := f.VarPF(newSpoofMetadataFlagValue(), spoofMetadataFlagName, "", "spoof executable metadata (optional donor path)")
-	if spoofMetadataFlag != nil {
-		spoofMetadataFlag.NoOptDefVal = "true"
-	}
-}
-
-func appendSpoofMetadataLongHelp(cmd *cobra.Command) {
-	if cmd == nil {
-		return
-	}
-	if strings.Contains(cmd.Long, "--spoof-metadata") {
-		return
-	}
-	trimmed := strings.TrimRight(cmd.Long, "\n")
-	if trimmed == "" {
-		cmd.Long = strings.TrimLeft(spoofMetadataLongHelp, "\n")
-		return
-	}
-	cmd.Long = trimmed + spoofMetadataLongHelp
 }
 
 // coreImplantFlagCompletions binds completions to flags registered in coreImplantFlags.
@@ -444,13 +353,10 @@ func coreImplantFlagCompletions(cmd *cobra.Command, con *console.SliverClient) {
 		(*comp)["arch"] = ArchCompleter(con)
 		(*comp)["strategy"] = carapace.ActionValuesDescribed([]string{"r", "random", "rd", "random domain", "s", "sequential"}...).Tag("C2 strategy")
 		(*comp)["format"] = FormatCompleter()
-		(*comp)["save"] = completers.LocalFilePathCompleter().Tag("directory/file to save implant")
-		(*comp)[spoofMetadataFlagName] = carapace.ActionFiles().Tag("optional donor metadata file")
-		(*comp)["shellcode-encoder"] = shellcodeencoders.ShellcodeEncoderNameCompleter(con)
+		(*comp)["save"] = carapace.ActionFiles().Tag("directory/file to save implant")
 		(*comp)["traffic-encoders"] = TrafficEncodersCompleter(con).UniqueList(",")
 		(*comp)["c2profile"] = HTTPC2Completer(con)
 	})
-	completers.RegisterLocalFilePathFlagCompletions(cmd, "save", "debug-file", spoofMetadataFlagName)
 	registerImplantTargetFlagCompletions(cmd, con)
 }
 

client/command/generate/commands_test.go

@@ -1,75 +0,0 @@
-package generate
-
-import (
-	"testing"
-
-	"github.com/bishopfox/sliver/client/console"
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/spf13/cobra"
-)
-
-func TestGenerateSaveFlagCompletionRegistered(t *testing.T) {
-	cmds := Commands(&console.SliverClient{})
-
-	generateCmd := commandByUse(cmds, consts.GenerateStr)
-	if generateCmd == nil {
-		t.Fatalf("missing %q command", consts.GenerateStr)
-	}
-	assertFlagHasDefaultFileCompletion(t, generateCmd, "save")
-
-	beaconCmd := commandByUse(generateCmd.Commands(), consts.BeaconStr)
-	if beaconCmd == nil {
-		t.Fatalf("missing %q subcommand", consts.BeaconStr)
-	}
-	assertFlagHasDefaultFileCompletion(t, beaconCmd, "save")
-}
-
-func TestProfilesGenerateExternalBuilderFlagRegistered(t *testing.T) {
-	cmds := Commands(&console.SliverClient{})
-
-	profilesCmd := commandByUse(cmds, consts.ProfilesStr)
-	if profilesCmd == nil {
-		t.Fatalf("missing %q command", consts.ProfilesStr)
-	}
-	profilesGenerateCmd := commandByUse(profilesCmd.Commands(), consts.GenerateStr)
-	if profilesGenerateCmd == nil {
-		t.Fatalf("missing %q subcommand under %q", consts.GenerateStr, consts.ProfilesStr)
-	}
-
-	flag := profilesGenerateCmd.Flags().Lookup("external-builder")
-	if flag == nil {
-		t.Fatalf("%q missing %q flag", profilesGenerateCmd.Use, "external-builder")
-	}
-	if flag.Shorthand != "E" {
-		t.Fatalf("%q %q flag shorthand mismatch: got=%q want=%q", profilesGenerateCmd.Use, "external-builder", flag.Shorthand, "E")
-	}
-	if flag.DefValue != "false" {
-		t.Fatalf("%q %q flag default mismatch: got=%q want=%q", profilesGenerateCmd.Use, "external-builder", flag.DefValue, "false")
-	}
-}
-
-func assertFlagHasDefaultFileCompletion(t *testing.T, cmd *cobra.Command, flag string) {
-	t.Helper()
-
-	completionFn, ok := cmd.GetFlagCompletionFunc(flag)
-	if !ok {
-		t.Fatalf("%q missing %q flag completion func", cmd.Use, flag)
-	}
-
-	values, directive := completionFn(cmd, nil, "")
-	if len(values) != 0 {
-		t.Fatalf("%q %q completion should return no explicit values, got %d", cmd.Use, flag, len(values))
-	}
-	if directive != cobra.ShellCompDirectiveDefault {
-		t.Fatalf("%q %q completion directive mismatch: got=%v want=%v", cmd.Use, flag, directive, cobra.ShellCompDirectiveDefault)
-	}
-}
-
-func commandByUse(cmds []*cobra.Command, use string) *cobra.Command {
-	for _, cmd := range cmds {
-		if cmd.Use == use {
-			return cmd
-		}
-	}
-	return nil
-}

client/command/generate/generate-beacon.go

@@ -41,13 +41,8 @@ func GenerateBeaconCmd(cmd *cobra.Command, con *console.SliverClient, args []str
 	if config == nil {
 		return
 	}
-	spoofMetadata, err := parseSpoofMetadataFlag(cmd, config)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
 	config.IsBeacon = true
-	err = parseBeaconFlags(cmd, config)
+	err := parseBeaconFlags(cmd, config)
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
@@ -57,9 +52,9 @@ func GenerateBeaconCmd(cmd *cobra.Command, con *console.SliverClient, args []str
 		save, _ = os.Getwd()
 	}
 	if external, _ := cmd.Flags().GetBool("external-builder"); !external {
-		compile(name, config, spoofMetadata, save, con)
+		compile(name, config, save, con)
 	} else {
-		externalBuild(name, config, spoofMetadata, save, con)
+		externalBuild(name, config, save, con)
 	}
 }
 

client/command/generate/generate-info.go

@@ -15,19 +15,19 @@ func GenerateInfoCmd(cmd *cobra.Command, con *console.SliverClient, args []strin
 		con.PrintErrorf("Failed to get compiler information: %s\n", err)
 		return
 	}
-	con.Printf("%s %s/%s\n", console.StyleBold.Render("Server:"), compiler.GOOS, compiler.GOARCH)
+	con.Printf("%sServer:%s %s/%s\n", console.Bold, console.Normal, compiler.GOOS, compiler.GOARCH)
 	con.Println()
-	con.Printf("%s\n", console.StyleBold.Render("Cross Compilers"))
+	con.Printf("%sCross Compilers%s\n", console.Bold, console.Normal)
 	for _, cc := range compiler.CrossCompilers {
 		con.Printf("%s/%s - %s\n", cc.TargetGOOS, cc.TargetGOARCH, cc.GetCCPath())
 	}
 	con.Println()
-	con.Printf("%s\n", console.StyleBold.Render("Supported Targets"))
+	con.Printf("%sSupported Targets%s\n", console.Bold, console.Normal)
 	for _, target := range compiler.Targets {
 		con.Printf("%s/%s - %s\n", target.GOOS, target.GOARCH, nameOfOutputFormat(target.Format))
 	}
 	con.Println()
-	con.Printf("%s\n", console.StyleBold.Render("Default Builds Only"))
+	con.Printf("%sDefault Builds Only%s\n", console.Bold, console.Normal)
 	for _, target := range compiler.UnsupportedTargets {
 		con.Printf("%s/%s - %s\n", target.GOOS, target.GOARCH, nameOfOutputFormat(target.Format))
 	}

client/command/generate/helpers.go

@@ -2,7 +2,6 @@ package generate
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 
@@ -31,49 +30,19 @@ func GetSliverBinary(profile *clientpb.ImplantProfile, con *console.SliverClient
 	}
 	data = generated.GetFile().GetData()
 
-	if profile.Config.Format == clientpb.OutputFormat_SHELLCODE {
-		encoder := profile.Config.ShellcodeEncoder
-		legacySGN := false
-		if encoder == clientpb.ShellcodeEncoder_NONE && profile.Config.SGNEnabled {
-			encoder = clientpb.ShellcodeEncoder_SHIKATA_GA_NAI
-			legacySGN = true
-		}
-		if encoder != clientpb.ShellcodeEncoder_NONE {
-			encoderName := map[clientpb.ShellcodeEncoder]string{
-				clientpb.ShellcodeEncoder_SHIKATA_GA_NAI: "shikata_ga_nai",
-				clientpb.ShellcodeEncoder_XOR:            "xor",
-				clientpb.ShellcodeEncoder_XOR_DYNAMIC:    "xor_dynamic",
-			}[encoder]
-			if encoderName == "" {
-				return nil, fmt.Errorf("unknown shellcode encoder enum %d", int32(encoder))
-			}
-
-			encoderMap, err := fetchShellcodeEncoderMap(con)
-			if err != nil {
-				return nil, err
-			}
-			if _, ok := shellcodeEncoderEnumForArch(encoderMap, profile.Config.GOARCH, encoderName); !ok {
-				msg := fmt.Sprintf("shellcode encoder %q is not supported for arch %s", encoderName, normalizeShellcodeArch(profile.Config.GOARCH))
-				if legacySGN {
-					con.PrintWarnf("%s, skipping.\n", msg)
-				} else {
-					return nil, errors.New(msg)
-				}
-			} else {
-				encodeResp, err := con.Rpc.ShellcodeEncoder(context.Background(), &clientpb.ShellcodeEncodeReq{
-					Encoder:      encoder,
-					Architecture: profile.Config.GOARCH,
-					Iterations:   1,
-					BadChars:     []byte{},
-					Data:         data,
-				})
-				if err != nil {
-					con.PrintErrorf("Error encoding shellcode")
-					return nil, err
-				}
-				data = encodeResp.Data
-			}
+	if profile.Config.Format == clientpb.OutputFormat_SHELLCODE && profile.Config.SGNEnabled {
+		encodeResp, err := con.Rpc.ShellcodeEncoder(context.Background(), &clientpb.ShellcodeEncodeReq{
+			Encoder:      clientpb.ShellcodeEncoder_SHIKATA_GA_NAI,
+			Architecture: profile.Config.GOARCH,
+			Iterations:   1,
+			BadChars:     []byte{},
+			Data:         data,
+		})
+		if err != nil {
+			con.PrintErrorf("Error encoding shellcode")
+			return nil, err
 		}
+		data = encodeResp.Data
 	}
 
 	_, err = con.Rpc.SaveImplantProfile(context.Background(), profile)
@@ -197,7 +166,7 @@ func OSCompleter(con *console.SliverClient) carapace.Action {
 func FormatCompleter() carapace.Action {
 	return carapace.ActionCallback(func(_ carapace.Context) carapace.Action {
 		return carapace.ActionValues([]string{
-			"exe", "shared", "archive", "service", "shellcode",
+			"exe", "shared", "service", "shellcode",
 		}...).Tag("implant format")
 	})
 }

client/command/generate/output_format_test.go

@@ -1,13 +0,0 @@
-package generate
-
-import (
-	"testing"
-
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-)
-
-func TestNameOfOutputFormatGoArchive(t *testing.T) {
-	if got := nameOfOutputFormat(clientpb.OutputFormat_GO_ARCHIVE); got != "Go Archive" {
-		t.Fatalf("nameOfOutputFormat(GO_ARCHIVE) = %q, want %q", got, "Go Archive")
-	}
-}

client/command/generate/profiles-generate.go

@@ -19,12 +19,9 @@ package generate
 */
 
 import (
-	"fmt"
 	"os"
-	"strings"
 
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/spf13/cobra"
 )
 
@@ -47,62 +44,13 @@ func ProfilesGenerateCmd(cmd *cobra.Command, con *console.SliverClient, args []s
 	}
 	profile := GetImplantProfileByName(name, con)
 	if profile != nil {
-		// Override shellcode encoder if explicitly requested.
-		if cmd.Flags().Changed("shellcode-encoder") {
-			rawEncoder, _ := cmd.Flags().GetString("shellcode-encoder")
-			rawEncoder = strings.TrimSpace(rawEncoder)
-			if rawEncoder == "" {
-				con.PrintErrorf("shellcode-encoder cannot be empty; use 'none' to disable encoding\n")
-				return
-			}
-
-			normalized := normalizeShellcodeEncoderName(rawEncoder)
-			if normalized == "none" {
-				profile.Config.ShellcodeEncoder = clientpb.ShellcodeEncoder_NONE
-				profile.Config.SGNEnabled = false
-			} else if profile.Config.Format != clientpb.OutputFormat_SHELLCODE {
-				con.PrintWarnf("Shellcode encoder only applies when using `--format shellcode`, ignoring.\n")
-			} else {
-				encoderMap, err := fetchShellcodeEncoderMap(con)
-				if err != nil {
-					con.PrintErrorf("Failed to fetch shellcode encoders: %s\n", err)
-					return
-				}
-				encoder, ok := shellcodeEncoderEnumForArch(encoderMap, profile.Config.GOARCH, rawEncoder)
-				if !ok {
-					compatible := compatibleShellcodeEncoderNames(encoderMap, profile.Config.GOARCH)
-					if len(compatible) == 0 {
-						con.PrintErrorf("No shellcode encoders are available for arch %s\n", normalizeShellcodeArch(profile.Config.GOARCH))
-					} else {
-						con.PrintErrorf("Unsupported shellcode encoder %q for arch %s (valid: %s)\n", rawEncoder, normalizeShellcodeArch(profile.Config.GOARCH), strings.Join(compatible, ", "))
-					}
-					return
-				}
-				profile.Config.ShellcodeEncoder = encoder
-				profile.Config.SGNEnabled = encoder == clientpb.ShellcodeEncoder_SHIKATA_GA_NAI
-			}
+		// If SGN is explicitly disabled, make sure this compilation reflects that despite whatever is set in the profile
+		if SGNDisabled, _ := cmd.Flags().GetBool("disable-sgn"); SGNDisabled {
+			profile.Config.SGNEnabled = !SGNDisabled
 		}
-		if external, _ := cmd.Flags().GetBool("external-builder"); !external {
-			_, err := compile(implantName, profile.Config, nil, save, con)
-			if err != nil {
-				return
-			}
-		} else {
-			_, err := externalBuild(implantName, profile.Config, nil, save, con)
-			if err != nil {
-				switch err {
-				case ErrNoExternalBuilder:
-					con.PrintErrorf("There are no external builders currently connected to the server\n")
-					con.PrintErrorf("See 'builders' command for more information\n")
-				case ErrNoValidBuilders:
-					con.PrintErrorf("There are external builders connected to the server, but none can build the target you specified\n")
-					con.PrintErrorf("Invalid target %s\n", fmt.Sprintf("%s:%s/%s", profile.Config.Format, profile.Config.GOOS, profile.Config.GOARCH))
-					con.PrintErrorf("See 'builders' command for more information\n")
-				default:
-					con.PrintErrorf("%s\n", err)
-				}
-				return
-			}
+		_, err := compile(implantName, profile.Config, save, con)
+		if err != nil {
+			return
 		}
 	} else {
 		con.PrintErrorf("No profile with name '%s'", name)

client/command/generate/profiles.go

@@ -165,21 +165,10 @@ func populateProfileProperties(config *clientpb.ImplantConfig) map[string]string
 		properties["obsymbols"] = "disabled"
 	}
 
-	properties["shellcodeencoder"] = "n/a"
-	if config.Format == clientpb.OutputFormat_SHELLCODE {
-		encoder := config.ShellcodeEncoder
-		if encoder == clientpb.ShellcodeEncoder_NONE && config.SGNEnabled {
-			encoder = clientpb.ShellcodeEncoder_SHIKATA_GA_NAI
-		}
-		properties["shellcodeencoder"] = map[clientpb.ShellcodeEncoder]string{
-			clientpb.ShellcodeEncoder_NONE:           "none",
-			clientpb.ShellcodeEncoder_SHIKATA_GA_NAI: "shikata_ga_nai",
-			clientpb.ShellcodeEncoder_XOR:            "xor",
-			clientpb.ShellcodeEncoder_XOR_DYNAMIC:    "xor_dynamic",
-		}[encoder]
-		if properties["shellcodeencoder"] == "" {
-			properties["shellcodeencoder"] = fmt.Sprintf("unknown (%d)", int32(encoder))
-		}
+	if config.SGNEnabled {
+		properties["sgn"] = "enabled"
+	} else {
+		properties["sgn"] = "disabled"
 	}
 
 	reconnect := int(config.ReconnectInterval / int64(math.Pow10(9)))
@@ -263,8 +252,6 @@ func populateProfileProperties(config *clientpb.ImplantConfig) map[string]string
 		properties["format"] = "Executable"
 	case clientpb.OutputFormat_SHARED_LIB:
 		properties["format"] = "Shared Library"
-	case clientpb.OutputFormat_GO_ARCHIVE:
-		properties["format"] = "Go Archive"
 	case clientpb.OutputFormat_SERVICE:
 		properties["format"] = "Service"
 	case clientpb.OutputFormat_SHELLCODE:
@@ -324,8 +311,8 @@ func PrintProfileInfo(name string, con *console.SliverClient) {
 		properties["obsymbols"],
 	})
 	tw.AppendRow(table.Row{
-		"Shellcode encoder is",
-		properties["shellcodeencoder"],
+		"Shikata Ga Nai (SGN) is",
+		properties["sgn"],
 	})
 
 	con.PrintInfof("Obfuscation\n")

client/command/generate/spoof_metadata_flag_test.go

@@ -1,193 +0,0 @@
-package generate
-
-import (
-	"encoding/base64"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/spf13/cobra"
-)
-
-func TestParseSpoofMetadataFlagDefaultOff(t *testing.T) {
-	cmd := newSpoofMetadataTestCommand(t)
-	config := &clientpb.ImplantConfig{
-		GOOS:   "windows",
-		GOARCH: "amd64",
-		Format: clientpb.OutputFormat_EXECUTABLE,
-	}
-
-	spoofMetadata, err := parseSpoofMetadataFlag(cmd, config)
-	if err != nil {
-		t.Fatalf("parseSpoofMetadataFlag() unexpected error: %v", err)
-	}
-	if spoofMetadata != nil {
-		t.Fatal("expected spoof metadata to be nil when flag is not set")
-	}
-}
-
-func TestParseSpoofMetadataFlagNoArgUsesConfig(t *testing.T) {
-	t.Setenv("SLIVER_CLIENT_ROOT_DIR", t.TempDir())
-	cmd := newSpoofMetadataTestCommand(t)
-	if err := cmd.ParseFlags([]string{"--" + spoofMetadataFlagName}); err != nil {
-		t.Fatalf("ParseFlags() error: %v", err)
-	}
-	rootDir := os.Getenv("SLIVER_CLIENT_ROOT_DIR")
-	configPath := filepath.Join(rootDir, "spoof-metadata.yaml")
-	sourceData := []byte{0x01, 0x02, 0x03}
-	configData := "pe:\n  source:\n    name: donor.exe\n    base64: " + base64.StdEncoding.EncodeToString(sourceData) + "\n"
-	if err := os.WriteFile(configPath, []byte(configData), 0o600); err != nil {
-		t.Fatalf("write spoof metadata config: %v", err)
-	}
-
-	config := &clientpb.ImplantConfig{
-		GOOS:   "windows",
-		GOARCH: "amd64",
-		Format: clientpb.OutputFormat_EXECUTABLE,
-	}
-	spoofMetadata, err := parseSpoofMetadataFlag(cmd, config)
-	if err != nil {
-		t.Fatalf("parseSpoofMetadataFlag() unexpected error: %v", err)
-	}
-	if spoofMetadata == nil || spoofMetadata.GetPE() == nil || spoofMetadata.GetPE().GetSource() == nil {
-		t.Fatal("expected spoof metadata source from config file")
-	}
-	if got := spoofMetadata.GetPE().GetSource().GetData(); string(got) != string(sourceData) {
-		t.Fatalf("source data mismatch: got=%x want=%x", got, sourceData)
-	}
-}
-
-func TestParseSpoofMetadataFlagPathFromPositionalArg(t *testing.T) {
-	cmd := newSpoofMetadataTestCommand(t)
-	sourcePath := goPEFixturePath(t, "gcc-amd64-mingw-exec")
-	if err := cmd.ParseFlags([]string{"--" + spoofMetadataFlagName, sourcePath}); err != nil {
-		t.Fatalf("ParseFlags() error: %v", err)
-	}
-
-	config := &clientpb.ImplantConfig{
-		GOOS:   "windows",
-		GOARCH: "amd64",
-		Format: clientpb.OutputFormat_EXECUTABLE,
-	}
-	spoofMetadata, err := parseSpoofMetadataFlag(cmd, config)
-	if err != nil {
-		t.Fatalf("parseSpoofMetadataFlag() unexpected error: %v", err)
-	}
-	if spoofMetadata == nil || spoofMetadata.GetPE() == nil || spoofMetadata.GetPE().GetSource() == nil {
-		t.Fatal("expected spoof metadata source from positional path")
-	}
-	if spoofMetadata.GetPE().GetSource().GetName() != filepath.Base(sourcePath) {
-		t.Fatalf("source name mismatch: got=%q want=%q", spoofMetadata.GetPE().GetSource().GetName(), filepath.Base(sourcePath))
-	}
-}
-
-func TestParseSpoofMetadataFlagPathRejectsNonWindowsTarget(t *testing.T) {
-	cmd := newSpoofMetadataTestCommand(t)
-	sourcePath := writeTempFile(t, "not-pe.bin", []byte("abc"))
-	if err := cmd.Flags().Set(spoofMetadataFlagName, sourcePath); err != nil {
-		t.Fatalf("set flag: %v", err)
-	}
-
-	config := &clientpb.ImplantConfig{
-		GOOS:   "linux",
-		GOARCH: "amd64",
-		Format: clientpb.OutputFormat_EXECUTABLE,
-	}
-	_, err := parseSpoofMetadataFlag(cmd, config)
-	if err == nil {
-		t.Fatal("expected error for non-windows target")
-	}
-	if !strings.Contains(err.Error(), "supports only windows PE targets") {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestParseSpoofMetadataFlagPathChecksMachine(t *testing.T) {
-	cmd := newSpoofMetadataTestCommand(t)
-	sourcePath := goPEFixturePath(t, "gcc-386-mingw-exec")
-	if err := cmd.Flags().Set(spoofMetadataFlagName, sourcePath); err != nil {
-		t.Fatalf("set flag: %v", err)
-	}
-
-	config := &clientpb.ImplantConfig{
-		GOOS:   "windows",
-		GOARCH: "amd64",
-		Format: clientpb.OutputFormat_EXECUTABLE,
-	}
-	_, err := parseSpoofMetadataFlag(cmd, config)
-	if err == nil {
-		t.Fatal("expected machine mismatch error")
-	}
-	if !strings.Contains(err.Error(), "expected amd64") {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestParseSpoofMetadataFlagPathSuccess(t *testing.T) {
-	cmd := newSpoofMetadataTestCommand(t)
-	sourcePath := goPEFixturePath(t, "gcc-amd64-mingw-exec")
-	if err := cmd.Flags().Set(spoofMetadataFlagName, sourcePath); err != nil {
-		t.Fatalf("set flag: %v", err)
-	}
-
-	config := &clientpb.ImplantConfig{
-		GOOS:   "windows",
-		GOARCH: "amd64",
-		Format: clientpb.OutputFormat_EXECUTABLE,
-	}
-	spoofMetadata, err := parseSpoofMetadataFlag(cmd, config)
-	if err != nil {
-		t.Fatalf("parseSpoofMetadataFlag() unexpected error: %v", err)
-	}
-	if spoofMetadata == nil || spoofMetadata.GetPE() == nil || spoofMetadata.GetPE().GetSource() == nil {
-		t.Fatal("expected spoof metadata source from path")
-	}
-	if spoofMetadata.GetPE().GetSource().GetName() != filepath.Base(sourcePath) {
-		t.Fatalf("source name mismatch: got=%q want=%q", spoofMetadata.GetPE().GetSource().GetName(), filepath.Base(sourcePath))
-	}
-	if len(spoofMetadata.GetPE().GetSource().GetData()) == 0 {
-		t.Fatal("expected non-empty source data")
-	}
-}
-
-func TestSpoofMetadataFlagUsageIsClean(t *testing.T) {
-	cmd := newSpoofMetadataTestCommand(t)
-	usage := cmd.Flags().FlagUsages()
-	if !strings.Contains(usage, "--"+spoofMetadataFlagName) {
-		t.Fatalf("expected usage to include spoof metadata flag, got: %s", usage)
-	}
-	if strings.Contains(usage, "string[=") {
-		t.Fatalf("unexpected optional-string marker in usage: %s", usage)
-	}
-	if strings.Contains(usage, `[="`) {
-		t.Fatalf("unexpected no-opt default rendering in usage: %s", usage)
-	}
-}
-
-func newSpoofMetadataTestCommand(t *testing.T) *cobra.Command {
-	t.Helper()
-	cmd := &cobra.Command{Use: "test"}
-	bindSpoofMetadataFlag(cmd.Flags())
-	return cmd
-}
-
-func writeTempFile(t *testing.T, name string, data []byte) string {
-	t.Helper()
-	path := filepath.Join(t.TempDir(), name)
-	if err := os.WriteFile(path, data, 0o600); err != nil {
-		t.Fatalf("write temp file: %v", err)
-	}
-	return path
-}
-
-func goPEFixturePath(t *testing.T, fixtureName string) string {
-	t.Helper()
-	fixturePath := filepath.Join(runtime.GOROOT(), "src", "debug", "pe", "testdata", fixtureName)
-	if _, err := os.Stat(fixturePath); err != nil {
-		t.Skipf("missing PE fixture %s: %v", fixturePath, err)
-	}
-	return fixturePath
-}

client/command/generate/spoof_metadata_flag_value.go

@@ -1,36 +0,0 @@
-package generate
-
-import "strings"
-
-type spoofMetadataFlagValue struct {
-	value string
-}
-
-func newSpoofMetadataFlagValue() *spoofMetadataFlagValue {
-	return &spoofMetadataFlagValue{}
-}
-
-func (s *spoofMetadataFlagValue) Set(value string) error {
-	value = strings.TrimSpace(value)
-	switch strings.ToLower(value) {
-	case "", "true":
-		s.value = "true"
-	case "false":
-		s.value = "false"
-	default:
-		s.value = value
-	}
-	return nil
-}
-
-func (s *spoofMetadataFlagValue) String() string {
-	return s.value
-}
-
-func (s *spoofMetadataFlagValue) Type() string {
-	return "bool"
-}
-
-func (s *spoofMetadataFlagValue) IsBoolFlag() bool {
-	return true
-}

client/command/generate/traffic-encoders.go

@@ -71,7 +71,7 @@ func DisplayTrafficEncoders(encoderMap *clientpb.TrafficEncoderMap, con *console
 		allIDs = append(allIDs, encoder.ID)
 		name := encoder.Wasm.Name
 		if isDuplicate {
-			name = console.StyleBoldRed.Render(fmt.Sprintf("%s (duplicate id)", name))
+			name = fmt.Sprintf(console.Bold+console.Red+"%s (duplicate id)"+console.Normal, name)
 		}
 		tw.AppendRow(table.Row{
 			encoder.ID,
@@ -212,9 +212,9 @@ func displayTrafficEncoderTests(running bool, tests *clientpb.TrafficEncoderTest
 	for _, test := range tests.Tests {
 		var success string
 		if test.Success {
-			success = console.StyleBoldGreen.Render("Passed")
+			success = console.Bold + console.Green + "Passed" + console.Normal
 		} else {
-			success = console.StyleBoldRed.Render("Failed!")
+			success = console.Bold + console.Red + "Failed!" + console.Normal
 		}
 		errorMsg := "N/A"
 		if test.Err != "" {
@@ -234,7 +234,7 @@ func displayTrafficEncoderTests(running bool, tests *clientpb.TrafficEncoderTest
 	if running {
 		con.Println()
 		con.Println()
-		con.Printf("%s\r", console.StyleBold.Render(fmt.Sprintf("  >>> Running test %d of %d please wait ...", len(tests.Tests), tests.TotalTests)))
+		con.Printf(console.Bold+"  >>> Running test %d of %d please wait ...\r"+console.Normal, len(tests.Tests), tests.TotalTests)
 		lineCount += 2
 	}
 

client/command/help/long-help.go

@@ -23,13 +23,12 @@ package help
 */
 
 import (
+	"bytes"
 	"fmt"
-	"image/color"
 	"strings"
+	"text/template"
 
-	"charm.land/lipgloss/v2"
 	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/bishopfox/sliver/client/theme"
 )
 
 const (
@@ -48,48 +47,38 @@ var (
 		consts.GenerateStr:      generateHelp,
 		consts.StageListenerStr: stageListenerHelp,
 
-		consts.MsfStr:         msfHelp,
-		consts.MsfInjectStr:   msfInjectHelp,
-		consts.PsStr:          psHelp,
-		consts.PingStr:        pingHelp,
-		consts.KillStr:        killHelp,
-		consts.LsStr:          lsHelp,
-		consts.CdStr:          cdHelp,
-		consts.PwdStr:         pwdHelp,
-		consts.AIStr:          aiHelp,
-		consts.AIConfigStr:    aiConfigHelp,
-		consts.DocsStr:        docsHelp,
-		consts.CatStr:         catHelp,
-		consts.EditStr:        editHelp,
-		consts.HexEditStr:     hexEditHelp,
-		consts.DownloadStr:    downloadHelp,
-		consts.GrepStr:        grepHelp,
-		consts.HeadStr:        headHelp,
-		consts.TailStr:        tailHelp,
-		consts.UploadStr:      uploadHelp,
-		consts.MkdirStr:       mkdirHelp,
-		consts.RmStr:          rmHelp,
-		consts.ChtimesStr:     chtimesHelp,
-		consts.ProcdumpStr:    procdumpHelp,
-		consts.ElevateStr:     elevateHelp,
-		consts.RunAsStr:       runAsHelp,
-		consts.ImpersonateStr: impersonateHelp,
-		consts.RevToSelfStr:   revToSelfHelp,
-		consts.ExecuteStr:     executeHelp,
-		consts.ExecuteStr + sep + consts.ExecuteChildrenStr: executeChildrenHelp,
-		consts.ExecuteAssemblyStr:                           executeAssemblyHelp,
-		consts.ExecuteShellcodeStr:                          executeShellcodeHelp,
-		consts.MigrateStr:                                   migrateHelp,
-		consts.SideloadStr:                                  sideloadHelp,
-		consts.TerminateStr:                                 terminateHelp,
-		consts.AliasesStr:                                   loadAliasHelp,
-		consts.PsExecStr:                                    psExecHelp,
-		consts.BackdoorStr:                                  backdoorHelp,
-		consts.SpawnDllStr:                                  spawnDllHelp,
-		consts.MountStr:                                     mountHelp,
-		consts.ShikataGaNai:                                 shikataGaNaiHelp,
-		consts.ShellcodeEncodersStr:                         shellcodeEncodersHelp,
-		consts.ShellcodeEncodersStr + sep + "encode":        shellcodeEncodersEncodeHelp,
+		consts.MsfStr:              msfHelp,
+		consts.MsfInjectStr:        msfInjectHelp,
+		consts.PsStr:               psHelp,
+		consts.PingStr:             pingHelp,
+		consts.KillStr:             killHelp,
+		consts.LsStr:               lsHelp,
+		consts.CdStr:               cdHelp,
+		consts.PwdStr:              pwdHelp,
+		consts.CatStr:              catHelp,
+		consts.DownloadStr:         downloadHelp,
+		consts.GrepStr:             grepHelp,
+		consts.HeadStr:             headHelp,
+		consts.TailStr:             tailHelp,
+		consts.UploadStr:           uploadHelp,
+		consts.MkdirStr:            mkdirHelp,
+		consts.RmStr:               rmHelp,
+		consts.ProcdumpStr:         procdumpHelp,
+		consts.ElevateStr:          elevateHelp,
+		consts.RunAsStr:            runAsHelp,
+		consts.ImpersonateStr:      impersonateHelp,
+		consts.RevToSelfStr:        revToSelfHelp,
+		consts.ExecuteStr:          executeHelp,
+		consts.ExecuteAssemblyStr:  executeAssemblyHelp,
+		consts.ExecuteShellcodeStr: executeShellcodeHelp,
+		consts.MigrateStr:          migrateHelp,
+		consts.SideloadStr:         sideloadHelp,
+		consts.TerminateStr:        terminateHelp,
+		consts.AliasesStr:          loadAliasHelp,
+		consts.PsExecStr:           psExecHelp,
+		consts.BackdoorStr:         backdoorHelp,
+		consts.SpawnDllStr:         spawnDllHelp,
+		consts.MountStr:            mountHelp,
 
 		consts.WebsitesStr:                                  websitesHelp,
 		consts.ScreenshotStr:                                screenshotHelp,
@@ -140,7 +129,6 @@ var (
 
 [[.Bold]]About:[[.Normal]] Execute a program on the remote system with optional arguments, note the subprocess 
 arguments are be separated from the sliver 'execute' arguments with '--' 
-Use [[.Bold]]--background[[.Normal]] to start the process without waiting for output (use [[.Bold]]--stdout[[.Normal]]/[[.Bold]]--stderr[[.Normal]] to redirect).
 
 [[.Bold]]Example:[[.Normal]]
 execute /bin/bash --env FOO=1 -- -c env
@@ -151,11 +139,6 @@ FOO=1
 PWD=/Users/moloch/git/sliver
 SHLVL=1
 _=/usr/bin/env
-`
-
-	executeChildrenHelp = `[[.Bold]]Command:[[.Normal]] execute children
-
-[[.Bold]]About:[[.Normal]] List tracked background child processes started with [[.Bold]]execute --background[[.Normal]].
 `
 
 	jobsHelp = `[[.Bold]]Command:[[.Normal]] jobs <options>
@@ -170,29 +153,6 @@ _=/usr/bin/env
 	infoHelp = `[[.Bold]]Command:[[.Normal]] info <sliver name/session>
 [[.Bold]]About:[[.Normal]] Get information about a Sliver by name, or for the active Sliver.`
 
-	aiHelp = `[[.Bold]]Command:[[.Normal]] ai
-[[.Bold]]About:[[.Normal]] Launch the Sliver AI Bubble Tea TUI. The AI workspace now loads server-side conversation threads over gRPC, keeps them synced through the shared event stream, and renders conversation transcripts as markdown in the main pane.
-
-[[.Bold]]Example:[[.Normal]]
-	use my-session
-	ai
-`
-
-	aiConfigHelp = `[[.Bold]]Command:[[.Normal]] ai-config
-[[.Bold]]About:[[.Normal]] Open a server-side form to update the AI block in server.yaml. The form stores the default provider, model, thinking level, and provider-specific credentials such as the API key and optional base URL.
-
-[[.Bold]]Example:[[.Normal]]
-	ai-config
-`
-
-	docsHelp = `[[.Bold]]Command:[[.Normal]] docs
-[[.Bold]]About:[[.Normal]] Browse the embedded Sliver documentation in a Bubble Tea TUI. The left pane is a searchable docs browser, and the right pane renders markdown with Glow styling.
-[[.Bold]]Keys:[[.Normal]] Use / to filter docs, enter to focus the selected document, tab to switch panes, and q to quit.
-
-[[.Bold]]Example:[[.Normal]]
-	docs
-`
-
 	useHelp = `[[.Bold]]Command:[[.Normal]] use [sliver name/session]
 [[.Bold]]About:[[.Normal]] Switch the active Sliver, a valid name must be provided (see sessions).`
 
@@ -216,8 +176,8 @@ You can also stack the C2 configuration with multiple protocols:
 
 
 [[.Bold]][[.Underline]]++ Formats ++[[.Normal]]
-Supported output formats include Windows PE, Windows DLL, Windows shellcode, macOS Mach-O, macOS shellcode (arm64),
-Linux ELF, and Linux shellcode (amd64/arm64). The output format is controlled with the --os and --format flags.
+Supported output formats are Windows PE, Windows DLL, Windows Shellcode, Mach-O, and ELF. The output format is controlled
+with the --os and --format flags.
 
 To output a 64bit Windows PE file (defaults to WinPE/64bit), either of the following command would be used:
 	generate --mtls foo.example.com 
@@ -233,21 +193,6 @@ To output a Linux ELF executable file, the following command would be used:
 	generate --os linux --mtls foo.example.com 
 
 
-[[.Bold]][[.Underline]]++ Shellcode Options ++[[.Normal]]
-When generating shellcode (--format shellcode), you can tune the shellcode generator:
-	--shellcode-encoder <name|none> # Apply a shellcode encoder (see: shellcode-encoders)
-	--shellcode-compress        # Enable aPLib compression (windows, macOS, and Linux)
-	--shellcode-entropy 1|2|3   # (windows only) Entropy: 1=none (default), 2=random names, 3=random+encrypt
-	--shellcode-exitopt 1|2|3   # (windows only) Exit behavior: 1=exit thread (default), 2=exit process, 3=block
-	--shellcode-bypass 1|2|3    # (windows only) Bypass: 1=none, 2=abort on failure, 3=continue (default)
-	--shellcode-headers 1|2     # (windows only) PE headers: 1=overwrite (default), 2=keep
-	--shellcode-thread          # (windows only) Unmanaged EXE: run entrypoint as a new thread
-	--shellcode-unicode         # (windows only) Unmanaged DLL: pass Unicode command line
-	--shellcode-oep <uint32>    # (windows only) Override original entry point (0=default)
-
-Note: macOS and Linux shellcode currently only support --shellcode-compress; other options are Windows-only.
-
-
 [[.Bold]][[.Underline]]++ DNS Canaries ++[[.Normal]]
 DNS canaries are unique per-binary domains that are deliberately NOT obfuscated during the compilation process. 
 This is done so that these unique domains show up if someone runs 'strings' on the binary, if they then attempt 
@@ -353,39 +298,9 @@ On Windows, escaping is disabled. Instead, '\\' is treated as path separator.
 	rmHelp = `[[.Bold]]Command:[[.Normal]] rm [remote path]
 [[.Bold]]About:[[.Normal]] Delete a remote file or directory.`
 
-	chtimesHelp = `[[.Bold]]Command:[[.Normal]] chtimes [--unix | --unix-ms | --rfc3339 | --rfc1123] <path> <atime> <mtime>
-[[.Bold]]About:[[.Normal]] Change access and modification times on a file (timestomp).
-
-[[.Bold]][[.Underline]]Time Formats[[.Normal]]
-Default (datetime): "2006-01-02 15:04:05"
---unix: 1704067200
---unix-ms: 1704067200000
---rfc3339: 2024-01-01T00:00:00Z
---rfc1123: Mon, 02 Jan 2006 15:04:05 MST
-
-[[.Bold]][[.Underline]]Examples[[.Normal]]
-chtimes /tmp/file "2024-01-01 12:34:56" "2024-01-01 12:35:56"
-chtimes --unix /tmp/file 1704112496 1704112556
-chtimes --unix-ms /tmp/file 1704112496000 1704112556000
-chtimes --rfc3339 /tmp/file 2024-01-01T12:34:56Z 2024-01-01T12:35:56Z
-chtimes --rfc1123 /tmp/file "Mon, 02 Jan 2006 15:04:05 MST" "Mon, 02 Jan 2006 16:04:05 MST"
-`
-
 	catHelp = `[[.Bold]]Command:[[.Normal]] cat <remote path> 
 [[.Bold]]About:[[.Normal]] Cat a remote file to stdout.`
 
-	editHelp = `[[.Bold]]Command:[[.Normal]] edit <remote path>
-[[.Bold]]About:[[.Normal]] Download a remote text file, edit it in a built-in TUI editor, and optionally upload changes.
-[[.Bold]]Keys:[[.Normal]] Normal mode uses vim-like navigation (h/j/k/l) and insert mode (i). Use :wq to save+quit or :q to quit.
-[[.Bold]]Syntax:[[.Normal]] Use --syntax <lexer> to force a lexer or --syntax-select to pick one interactively.
-[[.Bold]]Line Numbers:[[.Normal]] Use --line-numbers to start with line numbers on; toggle with :n.`
-
-	hexEditHelp = `[[.Bold]]Command:[[.Normal]] hex-edit [--max-size <size>] [--offset <byte offset>] <remote path>
-[[.Bold]]About:[[.Normal]] Download a remote file and edit it in a built-in hex editor, then optionally upload changes.
-[[.Bold]]Keys:[[.Normal]] Normal mode uses vim-like navigation (h/j/k/l). Use i for hex edit mode, a for ASCII edit mode, :wq to save+quit or :q to quit.
-[[.Bold]]Size Limit:[[.Normal]] Default max size is 8MB. Use --max-size to override (e.g., 512KB, 12MB).
-[[.Bold]]Offset:[[.Normal]] Use --offset to jump to a specific byte offset when opening the file.`
-
 	downloadHelp = `[[.Bold]]Command:[[.Normal]] download [remote src] <local dst>
 [[.Bold]]About:[[.Normal]] Download a file or directory from the remote system. Directories will be downloaded as a gzipped TAR file.
 [[.Bold]][[.Underline]]Filters[[.Normal]]
@@ -463,50 +378,13 @@ On Windows, escaping is disabled. Instead, '\\' is treated as path separator.`
 	mountHelp = `[[.Bold]]Command:[[.Normal]] mount
 [[.Bold]]About:[[.Normal]] Displays information about mounted drives on the system, including mount point, space metrics, and filesystem.`
 
-	executeShellcodeHelp = `[[.Bold]]Command:[[.Normal]] execute-shellcode [local path to raw shellcode or PE]
-[[.Bold]]About:[[.Normal]] Executes the given shellcode in the implant's process. On Windows targets, PE input can be
-converted with Donut before execution and tuned with [[.Bold]]--shellcode-*[[.Normal]] flags.
+	executeShellcodeHelp = `[[.Bold]]Command:[[.Normal]] execute-shellcode [local path to raw shellcode]
+[[.Bold]]About:[[.Normal]] Executes the given shellcode in the implant's process.
 
 [[.Bold]][[.Underline]]++ Shellcode ++[[.Normal]]
 Shellcode files should be binary encoded, you can generate Sliver shellcode files with the generate command:
 	generate --format shellcode
 `
-	shikataGaNaiHelp = `[[.Bold]]Command:[[.Normal]] shikata-ga-nai [local path to raw shellcode]
-[[.Bold]]About:[[.Normal]] Encodes shellcode with Shikata Ga Nai. This uses the same backend implementation as
-[[.Bold]]shellcode-encoders encode[[.Normal]] with the shikata_ga_nai encoder, but exposes SGN-specific options
-like architecture, iterations, and bad characters.
-
-[[.Bold]][[.Underline]]++ Examples ++[[.Normal]]
-Encode x64 shellcode with 3 iterations:
-	shikata-ga-nai -a amd64 -i 3 /tmp/payload.bin
-
-Avoid bad chars and write to a file:
-	shikata-ga-nai -b 000a0d -s /tmp/payload.sgn /tmp/payload.bin
-
-[[.Bold]]Related:[[.Normal]] shellcode-encoders encode --encoder shikata_ga_nai ...`
-
-	shellcodeEncodersHelp = `[[.Bold]]Command:[[.Normal]] shellcode-encoders
-[[.Bold]]About:[[.Normal]] Lists the shellcode encoders supported by the server along with architectures and descriptions.
-
-[[.Bold]][[.Underline]]++ Examples ++[[.Normal]]
-List encoders and supported architectures:
-	shellcode-encoders
-`
-
-	shellcodeEncodersEncodeHelp = `[[.Bold]]Command:[[.Normal]] shellcode-encoders encode [local path to raw shellcode]...
-[[.Bold]]About:[[.Normal]] Encodes one or more shellcode files using a server-side encoder. Encoder support depends on
-architecture; use [[.Bold]]shellcode-encoders[[.Normal]] to list valid combinations.
-
-[[.Bold]][[.Underline]]++ Examples ++[[.Normal]]
-Encode a single file with shikata_ga_nai:
-	shellcode-encoders encode --encoder shikata_ga_nai --arch amd64 /tmp/payload.bin
-
-Encode multiple files and write outputs to a directory:
-	shellcode-encoders encode --encoder xor --arch amd64 -o /tmp/out payload1.bin payload2.bin
-
-Avoid bad characters with SGN:
-	shellcode-encoders encode --encoder shikata_ga_nai --arch 386 -b 000a0d -o /tmp/encoded.bin /tmp/payload.bin
-`
 
 	migrateHelp = `[[.Bold]]Command:[[.Normal]] migrate <flags>
 [[.Bold]]About:[[.Normal]] (Windows Only) Migrates into the process designated by <flags>.`
@@ -1446,6 +1324,24 @@ On Windows, escaping is disabled. Instead, '\\' is treated as path separator.`
 To get information about services, you need to be an authenticated user on the system or domain. To control services, you need administrator or higher privileges.`
 )
 
+const (
+	// ANSI Colors
+	normal    = "\033[0m"
+	black     = "\033[30m"
+	red       = "\033[31m"
+	green     = "\033[32m"
+	orange    = "\033[33m"
+	blue      = "\033[34m"
+	purple    = "\033[35m"
+	cyan      = "\033[36m"
+	gray      = "\033[37m"
+	bold      = "\033[1m"
+	clearln   = "\r\x1b[2K"
+	upN       = "\033[%dA"
+	downN     = "\033[%dB"
+	underline = "\033[4m"
+)
+
 // GetHelpFor - Get help string for a command
 func GetHelpFor(cmdName []string) string {
 	if 0 < len(cmdName) {
@@ -1456,100 +1352,34 @@ func GetHelpFor(cmdName []string) string {
 	return ""
 }
 
-type helpStyleState struct {
-	bold      bool
-	underline bool
-	fgSet     bool
-	fg        color.Color
-}
-
-func (s *helpStyleState) reset() {
-	s.bold = false
-	s.underline = false
-	s.fgSet = false
-	s.fg = nil
-}
-
-func (s *helpStyleState) apply(token string) bool {
-	switch token {
-	case "Normal":
-		s.reset()
-	case "Bold":
-		s.bold = true
-	case "Underline":
-		s.underline = true
-	case "Black":
-		s.fgSet, s.fg = true, theme.DefaultMod(50)
-	case "Red":
-		s.fgSet, s.fg = true, theme.Danger()
-	case "Green":
-		s.fgSet, s.fg = true, theme.Success()
-	case "Orange":
-		s.fgSet, s.fg = true, theme.Warning()
-	case "Blue":
-		s.fgSet, s.fg = true, theme.Primary()
-	case "Purple":
-		s.fgSet, s.fg = true, theme.Secondary()
-	case "Cyan":
-		s.fgSet, s.fg = true, theme.PrimaryMod(500)
-	case "Gray":
-		// ANSI "gray" (37) is typically light; map to the lightest neutral.
-		s.fgSet, s.fg = true, theme.DefaultMod(900)
-	default:
-		return false
-	}
-	return true
-}
-
-func (s helpStyleState) render(text string) string {
-	if text == "" {
-		return ""
-	}
-	st := lipgloss.NewStyle()
-	if s.bold {
-		st = st.Bold(true)
-	}
-	if s.underline {
-		st = st.Underline(true)
-	}
-	if s.fgSet {
-		st = st.Foreground(s.fg)
-	}
-	return st.Render(text)
-}
-
-// FormatHelpTmpl - Applies the help markup (e.g. [[.Bold]]...[[.Normal]]) using lipgloss.
+// FormatHelpTmpl - Applies format template to help string
 func FormatHelpTmpl(helpStr string) string {
-	var (
-		out   strings.Builder
-		state helpStyleState
-	)
-	state.reset()
-
-	i := 0
-	for i < len(helpStr) {
-		j := strings.Index(helpStr[i:], "[[.")
-		if j < 0 {
-			out.WriteString(state.render(helpStr[i:]))
-			break
-		}
-		j += i
-		if j > i {
-			out.WriteString(state.render(helpStr[i:j]))
-		}
-
-		k := strings.Index(helpStr[j:], "]]")
-		if k < 0 {
-			out.WriteString(state.render(helpStr[j:]))
-			break
-		}
-		token := helpStr[j+3 : j+k]
-		if !state.apply(token) {
-			// Unknown token; preserve it as plain text.
-			out.WriteString(helpStr[j : j+k+2])
-		}
-		i = j + k + 2
-	}
-
-	return out.String()
+	outputBuf := bytes.NewBufferString("")
+	tmpl, _ := template.New("help").Delims("[[", "]]").Parse(helpStr)
+	tmpl.Execute(outputBuf, struct {
+		Normal    string
+		Bold      string
+		Underline string
+		Black     string
+		Red       string
+		Green     string
+		Orange    string
+		Blue      string
+		Purple    string
+		Cyan      string
+		Gray      string
+	}{
+		Normal:    normal,
+		Bold:      bold,
+		Underline: underline,
+		Black:     black,
+		Red:       red,
+		Green:     green,
+		Orange:    orange,
+		Blue:      blue,
+		Purple:    purple,
+		Cyan:      cyan,
+		Gray:      gray,
+	})
+	return outputBuf.String()
 }

client/command/hexedit/commands.go

@@ -1,37 +0,0 @@
-package hexedit
-
-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 hex-edit command.
-func Commands(con *console.SliverClient) []*cobra.Command {
-	hexEditCmd := &cobra.Command{
-		Use:     consts.HexEditStr + " <remote path>",
-		Short:   "Hex edit a remote file",
-		Long:    help.GetHelpFor([]string{consts.HexEditStr}),
-		Args:    cobra.ExactArgs(1),
-		GroupID: consts.FilesystemHelpGroup,
-		Run: func(cmd *cobra.Command, args []string) {
-			HexEditCmd(cmd, con, args)
-		},
-	}
-
-	flags.Bind("", false, hexEditCmd, func(f *pflag.FlagSet) {
-		f.String("max-size", "8MB", "maximum file size to load (e.g. 8MB, 512KB)")
-		f.Int64("offset", 0, "byte offset to jump to (decimal or 0x...)")
-		f.Int64P("timeout", "t", flags.DefaultTimeout, "grpc timeout in seconds")
-	})
-
-	carapace.Gen(hexEditCmd).PositionalCompletion(
-		carapace.ActionValues().Usage("path to the remote file to hex edit"),
-	)
-
-	return []*cobra.Command{hexEditCmd}
-}

client/command/hexedit/editor.go

@@ -1,732 +0,0 @@
-package hexedit
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	tea "charm.land/bubbletea/v2"
-	"charm.land/lipgloss/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/util"
-	"golang.org/x/term"
-)
-
-type editorMode int
-
-const (
-	modeNormal editorMode = iota
-	modeHexEdit
-	modeASCIIEdit
-	modeCommand
-)
-
-type exitAction int
-
-const (
-	actionNone exitAction = iota
-	actionQuit
-	actionSaveQuit
-)
-
-const bytesPerLine = 16
-
-type editorResult struct {
-	Data     []byte
-	Modified bool
-	Action   exitAction
-	Force    bool
-}
-
-type editorModel struct {
-	data          []byte
-	original      []byte
-	modified      []bool
-	modifiedCount int
-	cursor        int
-	top           int
-	width         int
-	height        int
-	mode          editorMode
-	command       string
-	commandPrefix rune
-	pending       rune
-	dirty         bool
-	forceQuit     bool
-	action        exitAction
-	filename      string
-	message       string
-	clearMessage  bool
-	nibbleSet     bool
-	nibbleValue   byte
-}
-
-var (
-	lineStyle = lipgloss.NewStyle()
-)
-
-const (
-	ansiReverseOn  = "\x1b[7m"
-	ansiReverseOff = "\x1b[0m"
-)
-
-func modifiedStyle() lipgloss.Style {
-	// Read from the global console theme so theme.yaml changes are reflected.
-	return console.StyleWarning
-}
-
-func newEditorModel(data []byte, filename string, offset int) *editorModel {
-	copyData := append([]byte(nil), data...)
-	model := &editorModel{
-		data:          copyData,
-		original:      append([]byte(nil), data...),
-		modified:      make([]bool, len(copyData)),
-		mode:          modeNormal,
-		filename:      filename,
-		commandPrefix: ':',
-	}
-	if offset > 0 && offset < len(copyData) {
-		model.cursor = offset
-	}
-	return model
-}
-
-func (m *editorModel) Init() tea.Cmd {
-	if m.width == 0 || m.height == 0 {
-		if w, h, err := term.GetSize(0); err == nil && w > 0 && h > 0 {
-			m.width = w
-			m.height = h
-		} else {
-			m.width = 80
-			m.height = 24
-		}
-		m.ensureCursorVisible()
-	}
-	return nil
-}
-
-func (m *editorModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	switch msg := msg.(type) {
-	case tea.WindowSizeMsg:
-		m.width = msg.Width
-		m.height = msg.Height
-		m.ensureCursorVisible()
-		return m, nil
-	case tea.KeyPressMsg:
-		if m.clearMessage {
-			m.message = ""
-			m.clearMessage = false
-		}
-		key := msg.Key()
-		if key.Mod.Contains(tea.ModCtrl) && key.Code == 'c' {
-			m.action = actionQuit
-			return m, tea.Quit
-		}
-		switch m.mode {
-		case modeCommand:
-			return m.handleCommand(key)
-		case modeHexEdit:
-			return m.handleHexEdit(key)
-		case modeASCIIEdit:
-			return m.handleASCIIEdit(key)
-		default:
-			return m.handleNormal(key)
-		}
-	}
-	return m, nil
-}
-
-func (m *editorModel) View() tea.View {
-	if m.width == 0 || m.height == 0 {
-		if w, h, err := term.GetSize(0); err == nil && w > 0 && h > 0 {
-			m.width = w
-			m.height = h
-		} else {
-			m.width = 80
-			m.height = 24
-		}
-		m.ensureCursorVisible()
-	}
-
-	textHeight := m.textHeight()
-	var b strings.Builder
-	for i := 0; i < textHeight; i++ {
-		lineIndex := m.top + i
-		b.WriteString(m.renderLine(lineIndex))
-		if i < textHeight-1 {
-			b.WriteByte('\n')
-		}
-	}
-
-	if m.height < 2 {
-		return hexEditorView(b.String())
-	}
-
-	b.WriteByte('\n')
-	b.WriteString(renderStatusBar(m.width, m.statusLine()))
-
-	if m.height < 3 {
-		return hexEditorView(b.String())
-	}
-
-	b.WriteByte('\n')
-	b.WriteString(lineStyle.Width(m.width).Render(m.commandLine()))
-	return hexEditorView(b.String())
-}
-
-func renderStatusBar(width int, text string) string {
-	return ansiReverseOn + lineStyle.Width(width).Render(text) + ansiReverseOff
-}
-
-func renderCursorCell(cell string) string {
-	return ansiReverseOn + cell + ansiReverseOff
-}
-
-func hexEditorView(content string) tea.View {
-	v := tea.NewView(content)
-	v.AltScreen = true
-	return v
-}
-
-func (m *editorModel) result() editorResult {
-	data := append([]byte(nil), m.data...)
-	return editorResult{
-		Data:     data,
-		Modified: m.dirty,
-		Action:   m.action,
-		Force:    m.forceQuit,
-	}
-}
-
-func (m *editorModel) handleCommand(key tea.Key) (tea.Model, tea.Cmd) {
-	switch key.Code {
-	case tea.KeyEsc:
-		m.mode = modeNormal
-		m.command = ""
-		m.commandPrefix = ':'
-	case tea.KeyEnter:
-		m.executeCommand(strings.TrimSpace(m.command))
-		m.command = ""
-		m.mode = modeNormal
-		m.commandPrefix = ':'
-		if m.action != actionNone {
-			return m, tea.Quit
-		}
-	case tea.KeyBackspace:
-		m.command = popRune(m.command)
-	default:
-		if key.Text != "" {
-			m.command += key.Text
-		}
-	}
-	return m, nil
-}
-
-func (m *editorModel) handleHexEdit(key tea.Key) (tea.Model, tea.Cmd) {
-	switch key.Code {
-	case tea.KeyEsc:
-		m.mode = modeNormal
-		m.nibbleSet = false
-	case tea.KeyBackspace:
-		if m.nibbleSet {
-			m.nibbleSet = false
-			return m, nil
-		}
-		m.moveLeft()
-	case tea.KeyLeft:
-		m.moveLeft()
-		m.nibbleSet = false
-	case tea.KeyRight:
-		m.moveRight()
-		m.nibbleSet = false
-	case tea.KeyUp:
-		m.moveUp()
-		m.nibbleSet = false
-	case tea.KeyDown:
-		m.moveDown()
-		m.nibbleSet = false
-	default:
-		for _, r := range key.Text {
-			val, ok := hexNibble(r)
-			if !ok {
-				continue
-			}
-			if !m.nibbleSet {
-				m.nibbleValue = val << 4
-				m.nibbleSet = true
-				continue
-			}
-			m.setByte(m.nibbleValue | val)
-			m.nibbleSet = false
-			m.moveRight()
-		}
-	}
-	m.ensureCursorVisible()
-	return m, nil
-}
-
-func (m *editorModel) handleASCIIEdit(key tea.Key) (tea.Model, tea.Cmd) {
-	switch key.Code {
-	case tea.KeyEsc:
-		m.mode = modeNormal
-	case tea.KeyLeft:
-		m.moveLeft()
-	case tea.KeyRight:
-		m.moveRight()
-	case tea.KeyUp:
-		m.moveUp()
-	case tea.KeyDown:
-		m.moveDown()
-	default:
-		for _, r := range key.Text {
-			if r < 0 || r > 0xFF {
-				continue
-			}
-			m.setByte(byte(r))
-			m.moveRight()
-		}
-	}
-	m.ensureCursorVisible()
-	return m, nil
-}
-
-func (m *editorModel) handleNormal(key tea.Key) (tea.Model, tea.Cmd) {
-	switch key.Code {
-	case tea.KeyEsc:
-		m.pending = 0
-	case tea.KeyLeft:
-		m.moveLeft()
-	case tea.KeyRight:
-		m.moveRight()
-	case tea.KeyUp:
-		m.moveUp()
-	case tea.KeyDown:
-		m.moveDown()
-	default:
-		for _, r := range key.Text {
-			if m.handleNormalRune(r) {
-				break
-			}
-		}
-	}
-	m.ensureCursorVisible()
-	return m, nil
-}
-
-func (m *editorModel) handleNormalRune(r rune) bool {
-	if m.pending != 0 {
-		handled := true
-		switch m.pending {
-		case 'g':
-			if r == 'g' {
-				m.gotoTop()
-			} else {
-				handled = false
-			}
-		default:
-			handled = false
-		}
-		m.pending = 0
-		if handled {
-			return true
-		}
-	}
-
-	switch r {
-	case 'h':
-		m.moveLeft()
-	case 'j':
-		m.moveDown()
-	case 'k':
-		m.moveUp()
-	case 'l':
-		m.moveRight()
-	case '0':
-		m.moveLineStart()
-	case '$':
-		m.moveLineEnd()
-	case 'i':
-		m.mode = modeHexEdit
-		m.nibbleSet = false
-	case 'a':
-		m.mode = modeASCIIEdit
-	case 'x':
-		m.setByte(0x00)
-	case 'g':
-		m.pending = 'g'
-	case 'G':
-		m.gotoBottom()
-	case ':':
-		m.mode = modeCommand
-		m.command = ""
-		m.commandPrefix = ':'
-	}
-
-	return false
-}
-
-func (m *editorModel) executeCommand(cmd string) {
-	if cmd == "" {
-		return
-	}
-
-	if isNumericOffset(cmd) {
-		if value, err := strconv.ParseInt(cmd, 0, 64); err == nil {
-			m.gotoOffset(int(value))
-			return
-		}
-	}
-
-	switch strings.ToLower(cmd) {
-	case "q":
-		m.action = actionQuit
-	case "q!":
-		m.action = actionQuit
-		m.forceQuit = true
-	case "wq", "x":
-		m.action = actionSaveQuit
-	case "w":
-		m.message = "Use :wq to upload and exit"
-		m.clearMessage = true
-	default:
-		m.message = fmt.Sprintf("Unknown command: %s", cmd)
-		m.clearMessage = true
-	}
-}
-
-func (m *editorModel) renderLine(lineIndex int) string {
-	totalWidth := m.textWidth()
-	if totalWidth <= 0 {
-		return ""
-	}
-
-	if lineIndex >= m.totalLines() {
-		return lineStyle.Width(totalWidth).Render("~")
-	}
-
-	lineStart := lineIndex * bytesPerLine
-	hexCells := make([]string, bytesPerLine)
-	asciiCells := make([]string, bytesPerLine)
-
-	for i := 0; i < bytesPerLine; i++ {
-		idx := lineStart + i
-		if idx >= len(m.data) {
-			hexCells[i] = "  "
-			asciiCells[i] = " "
-			continue
-		}
-		byteVal := m.data[idx]
-		hexRaw := fmt.Sprintf("%02x", byteVal)
-		if idx == m.cursor && m.mode == modeHexEdit && m.nibbleSet {
-			hexRaw = string([]byte{hexChar(m.nibbleValue >> 4), '_'})
-		}
-		asciiRaw := string(printableByte(byteVal))
-		isModified := m.isModified(idx)
-		if idx == m.cursor {
-			hexCells[i] = renderCursorCell(hexRaw)
-			asciiCells[i] = renderCursorCell(asciiRaw)
-			continue
-		}
-		if isModified {
-			hexCells[i] = modifiedStyle().Render(hexRaw)
-			asciiCells[i] = modifiedStyle().Render(asciiRaw)
-			continue
-		}
-		hexCells[i] = hexRaw
-		asciiCells[i] = asciiRaw
-	}
-
-	var b strings.Builder
-	b.WriteString(fmt.Sprintf("%08x", lineStart))
-	b.WriteString(": ")
-	for i := 0; i < bytesPerLine; i++ {
-		if i == 8 {
-			b.WriteByte(' ')
-		}
-		b.WriteString(hexCells[i])
-		if i < bytesPerLine-1 {
-			b.WriteByte(' ')
-		}
-	}
-	b.WriteString("  |")
-	for i := 0; i < bytesPerLine; i++ {
-		b.WriteString(asciiCells[i])
-	}
-	b.WriteString("|")
-
-	return lineStyle.Width(totalWidth).Render(b.String())
-}
-
-func (m *editorModel) statusLine() string {
-	mode := "NORMAL"
-	switch m.mode {
-	case modeHexEdit:
-		mode = "HEX"
-	case modeASCIIEdit:
-		mode = "ASCII"
-	case modeCommand:
-		mode = "COMMAND"
-	}
-	fileName := baseName(m.filename)
-	if fileName == "" {
-		fileName = "[No Name]"
-	}
-	modified := ""
-	if m.dirty {
-		modified = " [+]"
-	}
-	cursor := m.cursor
-	return fmt.Sprintf(" %s  %s  Off 0x%08x (%d)  Size %s%s", mode, fileName, cursor, cursor, util.ByteCountBinary(int64(len(m.data))), modified)
-}
-
-func (m *editorModel) commandLine() string {
-	if m.mode == modeCommand {
-		return ":" + m.command
-	}
-	if m.message != "" {
-		return m.message
-	}
-	switch m.mode {
-	case modeHexEdit:
-		return "ESC: normal  hex: 0-9/a-f  :wq save+quit  :q quit"
-	case modeASCIIEdit:
-		return "ESC: normal  type to edit bytes  :wq save+quit  :q quit"
-	default:
-		return "i: hex edit  a: ascii edit  h/j/k/l move  x zero  :wq save+quit  :q quit"
-	}
-}
-
-func (m *editorModel) textHeight() int {
-	if m.height <= 2 {
-		return 1
-	}
-	return m.height - 2
-}
-
-func (m *editorModel) textWidth() int {
-	if m.width <= 0 {
-		return 1
-	}
-	return m.width
-}
-
-func (m *editorModel) totalLines() int {
-	if len(m.data) == 0 {
-		return 1
-	}
-	return (len(m.data) + bytesPerLine - 1) / bytesPerLine
-}
-
-func (m *editorModel) ensureCursorVisible() {
-	if len(m.data) == 0 {
-		m.cursor = 0
-		m.top = 0
-		return
-	}
-	if m.cursor < 0 {
-		m.cursor = 0
-	}
-	if m.cursor >= len(m.data) {
-		m.cursor = len(m.data) - 1
-	}
-
-	line := m.cursor / bytesPerLine
-	height := m.textHeight()
-	if line < m.top {
-		m.top = line
-	} else if line >= m.top+height {
-		m.top = line - height + 1
-	}
-	if m.top < 0 {
-		m.top = 0
-	}
-	maxTop := m.totalLines() - height
-	if maxTop < 0 {
-		maxTop = 0
-	}
-	if m.top > maxTop {
-		m.top = maxTop
-	}
-}
-
-func (m *editorModel) moveLeft() {
-	if len(m.data) == 0 {
-		return
-	}
-	if m.cursor > 0 {
-		m.cursor--
-	}
-}
-
-func (m *editorModel) moveRight() {
-	if len(m.data) == 0 {
-		return
-	}
-	if m.cursor < len(m.data)-1 {
-		m.cursor++
-	}
-}
-
-func (m *editorModel) moveUp() {
-	if len(m.data) == 0 {
-		return
-	}
-	if m.cursor >= bytesPerLine {
-		m.cursor -= bytesPerLine
-	}
-}
-
-func (m *editorModel) moveDown() {
-	if len(m.data) == 0 {
-		return
-	}
-	if m.cursor+bytesPerLine < len(m.data) {
-		m.cursor += bytesPerLine
-	}
-}
-
-func (m *editorModel) moveLineStart() {
-	if len(m.data) == 0 {
-		return
-	}
-	line := m.cursor / bytesPerLine
-	m.cursor = line * bytesPerLine
-}
-
-func (m *editorModel) moveLineEnd() {
-	if len(m.data) == 0 {
-		return
-	}
-	line := m.cursor / bytesPerLine
-	end := (line+1)*bytesPerLine - 1
-	if end >= len(m.data) {
-		end = len(m.data) - 1
-	}
-	m.cursor = end
-}
-
-func (m *editorModel) gotoTop() {
-	if len(m.data) == 0 {
-		m.cursor = 0
-		return
-	}
-	m.cursor = 0
-}
-
-func (m *editorModel) gotoBottom() {
-	if len(m.data) == 0 {
-		m.cursor = 0
-		return
-	}
-	m.cursor = len(m.data) - 1
-}
-
-func (m *editorModel) gotoOffset(offset int) {
-	if len(m.data) == 0 {
-		m.message = "Empty file"
-		m.clearMessage = true
-		return
-	}
-	if offset < 0 || offset >= len(m.data) {
-		m.message = fmt.Sprintf("Offset out of range: %d", offset)
-		m.clearMessage = true
-		return
-	}
-	m.cursor = offset
-	m.ensureCursorVisible()
-}
-
-func (m *editorModel) setByte(value byte) {
-	if len(m.data) == 0 {
-		m.message = "Empty file"
-		m.clearMessage = true
-		return
-	}
-	if m.cursor >= len(m.data) || m.cursor >= len(m.original) {
-		return
-	}
-	wasModified := m.modified[m.cursor]
-	orig := m.original[m.cursor]
-	m.data[m.cursor] = value
-	if value == orig {
-		if wasModified {
-			m.modified[m.cursor] = false
-			if m.modifiedCount > 0 {
-				m.modifiedCount--
-			}
-		}
-	} else if !wasModified {
-		m.modified[m.cursor] = true
-		m.modifiedCount++
-	}
-	m.dirty = m.modifiedCount > 0
-}
-
-func printableByte(b byte) byte {
-	if b >= 32 && b <= 126 {
-		return b
-	}
-	return '.'
-}
-
-func (m *editorModel) isModified(idx int) bool {
-	if idx < 0 || idx >= len(m.modified) {
-		return false
-	}
-	return m.modified[idx]
-}
-
-func hexChar(n byte) byte {
-	if n < 10 {
-		return '0' + n
-	}
-	return 'a' + (n - 10)
-}
-
-func hexNibble(r rune) (byte, bool) {
-	switch {
-	case r >= '0' && r <= '9':
-		return byte(r - '0'), true
-	case r >= 'a' && r <= 'f':
-		return byte(r-'a') + 10, true
-	case r >= 'A' && r <= 'F':
-		return byte(r-'A') + 10, true
-	}
-	return 0, false
-}
-
-func isNumericOffset(value string) bool {
-	value = strings.TrimSpace(value)
-	if value == "" {
-		return false
-	}
-	if strings.HasPrefix(strings.ToLower(value), "0x") {
-		_, err := strconv.ParseInt(value, 0, 64)
-		return err == nil
-	}
-	for _, r := range value {
-		if r < '0' || r > '9' {
-			return false
-		}
-	}
-	return true
-}
-
-func popRune(value string) string {
-	runes := []rune(value)
-	if len(runes) == 0 {
-		return value
-	}
-	return string(runes[:len(runes)-1])
-}
-
-func baseName(path string) string {
-	if path == "" {
-		return ""
-	}
-	clean := strings.ReplaceAll(path, "\\", "/")
-	if idx := strings.LastIndex(clean, "/"); idx != -1 {
-		return clean[idx+1:]
-	}
-	return path
-}

client/command/hexedit/hexedit.go

@@ -1,359 +0,0 @@
-package hexedit
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	tea "charm.land/bubbletea/v2"
-	"github.com/bishopfox/sliver/client/command/filesystem"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/client/forms"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/bishopfox/sliver/util"
-	"github.com/bishopfox/sliver/util/encoders"
-	"github.com/charmbracelet/colorprofile"
-	"github.com/spf13/cobra"
-	"golang.org/x/term"
-	"google.golang.org/protobuf/proto"
-)
-
-const (
-	beaconPollInterval = 1 * time.Second
-)
-
-// HexEditCmd downloads a remote file, opens it in a hex editor, and optionally uploads changes.
-func HexEditCmd(cmd *cobra.Command, con *console.SliverClient, args []string) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
-		return
-	}
-
-	remotePath := strings.TrimSpace(args[0])
-	if remotePath == "" {
-		con.PrintErrorf("Missing parameter: remote path\n")
-		return
-	}
-
-	maxSizeStr, _ := cmd.Flags().GetString("max-size")
-	maxSize, err := parseByteSize(maxSizeStr)
-	if err != nil {
-		con.PrintErrorf("Invalid --max-size %q: %s\n", maxSizeStr, err)
-		return
-	}
-	if maxSize <= 0 {
-		con.PrintErrorf("--max-size must be greater than zero\n")
-		return
-	}
-
-	offset, _ := cmd.Flags().GetInt64("offset")
-	if offset < 0 {
-		con.PrintErrorf("--offset must be zero or positive\n")
-		return
-	}
-
-	fetchSize := maxSize + 1
-	if fetchSize < maxSize {
-		fetchSize = maxSize
-	}
-
-	ctx, cancel := con.GrpcContext(cmd)
-	defer cancel()
-
-	ctrl := make(chan bool)
-	con.SpinUntil(fmt.Sprintf("Downloading %s ...", remotePath), ctrl)
-	download, err := downloadRemote(ctx, con, cmd, remotePath, fetchSize)
-	ctrl <- true
-	<-ctrl
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if download.Response != nil && download.Response.Err != "" {
-		con.PrintErrorf("%s\n", download.Response.Err)
-		return
-	}
-	if !download.Exists {
-		con.PrintErrorf("Remote file does not exist: %s\n", remotePath)
-		return
-	}
-	if download.IsDir {
-		con.PrintErrorf("Remote path is a directory: %s\n", download.Path)
-		return
-	}
-
-	data := download.Data
-	if download.Encoder == "gzip" {
-		data, err = new(encoders.Gzip).Decode(download.Data)
-		if err != nil {
-			con.PrintErrorf("Decoding failed %s\n", err)
-			return
-		}
-	}
-
-	if int64(len(data)) > maxSize {
-		con.PrintErrorf("Remote file size %s exceeds --max-size %s\n", util.ByteCountBinary(int64(len(data))), util.ByteCountBinary(maxSize))
-		return
-	}
-
-	if offset > 0 {
-		if len(data) == 0 {
-			con.PrintErrorf("Offset %d out of range for empty file\n", offset)
-			return
-		}
-		if offset >= int64(len(data)) {
-			con.PrintErrorf("Offset %d out of range (file size %d bytes)\n", offset, len(data))
-			return
-		}
-	}
-
-	path := download.Path
-	if path == "" {
-		path = remotePath
-	}
-
-	for {
-		result, err := runHexEditor(data, path, int(offset))
-		if err != nil {
-			con.PrintErrorf("Editor error: %s\n", err)
-			return
-		}
-		data = result.Data
-
-		if result.Action == actionNone {
-			return
-		}
-
-		if !result.Modified {
-			if result.Action == actionSaveQuit {
-				con.PrintInfof("No changes to upload for %s\n", path)
-			}
-			return
-		}
-
-		switch result.Action {
-		case actionSaveQuit:
-			uploadNow, err := confirm("Upload changes to remote file (overwrite)?")
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				return
-			}
-			if !uploadNow {
-				keepEditing, err := confirm("Continue editing?")
-				if err != nil {
-					con.PrintErrorf("%s\n", err)
-					return
-				}
-				if keepEditing {
-					continue
-				}
-				return
-			}
-
-			if err := uploadEditedContent(cmd, con, path, data); err != nil {
-				con.PrintErrorf("%s\n", err)
-			}
-			return
-		case actionQuit:
-			if result.Force {
-				return
-			}
-			discard, err := confirm("Discard changes?")
-			if err != nil {
-				con.PrintErrorf("%s\n", err)
-				return
-			}
-			if discard {
-				return
-			}
-		}
-	}
-}
-
-func runHexEditor(data []byte, filename string, offset int) (editorResult, error) {
-	model := newEditorModel(data, filename, offset)
-	width, height := 80, 24
-	if w, h, err := term.GetSize(0); err == nil && w > 0 && h > 0 {
-		width, height = w, h
-	}
-	program := tea.NewProgram(
-		model,
-		tea.WithWindowSize(width, height),
-		tea.WithColorProfile(colorprofile.TrueColor),
-	)
-	finalModel, err := program.Run()
-	if err != nil {
-		return editorResult{}, err
-	}
-	editor, ok := finalModel.(*editorModel)
-	if !ok {
-		return editorResult{}, fmt.Errorf("unexpected editor state")
-	}
-	return editor.result(), nil
-}
-
-func downloadRemote(ctx context.Context, con *console.SliverClient, cmd *cobra.Command, path string, maxBytes int64) (*sliverpb.Download, error) {
-	download, err := con.Rpc.Download(ctx, &sliverpb.DownloadReq{
-		Request:          con.ActiveTarget.Request(cmd),
-		Path:             path,
-		RestrictedToFile: true,
-		MaxBytes:         maxBytes,
-	})
-	if err != nil {
-		return nil, err
-	}
-	if download.Response != nil && download.Response.Async {
-		taskID := download.Response.TaskID
-		download = &sliverpb.Download{}
-		if err := waitForBeaconTaskResponse(ctx, con, taskID, download); err != nil {
-			return nil, err
-		}
-	}
-	return download, nil
-}
-
-func uploadEditedContent(cmd *cobra.Command, con *console.SliverClient, path string, data []byte) error {
-	ctx, cancel := con.GrpcContext(cmd)
-	defer cancel()
-
-	uploadData, err := new(encoders.Gzip).Encode(data)
-	if err != nil {
-		return err
-	}
-
-	ctrl := make(chan bool)
-	con.SpinUntil(fmt.Sprintf("Uploading %s ...", path), ctrl)
-	upload, err := con.Rpc.Upload(ctx, &sliverpb.UploadReq{
-		Request:     con.ActiveTarget.Request(cmd),
-		Path:        path,
-		Data:        uploadData,
-		Encoder:     "gzip",
-		IsDirectory: false,
-		Overwrite:   true,
-	})
-	if err == nil && upload.Response != nil && upload.Response.Async {
-		taskID := upload.Response.TaskID
-		upload = &sliverpb.Upload{}
-		err = waitForBeaconTaskResponse(ctx, con, taskID, upload)
-	}
-	ctrl <- true
-	<-ctrl
-
-	if err != nil {
-		return err
-	}
-	filesystem.PrintUpload(upload, con)
-	return nil
-}
-
-func waitForBeaconTaskResponse(ctx context.Context, con *console.SliverClient, taskID string, out proto.Message) error {
-	task, err := waitForBeaconTask(ctx, con, taskID)
-	if err != nil {
-		return err
-	}
-	state := strings.ToLower(task.State)
-	if state != "completed" {
-		if state == "" {
-			state = "unknown"
-		}
-		return fmt.Errorf("beacon task %s %s", task.ID, state)
-	}
-	if len(task.Response) == 0 {
-		return fmt.Errorf("beacon task %s returned empty response", task.ID)
-	}
-	return proto.Unmarshal(task.Response, out)
-}
-
-func waitForBeaconTask(ctx context.Context, con *console.SliverClient, taskID string) (*clientpb.BeaconTask, error) {
-	ticker := time.NewTicker(beaconPollInterval)
-	defer ticker.Stop()
-
-	for {
-		task, err := con.Rpc.GetBeaconTaskContent(ctx, &clientpb.BeaconTask{ID: taskID})
-		if err != nil {
-			return nil, err
-		}
-		state := strings.ToLower(task.State)
-		if state == "completed" || state == "failed" || state == "canceled" {
-			return task, nil
-		}
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		case <-ticker.C:
-		}
-	}
-}
-
-func confirm(title string) (bool, error) {
-	answer := false
-	if err := forms.Confirm(title, &answer); err != nil {
-		if errors.Is(err, forms.ErrUserAborted) {
-			return false, nil
-		}
-		return false, err
-	}
-	return answer, nil
-}
-
-func parseByteSize(input string) (int64, error) {
-	value := strings.TrimSpace(input)
-	if value == "" {
-		return 0, fmt.Errorf("size is required")
-	}
-	value = strings.ReplaceAll(value, " ", "")
-	value = strings.ToUpper(value)
-
-	idx := 0
-	for idx < len(value) {
-		c := value[idx]
-		if (c >= '0' && c <= '9') || c == '.' {
-			idx++
-			continue
-		}
-		break
-	}
-	if idx == 0 {
-		return 0, fmt.Errorf("invalid size %q", input)
-	}
-
-	numStr := value[:idx]
-	unitStr := strings.TrimSpace(value[idx:])
-	if unitStr == "" {
-		unitStr = "B"
-	}
-
-	multiplier := int64(1)
-	switch unitStr {
-	case "B":
-		multiplier = 1
-	case "K", "KB", "KIB":
-		multiplier = 1024
-	case "M", "MB", "MIB":
-		multiplier = 1024 * 1024
-	case "G", "GB", "GIB":
-		multiplier = 1024 * 1024 * 1024
-	case "T", "TB", "TIB":
-		multiplier = 1024 * 1024 * 1024 * 1024
-	default:
-		return 0, fmt.Errorf("unknown size unit %q", unitStr)
-	}
-
-	numVal, err := strconv.ParseFloat(numStr, 64)
-	if err != nil {
-		return 0, fmt.Errorf("invalid size %q", input)
-	}
-	if numVal <= 0 {
-		return 0, fmt.Errorf("size must be greater than zero")
-	}
-
-	size := int64(numVal * float64(multiplier))
-	if size <= 0 {
-		return 0, fmt.Errorf("size is out of range")
-	}
-	return size, nil
-}