add ECCPublicKeyDigest to protobuf and database

BishopFox · May 30, 2023 · 429c520 · 429c520
1 parent a6ba863
commit 429c520
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/protobuf/clientpb/client.pb.go b/protobuf/clientpb/client.pb.go
diff --git a/server/c2/http.go b/server/c2/http.go
@@ -41,7 +41,6 @@ import (
 	"github.com/bishopfox/sliver/protobuf/clientpb"
 	"github.com/bishopfox/sliver/protobuf/sliverpb"
 	"github.com/bishopfox/sliver/server/certs"
-	"github.com/bishopfox/sliver/server/configs"
 	"github.com/bishopfox/sliver/server/core"
 	"github.com/bishopfox/sliver/server/cryptography"
 	"github.com/bishopfox/sliver/server/db"
@@ -144,7 +143,7 @@ type SliverHTTPC2 struct {
 	SliverStage  []byte // Sliver shellcode to serve during staging process
 	Cleanup      func()
 
-	c2Config *configs.HTTPC2Config // C2 config (from config file)
+	c2Config *clientpb.HTTPC2Config // C2 config (from config file)
 }
 
 func (s *SliverHTTPC2) getServerHeader() string {
@@ -160,15 +159,11 @@ func (s *SliverHTTPC2) getServerHeader() string {
 }
 
 func (s *SliverHTTPC2) getCookieName() string {
-	cookies := s.getHTTPC2Config().ServerConfig.Cookies
+	cookies := s.c2Config.ServerConfig.Cookies
 	index := insecureRand.Intn(len(cookies))
 	return cookies[index].Name
 }
 
-func (s *SliverHTTPC2) getHTTPC2Config() *clientpb.HTTPC2Config {
-	return nil
-}
-
 // StartHTTPListener - Start an HTTP(S) listener, this can be used to start both
 //
 //	HTTP/HTTPS depending on the caller's conf
@@ -359,6 +354,7 @@ func (s *SliverHTTPC2) loadServerHTTPC2Configs() []*models.HttpC2Config {
 func (s *SliverHTTPC2) router() *mux.Router {
 	router := mux.NewRouter()
 	c2Configs := s.loadServerHTTPC2Configs()
+	s.c2Config = c2Configs[0].ToProtobuf()
 	if s.ServerConf.MaxRequestLength < 1024 {
 		s.ServerConf.MaxRequestLength = DefaultMaxBodyLength
 	}
@@ -371,7 +367,6 @@ func (s *SliverHTTPC2) router() *mux.Router {
 
 		httpLog.Debugf("HTTP C2 Implant Config = %v", c2Config.ImplantConfig)
 		httpLog.Debugf("HTTP C2 Server Config = %v", c2Config.ServerConfig)
-		fmt.Println(c2Config.Name)
 		// Start Session Handler
 		router.HandleFunc(
 			fmt.Sprintf("/{rpath:.*\\.%s$}", c2Config.ImplantConfig.StartSessionFileExtension),
@@ -521,7 +516,7 @@ func (s *SliverHTTPC2) DefaultRespHeaders(next http.Handler) http.Handler {
 		for _, header := range s.c2Config.ServerConfig.Headers {
 			if 0 < header.Probability && header.Probability < 100 {
 				roll := insecureRand.Intn(99) + 1
-				if header.Probability < roll {
+				if header.Probability < int32(roll) {
 					continue
 				}
 			}

diff --git a/server/db/models/implant.go b/server/db/models/implant.go
@@ -174,6 +174,7 @@ func (ic *ImplantConfig) ToProtobuf() *clientpb.ImplantConfig {
 		ECCServerPublicKey: ic.ECCServerPublicKey,
 		ECCPublicKey:       ic.ECCPublicKey,
 		ECCPrivateKey:      ic.ECCPrivateKey,
+		ECCPublicKeyDigest: ic.ECCPublicKeyDigest,
 		MtlsCACert:         ic.MtlsCACert,
 		MtlsCert:           ic.MtlsCert,
 		MtlsKey:            ic.MtlsKey,
@@ -340,6 +341,7 @@ func ImplantConfigFromProtobuf(pbConfig *clientpb.ImplantConfig) *ImplantConfig
 	cfg.ECCServerPublicKey = pbConfig.ECCServerPublicKey
 	cfg.ECCPrivateKey = pbConfig.ECCPrivateKey
 	cfg.ECCPublicKey = pbConfig.ECCPublicKey
+	cfg.ECCPublicKeyDigest = pbConfig.ECCPublicKeyDigest
 
 	cfg.GOOS = pbConfig.GOOS
 	cfg.GOARCH = pbConfig.GOARCH

diff --git a/server/generate/binaries.go b/server/generate/binaries.go
@@ -20,6 +20,8 @@ package generate
 
 import (
 	"bytes"
+	"crypto/sha256"
+	"encoding/hex"
 	"fmt"
 	"io/fs"
 	insecureRand "math/rand"
@@ -678,9 +680,9 @@ func GenerateConfig(implantConfig *clientpb.ImplantConfig, save bool) (*clientpb
 		return nil, err
 	}
 	serverKeyPair := cryptography.ECCServerKeyPair()
-	// digest := sha256.Sum256((*implantKeyPair.Public)[:])
+	digest := sha256.Sum256((*implantKeyPair.Public)[:])
 	implantConfig.ECCPublicKey = implantKeyPair.PublicBase64()
-	// config.ECCPublicKeyDigest = hex.EncodeToString(digest[:])
+	implantConfig.ECCPublicKeyDigest = hex.EncodeToString(digest[:])
 	implantConfig.ECCPrivateKey = implantKeyPair.PrivateBase64()
 	implantConfig.ECCPublicKeySignature = cryptography.MinisignServerSign(implantKeyPair.Public[:])
 	implantConfig.ECCServerPublicKey = serverKeyPair.PublicBase64()