Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

serve s3: stop auth proxy users listing or using each other's multipart uploads GHSA-35g6-9fjv-rmx5 CVE-PENDING

Nick Craig-Wood32b08f023722
diff --git a/cmd/serve/s3/backend.go b/cmd/serve/s3/backend.go
index e38d65124..58a9136bf 100644
--- a/cmd/serve/s3/backend.go
+++ b/cmd/serve/s3/backend.go
@@ -131,6 +131,11 @@ func (b *s3Backend) allTenants() []*tenant {
return slices.Collect(maps.Values(b.tenants))
}
+// context returns a context for requests made on behalf of t.
+func (t *tenant) context() context.Context {
+ return context.WithValue(context.Background(), ctxKeyAccessKeyID, t.id)
+}
+
// getMeta returns the stored metadata of the object at fp.
func (t *tenant) getMeta(fp string) (meta map[string]string, ok bool) {
return t.b.meta.Get(metaKey{tenant: t.id, fp: fp})
diff --git a/cmd/serve/s3/multipart.go b/cmd/serve/s3/multipart.go
index 1a833a677..ce37b10ed 100644
--- a/cmd/serve/s3/multipart.go
+++ b/cmd/serve/s3/multipart.go
@@ -919,7 +919,7 @@ func (b *s3Backend) forgetUpload(uploadID gofakes3.UploadID, up *multipartUpload
}
b.discardUpload(up)
// gofakes3 doesn't know the upload has gone, so tell it
- _ = b.s.faker.ForgetMultipartUpload(up.bucket, up.key, uploadID)
+ _ = b.s.faker.ForgetMultipartUpload(up.tenant.context(), up.bucket, up.key, uploadID)
}
// startReaper starts a goroutine which aborts incomplete multipart
diff --git a/cmd/serve/s3/s3_test.go b/cmd/serve/s3/s3_test.go
index 6bca830e5..b392c6b52 100644
--- a/cmd/serve/s3/s3_test.go
+++ b/cmd/serve/s3/s3_test.go
@@ -432,10 +432,10 @@ func TestAuthProxyKeysNotRegistered(t *testing.T) {
assert.NotEqual(t, signature.ErrNone, signature.V4SignVerify(sign()), "proxy secret was registered in the gofakes3 key store")
}
-// serveS3AuthProxy serves root over s3 with an auth proxy which maps
-// every one of users (access key IDs) to root, returning a client for
-// each user.
-func serveS3AuthProxy(t *testing.T, root string, users ...string) map[string]*minio.Core {
+// serveS3AuthProxy serves root over s3 with opt and an auth proxy which
+// maps every one of users (access key IDs) to root, returning a client
+// for each user.
+func serveS3AuthProxy(t *testing.T, root string, opt Options, users ...string) map[string]*minio.Core {
fstest.Initialise()
prog, err := filepath.Abs("../servetest/proxy_code.go")
require.NoError(t, err)
@@ -447,7 +447,6 @@ func serveS3AuthProxy(t *testing.T, root string, users ...string) map[string]*mi
}
t.Setenv("RCLONE_TEST_PROXY_AUTH_KEY", strings.Join(pairs, ";"))
- opt := Opt
opt.HTTP.ListenAddr = []string{endpoint}
proxyOpt := proxy.Opt
proxyOpt.AuthProxy = "go run " + prog + " " + root
@@ -474,15 +473,40 @@ func serveS3AuthProxy(t *testing.T, root string, users ...string) map[string]*mi
// another user's multipart upload or see the metadata of their objects,
// even when both are mapped to the same backend.
func TestAuthProxyUsersKeptApart(t *testing.T) {
+ for _, disableStreaming := range []bool{false, true} {
+ t.Run(fmt.Sprintf("DisableMultipartStreaming=%v", disableStreaming), func(t *testing.T) {
+ opt := Opt
+ opt.DisableMultipartStreaming = disableStreaming
+ testAuthProxyUsersKeptApart(t, opt)
+ })
+ }
+}
+
+func testAuthProxyUsersKeptApart(t *testing.T, opt Options) {
ctx := context.Background()
root := t.TempDir()
const bucket = "bucket"
require.NoError(t, os.Mkdir(filepath.Join(root, bucket), 0777))
- clients := serveS3AuthProxy(t, root, "alice", "bob")
+ clients := serveS3AuthProxy(t, root, opt, "alice", "bob")
alice, bob := clients["alice"], clients["bob"]
uploadID, err := alice.NewMultipartUpload(ctx, bucket, "upload", minio.PutObjectOptions{})
require.NoError(t, err)
+ listed := func(client *minio.Core) (uploadIDs []string) {
+ result, err := client.ListMultipartUploads(ctx, bucket, "", "", "", "/", 1000)
+ if minio.ToErrorResponse(err).Code == "NoSuchUpload" {
+ return nil
+ }
+ require.NoError(t, err)
+ for _, upload := range result.Uploads {
+ uploadIDs = append(uploadIDs, upload.UploadID)
+ }
+ return uploadIDs
+ }
+ assert.Equal(t, []string{uploadID}, listed(alice))
+ assert.Empty(t, listed(bob), "bob listing alice's upload")
+ _, err = bob.ListObjectParts(ctx, bucket, "upload", uploadID, 0, 1000)
+ assert.Equal(t, "NoSuchUpload", minio.ToErrorResponse(err).Code, "bob listing the parts of alice's upload")
data := []byte("alice's data")
_, err = bob.PutObjectPart(ctx, bucket, "upload", uploadID, 1, bytes.NewReader(data), int64(len(data)), minio.PutObjectPartOptions{})
assert.Equal(t, "NoSuchUpload", minio.ToErrorResponse(err).Code, "bob uploading a part to alice's upload")
diff --git a/cmd/serve/s3/server.go b/cmd/serve/s3/server.go
index 0b48c3a2e..fc9f0898f 100644
--- a/cmd/serve/s3/server.go
+++ b/cmd/serve/s3/server.go
@@ -97,6 +97,7 @@ func newServer(ctx context.Context, f fs.Fs, opt *Options, vfsOpt *vfscommon.Opt
gofakes3.WithoutVersioning(),
gofakes3.WithV4Auth(authList),
gofakes3.WithIntegrityCheck(true), // Check Content-MD5 if supplied
+ gofakes3.WithUploadOwner(w.getTenant),
)
// The reaper uses w.faker so must start after it is set
if w.opt.MultipartExpiry > 0 {
diff --git a/go.mod b/go.mod
index 560743e4e..16954bd9a 100644
--- a/go.mod
+++ b/go.mod
@@ -75,7 +75,7 @@ require (
github.com/quasilyte/go-ruleguard/dsl v0.3.23
github.com/rclone/Proton-API-Bridge v1.0.5
github.com/rclone/go-proton-api v1.0.4
- github.com/rclone/gofakes3 v0.0.10-0.20260919171726-8edbb055e5ec
+ github.com/rclone/gofakes3 v0.0.10-0.20260923152001-4a6b9490d9c0
github.com/rfjakob/eme v1.2.0
github.com/rivo/uniseg v0.4.7
github.com/rogpeppe/go-internal v1.15.0
diff --git a/go.sum b/go.sum
index f602c442a..ca77054f6 100644
--- a/go.sum
+++ b/go.sum
@@ -496,6 +496,8 @@ github.com/rclone/go-proton-api v1.0.4 h1:AJW0e9pB4j0hVK4WqyGErFwaI+5MUQWPCtj5FY
github.com/rclone/go-proton-api v1.0.4/go.mod h1:QAlkFfswzrBuxvCORWV8rZdddg52hahMN98CFWoFW1E=
github.com/rclone/gofakes3 v0.0.10-0.20260919171726-8edbb055e5ec h1:6JAnhUd7+U6wWrS14qpWnhNXWD/xtxNd8qVwyNvjflw=
github.com/rclone/gofakes3 v0.0.10-0.20260919171726-8edbb055e5ec/go.mod h1:0udb2hmIO9mHXDAgcdycCzSPPASAGIz410t+m0LKmnE=
+github.com/rclone/gofakes3 v0.0.10-0.20260923152001-4a6b9490d9c0 h1:RrKcq7t/Ta43Ua9ABr+0SbLlsYH84XyExA6rVSVrqY8=
+github.com/rclone/gofakes3 v0.0.10-0.20260923152001-4a6b9490d9c0/go.mod h1:0udb2hmIO9mHXDAgcdycCzSPPASAGIz410t+m0LKmnE=
github.com/relvacode/iso8601 v1.7.0 h1:BXy+V60stMP6cpswc+a93Mq3e65PfXCgDFfhvNNGrdo=
github.com/relvacode/iso8601 v1.7.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I=
github.com/rfjakob/eme v1.2.0 h1:8dAHL+WVAw06+7DkRKnRiFp1JL3QjcJEZFqDnndUaSI=