gitserver: protobuf: relax ArchiveRequest path fields to be bytes i…

…nstead of `string` (#61970)

commit-id:582a4b96
(cherry picked from commit 6a0c465)

cmd/gitserver/internal/server_grpc.go

@@ -260,7 +260,7 @@ func (gs *grpcServer) Archive(req *proto.ArchiveRequest, ss proto.GitserverServi
 	accesslog.Record(ctx, req.GetRepo(),
 		log.String("treeish", req.GetTreeish()),
 		log.String("format", string(format)),
-		log.Strings("path", req.GetPaths()),
+		log.Strings("path", byteSlicesToStrings(req.GetPaths())),
 	)
 
 	repoName := api.RepoName(req.GetRepo())
@@ -289,7 +289,7 @@ func (gs *grpcServer) Archive(req *proto.ArchiveRequest, ss proto.GitserverServi
 
 	backend := gs.getBackendFunc(repoDir, repoName)
 
-	r, err := backend.ArchiveReader(ctx, format, req.GetTreeish(), req.GetPaths())
+	r, err := backend.ArchiveReader(ctx, format, req.GetTreeish(), byteSlicesToStrings(req.GetPaths()))
 	if err != nil {
 		if os.IsNotExist(err) {
 			var path string

internal/gitserver/client.go

@@ -257,9 +257,17 @@ type CommitLog struct {
 
 // ArchiveOptions contains options for the Archive func.
 type ArchiveOptions struct {
-	Treeish string        // the tree or commit to produce an archive for
-	Format  ArchiveFormat // format of the resulting archive (usually "tar" or "zip")
-	Paths   []string      // if nonempty, only include these paths.
+	// Treeish is the tree or commit to produce an archive for
+	Treeish string
+	// Format is the format of the resulting archive (usually "tar" or "zip")
+	Format ArchiveFormat
+	// Paths is a list of paths to include in the archive. If empty, the entire
+	// repository is included.
+	//
+	// Note: The Path strings are not guaranteed to be UTF-8 encoded, as file paths
+	// on Linux can be arbitrary byte sequences. Users should take care to validate / sanitize
+	// paths if necessary.
+	Paths []string
 }
 
 func (a *ArchiveOptions) Attrs() []attribute.KeyValue {
@@ -275,19 +283,31 @@ func (a *ArchiveOptions) Attrs() []attribute.KeyValue {
 }
 
 func (o *ArchiveOptions) FromProto(x *proto.ArchiveRequest) {
+	protoPaths := x.GetPaths()
+
+	paths := make([]string, len(protoPaths))
+	for i, p := range protoPaths {
+		paths[i] = string(p)
+	}
+
 	*o = ArchiveOptions{
 		Treeish: x.GetTreeish(),
 		Format:  ArchiveFormatFromProto(x.GetFormat()),
-		Paths:   x.GetPaths(),
+		Paths:   paths,
 	}
 }
 
 func (o *ArchiveOptions) ToProto(repo string) *proto.ArchiveRequest {
+	paths := make([][]byte, len(o.Paths))
+	for i, p := range o.Paths {
+		paths[i] = []byte(p)
+	}
+
 	return &proto.ArchiveRequest{
 		Repo:    repo,
 		Treeish: o.Treeish,
 		Format:  o.Format.ToProto(),
-		Paths:   o.Paths,
+		Paths:   paths,
 	}
 }
 

internal/gitserver/v1/gitserver.proto

@@ -575,7 +575,7 @@ message ArchiveRequest {
   ArchiveFormat format = 3;
   // paths is the list of paths to include in the archive. If empty, all
   // paths are included.
-  repeated string paths = 4;
+  repeated bytes paths = 4;
 }
 
 // ArchiveResponse is the response from the Archive RPC that returns a chunk of