vfs: fix cache encoding with special characters

rclone · Apr 23, 2024 · af1a956 · af1a956
1 parent 2d4eba1
commit af1a956
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 32 deletions.
diff --git a/backend/local/local.go b/backend/local/local.go
@@ -689,6 +689,11 @@ func (f *Fs) localPath(name string) string {
 	return filepath.Join(f.root, filepath.FromSlash(f.opt.Enc.FromStandardPath(name)))
 }
 
+// LocalToStandardPath coverts the file name in the local filesystem to StandardPath with the user specified encoding
+func (f *Fs) LocalToStandardPath(name string) string {
+	return f.opt.Enc.ToStandardPath(filepath.ToSlash(name))
+}
+
 // Put the Object to the local filesystem
 func (f *Fs) Put(ctx context.Context, in io.Reader, src fs.ObjectInfo, options ...fs.OpenOption) (fs.Object, error) {
 	// Temporary Object under construction - info filled in by Update()

diff --git a/lib/encoder/encoder.go b/lib/encoder/encoder.go
@@ -35,35 +35,35 @@ const (
 
 // Possible flags for the MultiEncoder
 const (
-	EncodeRaw       MultiEncoder = 0
-	EncodeZero      MultiEncoder = 1 << (iota-1) // NUL(0x00)
-	EncodeSlash                                  // /
-	EncodeLtGt                                   // <>
-	EncodeDoubleQuote                            // "
-	EncodeSingleQuote                            // '
-	EncodeBackQuote                              // `
-	EncodeDollar                                 // $
-	EncodeColon                                  // :
-	EncodeQuestion                               // ?
-	EncodeAsterisk                               // *
-	EncodePipe                                   // |
-	EncodeHash                                   // #
-	EncodePercent                                // %
-	EncodeBackSlash                              // \
-	EncodeCrLf                                   // CR(0x0D), LF(0x0A)
-	EncodeDel                                    // DEL(0x7F)
-	EncodeCtl                                    // CTRL(0x01-0x1F)
-	EncodeLeftSpace                              // Leading SPACE
-	EncodeLeftPeriod                             // Leading .
-	EncodeLeftTilde                              // Leading ~
-	EncodeLeftCrLfHtVt                           // Leading CR LF HT VT
-	EncodeRightSpace                             // Trailing SPACE
-	EncodeRightPeriod                            // Trailing .
-	EncodeRightCrLfHtVt                          // Trailing CR LF HT VT
-	EncodeInvalidUtf8                            // Invalid UTF-8 bytes
-	EncodeDot                                    // . and .. names
-	EncodeSquareBracket                          // []
-	EncodeSemicolon                              // ;
+	EncodeRaw           MultiEncoder = 0
+	EncodeZero          MultiEncoder = 1 << (iota - 1) // NUL(0x00)
+	EncodeSlash                                        // /
+	EncodeLtGt                                         // <>
+	EncodeDoubleQuote                                  // "
+	EncodeSingleQuote                                  // '
+	EncodeBackQuote                                    // `
+	EncodeDollar                                       // $
+	EncodeColon                                        // :
+	EncodeQuestion                                     // ?
+	EncodeAsterisk                                     // *
+	EncodePipe                                         // |
+	EncodeHash                                         // #
+	EncodePercent                                      // %
+	EncodeBackSlash                                    // \
+	EncodeCrLf                                         // CR(0x0D), LF(0x0A)
+	EncodeDel                                          // DEL(0x7F)
+	EncodeCtl                                          // CTRL(0x01-0x1F)
+	EncodeLeftSpace                                    // Leading SPACE
+	EncodeLeftPeriod                                   // Leading .
+	EncodeLeftTilde                                    // Leading ~
+	EncodeLeftCrLfHtVt                                 // Leading CR LF HT VT
+	EncodeRightSpace                                   // Trailing SPACE
+	EncodeRightPeriod                                  // Trailing .
+	EncodeRightCrLfHtVt                                // Trailing CR LF HT VT
+	EncodeInvalidUtf8                                  // Invalid UTF-8 bytes
+	EncodeDot                                          // . and .. names
+	EncodeSquareBracket                                // []
+	EncodeSemicolon                                    // ;
 
 	// Synthetic
 	EncodeWin         = EncodeColon | EncodeQuestion | EncodeDoubleQuote | EncodeAsterisk | EncodeLtGt | EncodePipe // :?"*<>|

diff --git a/lib/encoder/internal/gen/main.go b/lib/encoder/internal/gen/main.go
@@ -229,8 +229,8 @@ func main() {
 			fatalW(fd.WriteString(" "))("Write:")
 		}
 		in, out := buildTestString(
-			[]mapping{getMapping(m.mask)},                               // pick
-			[]mapping{getMapping(encoder.EncodeZero)},                   // quote
+			[]mapping{getMapping(m.mask)},             // pick
+			[]mapping{getMapping(encoder.EncodeZero)}, // quote
 			printables, fullwidthPrintables, encodables, encoded, greek) // fill
 		fatalW(fmt.Fprintf(fd, `{ // %d
 		mask: %s,

diff --git a/vfs/vfscache/item.go b/vfs/vfscache/item.go
@@ -10,6 +10,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/rclone/rclone/backend/local"
 	"github.com/rclone/rclone/fs"
 	"github.com/rclone/rclone/fs/fserrors"
 	"github.com/rclone/rclone/fs/operations"
@@ -581,7 +582,7 @@ func (item *Item) _store(ctx context.Context, storeFn StoreFn) (err error) {
 	// defer log.Trace(item.name, "item=%p", item)("err=%v", &err)
 
 	// Transfer the temp file to the remote
-	cacheObj, err := item.c.fcache.NewObject(ctx, item.name)
+	cacheObj, err := item.c.fcache.NewObject(ctx, item.c.fcache.(*local.Fs).LocalToStandardPath(toOSPath(item.name)))
 	if err != nil && err != fs.ErrorObjectNotFound {
 		return fmt.Errorf("vfs cache: failed to find cache file: %w", err)
 	}