Merge pull request #1699 from BishopFox/fix_externalbuild_encoderids

send encoder id's to external server during external implant generation
BishopFox · May 22, 2024 · a0706ff · a0706ff
2 parents 292f41c + 550700d
commit a0706ff
Show file tree

Hide file tree

Showing 9 changed files with 2,186 additions and 1,962 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
@@ -225,6 +225,7 @@ message ExternalImplantConfig {
   ImplantConfig Config = 1;
   ImplantBuild Build = 2;
   HTTPC2Config HTTPC2 = 3;
+  map<string, uint64> encoders = 4;
 }
 
 message ExternalImplantBinary {

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/builder/builder.go b/server/builder/builder.go
@@ -33,6 +33,7 @@ import (
 	"github.com/bishopfox/sliver/protobuf/rpcpb"
 	"github.com/bishopfox/sliver/server/db"
 	"github.com/bishopfox/sliver/server/db/models"
+	"github.com/bishopfox/sliver/server/encoders"
 	"github.com/bishopfox/sliver/server/generate"
 	"github.com/bishopfox/sliver/server/log"
 	"google.golang.org/grpc"
@@ -188,6 +189,13 @@ func (b *Builder) handleBuildEvent(event *clientpb.Event) {
 		})
 		return
 	}
+	encoders.Base32EncoderID = extConfig.Encoders["base32"]
+	encoders.Base58EncoderID = extConfig.Encoders["base58"]
+	encoders.Base64EncoderID = extConfig.Encoders["base64"]
+	encoders.EnglishEncoderID = extConfig.Encoders["english"]
+	encoders.GzipEncoderID = extConfig.Encoders["gzip"]
+	encoders.HexEncoderID = extConfig.Encoders["hex"]
+	encoders.PNGEncoderID = extConfig.Encoders["png"]
 
 	var fPath string
 	switch extConfig.Config.Format {

diff --git a/server/rpc/rpc-generate.go b/server/rpc/rpc-generate.go
@@ -417,10 +417,21 @@ func (rpc *Server) GenerateExternalGetBuildConfig(ctx context.Context, req *clie
 		return nil, status.Error(codes.Internal, fmt.Sprintf("Unable to load HTTP C2 Configuration: %s", err))
 	}
 
+	encoders := map[string]uint64{
+		"base64":  encoders.Base64EncoderID,
+		"base58":  encoders.Base58EncoderID,
+		"base32":  encoders.Base32EncoderID,
+		"hex":     encoders.HexEncoderID,
+		"english": encoders.EnglishEncoderID,
+		"gzip":    encoders.GzipEncoderID,
+		"png":     encoders.PNGEncoderID,
+	}
+
 	return &clientpb.ExternalImplantConfig{
-		Config: implantConfig,
-		Build:  build,
-		HTTPC2: httpC2Config,
+		Config:   implantConfig,
+		Build:    build,
+		HTTPC2:   httpC2Config,
+		Encoders: encoders,
 	}, nil
 }