"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 restic: fix path traversal above the served directory GHSA-45pq-889g-fcgh CVE-PENDING
Nick Craig-Woodcc5a189f00ef
diff --git a/cmd/serve/restic/restic.go b/cmd/serve/restic/restic.goindex db7c16586..4a2ed7e16 100644--- a/cmd/serve/restic/restic.go+++ b/cmd/serve/restic/restic.go@@ -6,6 +6,7 @@ import ("encoding/json""errors""fmt"+ iofs "io/fs""net""net/http""os"@@ -243,9 +244,14 @@ func WithRemote(next http.Handler) http.Handler {urlpath = r.URL.Path}urlpath = strings.Trim(urlpath, "/")- // Reject any non-canonical path, in particular one containing ".."- // traversal elements.- if urlpath != "" && path.Clean(urlpath) != urlpath {+ // Reject anything which isn't a canonical relative path free of "."+ // and ".." elements. The backends join the path with the Fs root, so+ // such elements could otherwise address objects outside it.+ //+ // The empty path is the root of the API so is allowed. "." is not a+ // valid object name here, even though iofs.ValidPath accepts it as+ // the root of an FS.+ if urlpath != "" && (urlpath == "." || !iofs.ValidPath(urlpath)) {http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)return}diff --git a/cmd/serve/restic/restic_traversal_test.go b/cmd/serve/restic/restic_traversal_test.gonew file mode 100644index 000000000..db1a7092c--- /dev/null+++ b/cmd/serve/restic/restic_traversal_test.go@@ -0,0 +1,76 @@+package restic++import (+ "context"+ "io"+ "net/http"+ "strings"+ "testing"+ "time"++ _ "github.com/rclone/rclone/backend/memory"+ "github.com/rclone/rclone/cmd"+ "github.com/rclone/rclone/fs"+ "github.com/rclone/rclone/fs/operations"+ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++// TestResticPathTraversal checks that request paths with "." or ".."+// components are rejected before they reach the backend, so they can't be+// joined with the Fs root to reach objects outside the directory served.+//+// The memory backend is used because it resolves ".." by joining paths,+// unlike the local backend which encodes the components as file names.+func TestResticPathTraversal(t *testing.T) {+ ctx := context.Background()++ // outside is the parent of the directory served and holds an object+ // which must stay unreachable through the server.+ outside := cmd.NewFsSrc([]string{":memory:traversal-test"})+ _, err := operations.Rcat(ctx, outside, "outside-secret.txt", io.NopCloser(strings.NewReader("SECRET")), time.Now(), nil)+ require.NoError(t, err)++ f := cmd.NewFsSrc([]string{":memory:traversal-test/served-root"})+ _, err = operations.Rcat(ctx, f, "inside.txt", io.NopCloser(strings.NewReader("INSIDE")), time.Now(), nil)+ require.NoError(t, err)++ opt := newOpt()+ s, err := newServer(ctx, f, &opt)+ require.NoError(t, err)+ router := s.server.Router()++ // A path inside the served root is unaffected+ checkRequest(t, router.ServeHTTP,+ newRequest(t, "GET", "/inside.txt", nil),+ []wantFunc{wantCode(http.StatusOK), wantBody("INSIDE")})++ for _, urlpath := range []string{+ "..",+ "../",+ "../../",+ "../outside-secret.txt",+ "../../outside-secret.txt",+ "%2e%2e/outside-secret.txt",+ "../outside-write.txt",+ "a/../outside-secret.txt",+ "a/../../outside-secret.txt",+ ".",+ "./inside.txt",+ } {+ for _, method := range []string{"GET", "HEAD", "POST", "DELETE"} {+ t.Run(method+" /"+urlpath, func(t *testing.T) {+ req := newRequest(t, method, "/"+urlpath, strings.NewReader("EVIL"))+ checkRequest(t, router.ServeHTTP, req, []wantFunc{wantCode(http.StatusBadRequest)})+ })+ }+ }++ // The object outside the served root was neither read nor modified, and+ // no new object was created next to it.+ o, err := outside.NewObject(ctx, "outside-secret.txt")+ require.NoError(t, err)+ assert.Equal(t, int64(len("SECRET")), o.Size())+ _, err = outside.NewObject(ctx, "outside-write.txt")+ assert.Equal(t, fs.ErrorObjectNotFound, err)+}