"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
serve nfs: change the format of --nfs-cache-type symlink file handles
Nick Craig-Woodfe84cbdc9df4
diff --git a/cmd/serve/nfs/symlink_cache_linux.go b/cmd/serve/nfs/symlink_cache_linux.goindex 0dbe42152..8002824ff 100644--- a/cmd/serve/nfs/symlink_cache_linux.go+++ b/cmd/serve/nfs/symlink_cache_linux.go@@ -27,6 +27,7 @@ package nfsimport ("bytes"+ "encoding/binary""errors""fmt""os"@@ -85,6 +86,31 @@ func (dh *diskHandler) makeSymlinkCache() error {return nil}+// Prefixes a []byte with its length as a 4-byte big-endian integer.+func addLengthPrefix(data []byte) []byte {+ length := uint32(len(data))+ buf := new(bytes.Buffer)+ err := binary.Write(buf, binary.BigEndian, length)+ if err != nil {+ // This should never fail+ panic(err)+ }+ buf.Write(data)+ return buf.Bytes()+}++// Removes the 4-byte big-endian length prefix from a []byte.+func removeLengthPrefix(data []byte) ([]byte, error) {+ if len(data) < 4 {+ return nil, errors.New("file handle too short")+ }+ length := binary.BigEndian.Uint32(data[:4])+ if int(length) != len(data)-4 {+ return nil, errors.New("file handle invalid length")+ }+ return data[4 : 4+length], nil+}+// Write the fullPath into cachePath returning the possibly updated fh//// This writes the fullPath into the file with the cachePath given and@@ -115,7 +141,8 @@ func (dh *diskHandler) symlinkCacheWrite(fh []byte, cachePath string, fullPath sdh.handleType = handle.Type()}- return handle.Bytes(), nil+ // Adjust the raw handle so it has a length prefix+ return addLengthPrefix(handle.Bytes()), nil}// Read the contents of (fh, cachePath)@@ -128,6 +155,12 @@ func (dh *diskHandler) symlinkCacheWrite(fh []byte, cachePath string, fullPath sfunc (dh *diskHandler) symlinkCacheRead(fh []byte, cachePath string) (fullPath []byte, err error) {//defer log.Trace(nil, "fh=%x, cachePath=%q", fh, cachePath)("fullPath=%q, err=%v", &fullPath, &err)+ // First check and remove the file handle prefix length+ fh, err = removeLengthPrefix(fh)+ if err != nil {+ return nil, fmt.Errorf("symlink cache open by handle at: %w", err)+ }+// Find the file with the handle passed inhandle := unix.NewFileHandle(dh.handleType, fh)fd, err := unix.OpenByHandleAt(unix.AT_FDCWD, handle, unix.O_RDONLY|unix.O_PATH|unix.O_NOFOLLOW) // needs O_PATH for symlinks