Refactor

fanyu54 · Jun 20, 2023 · dd98134 · dd98134
1 parent 4da5dea
commit dd98134
Show file tree

Hide file tree

Showing 15 changed files with 1,366 additions and 1,365 deletions.
diff --git a/implant/sliver/cryptography/implant.go b/implant/sliver/cryptography/implant.go
@@ -30,13 +30,13 @@ import (
 
 var (
 	// PeerAgePublicKey - The implant's age public key
-	PeerAgePublicKey = "{{.Config.ECCPublicKey}}"
+	PeerAgePublicKey = "{{.Config.PeerPublicKey}}"
 	// peerPrivateKey - The implant's age private key
-	peerAgePrivateKey = "{{.Config.ECCPrivateKey}}"
+	peerAgePrivateKey = "{{.Config.PeerPrivateKey}}"
 	// PublicKeySignature - The implant's age public key minisigned'd
-	PeerAgePublicKeySignature = `{{.Config.ECCPublicKeySignature}}`
+	PeerAgePublicKeySignature = `{{.Config.PeerPublicKeySignature}}`
 	// serverPublicKey - Server's ECC public key
-	serverAgePublicKey = "{{.Config.ECCServerPublicKey}}"
+	serverAgePublicKey = "{{.Config.AgeServerPublicKey}}"
 	// serverMinisignPublicKey - The server's minisign public key
 	serverMinisignPublicKey = `{{.Config.MinisignServerPublicKey}}`
 

diff --git a/protobuf/clientpb/client.pb.go b/protobuf/clientpb/client.pb.go
diff --git a/protobuf/clientpb/client.proto b/protobuf/clientpb/client.proto
@@ -142,10 +142,10 @@ message ImplantConfig {
   string MtlsCert = 21;
   string MtlsKey = 22;
 
-  string ECCServerPublicKey = 23;
-  string ECCPublicKey = 24;
-  string ECCPrivateKey = 25;
-  string ECCPublicKeySignature = 26;
+  string AgeServerPublicKey = 23;
+  string PeerPublicKey = 24;
+  string PeerPrivateKey = 25;
+  string PeerPublicKeySignature = 26;
   string MinisignServerPublicKey = 27;
 
   string WGImplantPrivKey = 30;

diff --git a/protobuf/commonpb/common.pb.go b/protobuf/commonpb/common.pb.go
diff --git a/protobuf/dnspb/dns.pb.go b/protobuf/dnspb/dns.pb.go
diff --git a/protobuf/rpcpb/services.pb.go b/protobuf/rpcpb/services.pb.go
diff --git a/protobuf/rpcpb/services_grpc.pb.go b/protobuf/rpcpb/services_grpc.pb.go
diff --git a/protobuf/sliverpb/sliver.pb.go b/protobuf/sliverpb/sliver.pb.go
diff --git a/server/c2/c2_test.go b/server/c2/c2_test.go
@@ -60,11 +60,11 @@ func setup() *models.ImplantConfig {
 	publicKeyDigest := hex.EncodeToString(digest.Sum(nil))
 
 	implantConfig := &models.ImplantConfig{
-		ECCPublicKey:       peerAgeKeyPair.Public,
-		ECCPublicKeyDigest: publicKeyDigest,
-		ECCPrivateKey:      peerAgeKeyPair.Private,
+		PeerPublicKey:       peerAgeKeyPair.Public,
+		PeerPublicKeyDigest: publicKeyDigest,
+		PeerPrivateKey:      peerAgeKeyPair.Private,
 
-		ECCServerPublicKey: serverAgeKeyPair.Public,
+		AgeServerPublicKey: serverAgeKeyPair.Public,
 	}
 	err = db.Session().Create(implantConfig).Error
 	if err != nil {

diff --git a/server/c2/dns.go b/server/c2/dns.go
@@ -512,7 +512,7 @@ func (s *SliverDNSServer) handleDNSSessionInit(domain string, msg *dnspb.DNSMess
 	}
 
 	serverKeyPair := cryptography.AgeServerKeyPair()
-	sessionInit, err := cryptography.AgeKeyExFromImplant(serverKeyPair.Private, implantConfig.ECCPrivateKey, msg.Data[32:])
+	sessionInit, err := cryptography.AgeKeyExFromImplant(serverKeyPair.Private, implantConfig.PeerPrivateKey, msg.Data[32:])
 	if err != nil {
 		dnsLog.Errorf("[session init] error decrypting session init data: %s", err)
 		return s.refusedErrorResp(req)

diff --git a/server/c2/http.go b/server/c2/http.go
@@ -528,7 +528,7 @@ func (s *SliverHTTPC2) startSessionHandler(resp http.ResponseWriter, req *http.R
 	}
 
 	serverKeyPair := cryptography.AgeServerKeyPair()
-	sessionInitData, err := cryptography.AgeKeyExFromImplant(serverKeyPair.Private, implantConfig.ECCPrivateKey, data[32:])
+	sessionInitData, err := cryptography.AgeKeyExFromImplant(serverKeyPair.Private, implantConfig.PeerPrivateKey, data[32:])
 	if err != nil {
 		httpLog.Error("age key exchange decryption failed")
 		s.defaultHandler(resp, req)

diff --git a/server/db/helpers.go b/server/db/helpers.go
@@ -90,7 +90,7 @@ func ImplantConfigWithC2sByID(id string) (*models.ImplantConfig, error) {
 func ImplantConfigByECCPublicKeyDigest(publicKeyDigest [32]byte) (*models.ImplantConfig, error) {
 	config := models.ImplantConfig{}
 	err := Session().Where(&models.ImplantConfig{
-		ECCPublicKeyDigest: hex.EncodeToString(publicKeyDigest[:]),
+		PeerPublicKeyDigest: hex.EncodeToString(publicKeyDigest[:]),
 	}).First(&config).Error
 	if err != nil {
 		return nil, err

diff --git a/server/db/models/implant.go b/server/db/models/implant.go
@@ -75,11 +75,11 @@ type ImplantConfig struct {
 	BeaconJitter   int64
 
 	// ECC
-	ECCPublicKey            string
-	ECCPublicKeyDigest      string
-	ECCPrivateKey           string
-	ECCPublicKeySignature   string
-	ECCServerPublicKey      string
+	PeerPublicKey           string
+	PeerPublicKeyDigest     string
+	PeerPrivateKey          string
+	PeerPublicKeySignature  string
+	AgeServerPublicKey      string
 	MinisignServerPublicKey string
 
 	// MTLS
@@ -159,9 +159,9 @@ func (ic *ImplantConfig) ToProtobuf() *clientpb.ImplantConfig {
 
 		GOOS:               ic.GOOS,
 		GOARCH:             ic.GOARCH,
-		ECCServerPublicKey: ic.ECCServerPublicKey,
-		ECCPublicKey:       ic.ECCPublicKey,
-		ECCPrivateKey:      ic.ECCPrivateKey,
+		AgeServerPublicKey: ic.AgeServerPublicKey,
+		PeerPublicKey:      ic.PeerPublicKey,
+		PeerPrivateKey:     ic.PeerPrivateKey,
 		MtlsCACert:         ic.MtlsCACert,
 		MtlsCert:           ic.MtlsCert,
 		MtlsKey:            ic.MtlsKey,

diff --git a/server/generate/binaries.go b/server/generate/binaries.go
@@ -147,9 +147,9 @@ func ImplantConfigFromProtobuf(pbConfig *clientpb.ImplantConfig) (string, *model
 	cfg.BeaconInterval = pbConfig.BeaconInterval
 	cfg.BeaconJitter = pbConfig.BeaconJitter
 
-	cfg.ECCServerPublicKey = pbConfig.ECCServerPublicKey
-	cfg.ECCPrivateKey = pbConfig.ECCPrivateKey
-	cfg.ECCPublicKey = pbConfig.ECCPublicKey
+	cfg.AgeServerPublicKey = pbConfig.AgeServerPublicKey
+	cfg.PeerPrivateKey = pbConfig.PeerPrivateKey
+	cfg.PeerPublicKey = pbConfig.PeerPublicKey
 
 	cfg.GOOS = pbConfig.GOOS
 	cfg.GOARCH = pbConfig.GOARCH
@@ -777,11 +777,11 @@ func GenerateConfig(name string, config *models.ImplantConfig, save bool) error
 	}
 	serverKeyPair := cryptography.AgeServerKeyPair()
 	digest := sha256.Sum256([]byte(implantKeyPair.Public))
-	config.ECCPublicKey = implantKeyPair.Public
-	config.ECCPublicKeyDigest = hex.EncodeToString(digest[:])
-	config.ECCPrivateKey = implantKeyPair.Private
-	config.ECCPublicKeySignature = cryptography.MinisignServerSign([]byte(implantKeyPair.Public))
-	config.ECCServerPublicKey = serverKeyPair.Public
+	config.PeerPublicKey = implantKeyPair.Public
+	config.PeerPublicKeyDigest = hex.EncodeToString(digest[:])
+	config.PeerPrivateKey = implantKeyPair.Private
+	config.PeerPublicKeySignature = cryptography.MinisignServerSign([]byte(implantKeyPair.Public))
+	config.AgeServerPublicKey = serverKeyPair.Public
 	config.MinisignServerPublicKey = cryptography.MinisignServerPublicKey()
 
 	// MTLS keys

diff --git a/server/handlers/pivot.go b/server/handlers/pivot.go
@@ -210,7 +210,7 @@ func serverKeyExchange(implantConn *core.ImplantConnection, peerEnvelope *sliver
 		pivotLog.Warn("Unknown public key digest")
 		return nil
 	}
-	publicKey, err := base64.RawStdEncoding.DecodeString(implantConfig.ECCPublicKey)
+	publicKey, err := base64.RawStdEncoding.DecodeString(implantConfig.PeerPublicKey)
 	if err != nil || len(publicKey) != 32 {
 		pivotLog.Warn("Failed to decode public key")
 		return nil