Merge pull request #318 from BishopFox/stage

Stage

Dockerfile

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

go-assets.sh

@@ -20,7 +20,7 @@
 # Creates the static go asset archives
 # You'll need wget, tar, and unzip commands
 
-GO_VER="1.15.5"
+GO_VER="1.15.6"
 GO_ARCH="amd64"
 BLOAT_FILES="AUTHORS CONTRIBUTORS PATENTS VERSION favicon.ico robots.txt CONTRIBUTING.md LICENSE README.md ./doc ./test ./api ./misc"
 

server/db/sql.go

@@ -57,6 +57,7 @@ func newDBClient() *gorm.DB {
 		&models.ImplantC2{},
 		&models.ImplantConfig{},
 		&models.ImplantBuild{},
+		&models.CanaryDomain{},
 		&models.ImplantProfile{},
 		&models.WebContent{},
 		&models.Website{},

server/handlers/sessions.go

@@ -23,6 +23,8 @@ package handlers
 */
 
 import (
+	"sync"
+
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
 	"github.com/bishopfox/sliver/server/core"
 	"github.com/bishopfox/sliver/server/log"
@@ -38,6 +40,8 @@ var (
 		sliverpb.MsgTunnelData:  tunnelDataHandler,
 		sliverpb.MsgTunnelClose: tunnelCloseHandler,
 	}
+
+	tunnelHandlerMutex = &sync.Mutex{}
 )
 
 // GetSessionHandlers - Returns a map of server-side msg handlers
@@ -83,7 +87,12 @@ func registerSessionHandler(session *core.Session, data []byte) {
 	core.Sessions.Add(session)
 }
 
+// The handler mutex prevents a send on a closed channel, without it
+// two handlers calls may race when a tunnel is quickly created and closed.
 func tunnelDataHandler(session *core.Session, data []byte) {
+	tunnelHandlerMutex.Lock()
+	defer tunnelHandlerMutex.Unlock()
+
 	tunnelData := &sliverpb.TunnelData{}
 	proto.Unmarshal(data, tunnelData)
 	tunnel := core.Tunnels.Get(tunnelData.TunnelID)
@@ -99,6 +108,9 @@ func tunnelDataHandler(session *core.Session, data []byte) {
 }
 
 func tunnelCloseHandler(session *core.Session, data []byte) {
+	tunnelHandlerMutex.Lock()
+	defer tunnelHandlerMutex.Unlock()
+
 	tunnelData := &sliverpb.TunnelData{}
 	proto.Unmarshal(data, tunnelData)
 	if !tunnelData.Closed {