filesync: fix handling non-ascii in file paths

Signed-off-by: Tonis Tiigi <[email protected]>

Author: tonistiigi

session/filesync/filesync.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"fmt"
 	io "io"
+	"net/url"
 	"os"
 	"strings"
+	"unicode"
 
 	"github.com/moby/buildkit/session"
 	"github.com/pkg/errors"
@@ -82,6 +84,7 @@ func (sp *fsSyncProvider) handle(method string, stream grpc.ServerStream) (retEr
 	}
 
 	opts, _ := metadata.FromIncomingContext(stream.Context()) // if no metadata continue with empty object
+	opts = decodeOpts(opts)
 
 	dirName := ""
 	name, ok := opts[keyDirName]
@@ -209,6 +212,8 @@ func FSSync(ctx context.Context, c session.Caller, opt FSSendRequestOpt) error {
 
 	var stream grpc.ClientStream
 
+	opts = encodeOpts(opts)
+
 	ctx = metadata.NewOutgoingContext(ctx, opts)
 
 	switch pr.name {
@@ -337,3 +342,44 @@ func (e InvalidSessionError) Error() string {
 func (e InvalidSessionError) Unwrap() error {
 	return e.err
 }
+
+func encodeOpts(opts map[string][]string) map[string][]string {
+	md := make(map[string][]string, len(opts))
+	for k, v := range opts {
+		out := make([]string, len(v))
+		for i, s := range v {
+			out[i] = encodeStringForHeader(s)
+		}
+		md[k] = out
+	}
+	return md
+}
+
+func decodeOpts(opts map[string][]string) map[string][]string {
+	md := make(map[string][]string, len(opts))
+	for k, v := range opts {
+		out := make([]string, len(v))
+		for i, s := range v {
+			out[i], _ = url.QueryUnescape(s)
+		}
+		md[k] = out
+	}
+	return md
+}
+
+// encodeStringForHeader encodes a string value so it can be used in grpc header. This encoding
+// is backwards compatible and avoids encoding ASCII characters.
+func encodeStringForHeader(input string) string {
+	var output strings.Builder
+	for _, runeVal := range input {
+		// Only encode non-ASCII characters.
+		if runeVal > unicode.MaxASCII {
+			// Encode each non-ASCII character individually.
+			output.WriteString(url.QueryEscape(string(runeVal)))
+		} else {
+			// Directly append ASCII characters and '*' to the output.
+			output.WriteRune(runeVal)
+		}
+	}
+	return output.String()
+}