Merge pull request #1180 from MrAle98/fix/external-builder-config

fix implant configuration for external builders
BishopFox · Apr 5, 2023 · ec7e76f · ec7e76f
2 parents 54afc61 + 04e8104
commit ec7e76f
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 27 deletions.
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
@@ -137,10 +137,11 @@ message ImplantConfig {
   string MtlsCert = 21;
   string MtlsKey = 22;
 
-  string ECCPublicKey = 23;
-  string ECCPrivateKey = 24;
-  string ECCPublicKeySignature = 25;
-  string MinisignServerPublicKey = 26;
+  string ECCServerPublicKey = 23;
+  string ECCPublicKey = 24;
+  string ECCPrivateKey = 25;
+  string ECCPublicKeySignature = 26;
+  string MinisignServerPublicKey = 27;
 
   string WGImplantPrivKey = 30;
   string WGServerPubKey = 31;

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/db/models/implant.go b/server/db/models/implant.go
@@ -152,12 +152,14 @@ func (ic *ImplantConfig) ToProtobuf() *clientpb.ImplantConfig {
 		BeaconInterval: ic.BeaconInterval,
 		BeaconJitter:   ic.BeaconJitter,
 
-		GOOS:   ic.GOOS,
-		GOARCH: ic.GOARCH,
-
-		MtlsCACert: ic.MtlsCACert,
-		MtlsCert:   ic.MtlsCert,
-		MtlsKey:    ic.MtlsKey,
+		GOOS:               ic.GOOS,
+		GOARCH:             ic.GOARCH,
+		ECCServerPublicKey: ic.ECCServerPublicKey,
+		ECCPublicKey:       ic.ECCPublicKey,
+		ECCPrivateKey:      ic.ECCPrivateKey,
+		MtlsCACert:         ic.MtlsCACert,
+		MtlsCert:           ic.MtlsCert,
+		MtlsKey:            ic.MtlsKey,
 
 		Debug:            ic.Debug,
 		DebugFile:        ic.DebugFile,
@@ -188,7 +190,6 @@ func (ic *ImplantConfig) ToProtobuf() *clientpb.ImplantConfig {
 
 		FileName: ic.FileName,
 	}
-
 	// Copy Canary Domains
 	config.CanaryDomains = []string{}
 	for _, canaryDomain := range ic.CanaryDomains {

diff --git a/server/generate/binaries.go b/server/generate/binaries.go
@@ -142,6 +142,10 @@ 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.GOOS = pbConfig.GOOS
 	cfg.GOARCH = pbConfig.GOARCH
 	cfg.MtlsCACert = pbConfig.MtlsCACert