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: fix crash when a multipart upload is aborted while a part is uploading

Nick Craig-Wood531d873bd710
diff --git a/cmd/serve/s3/multipart.go b/cmd/serve/s3/multipart.go
index f3211341a..aa17a71ef 100644
--- a/cmd/serve/s3/multipart.go
+++ b/cmd/serve/s3/multipart.go
@@ -265,6 +265,15 @@ func (up *multipartUpload) release(size int64) {
// one is rejected.
func (up *multipartUpload) streamPart(partNumber int, size int64, md5Sum []byte, rw *pool.RW) error {
up.mu.Lock()
+ if up.closed {
+ // The upload was aborted or completed while the part body was
+ // being received.
+ up.buffered -= size
+ up.cond.Broadcast()
+ up.mu.Unlock()
+ _ = rw.Close()
+ return gofakes3.ErrNoSuchUpload
+ }
if oldMD5, exists := up.partMD5s[partNumber]; exists {
if old, buffered := up.streamBuf[partNumber]; buffered {
_ = old.Close()
diff --git a/cmd/serve/s3/multipart_test.go b/cmd/serve/s3/multipart_test.go
index 2807e4074..f54605d11 100644
--- a/cmd/serve/s3/multipart_test.go
+++ b/cmd/serve/s3/multipart_test.go
@@ -5,6 +5,7 @@ package s3
import (
"bytes"
"context"
+ "crypto/md5"
"fmt"
"io"
"net/url"
@@ -16,10 +17,12 @@ import (
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
+ "github.com/rclone/gofakes3"
_ "github.com/rclone/rclone/backend/memory"
"github.com/rclone/rclone/cmd/serve/proxy"
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fstest"
+ "github.com/rclone/rclone/lib/multipart"
"github.com/rclone/rclone/lib/random"
"github.com/rclone/rclone/vfs"
"github.com/rclone/rclone/vfs/vfscommon"
@@ -448,6 +451,47 @@ func TestMultipartBufferLimit(t *testing.T) {
assert.Equal(t, want, readObject(t, f, bucket, object))
}
+// TestMultipartAbortDuringUploadPart aborts the upload between a part's
+// waitForTurn and its streamPart - as happens when the abort arrives while
+// the part body is still being received from the client - and checks that
+// streamPart fails cleanly instead of panicking on the torn-down upload.
+func TestMultipartAbortDuringUploadPart(t *testing.T) {
+ up := newMultipartUpload("bucket", "key", "bucket/key", "bucket/key", nil, 0)
+
+ // Mimic CreateMultipartUpload's background PutStream with a stub consumer.
+ pr, pw := io.Pipe()
+ _, cancel := context.WithCancel(context.Background())
+ defer cancel()
+ up.pipeW = pw
+ up.putCancel = cancel
+ up.putDone = make(chan struct{})
+ go func() {
+ _, err := io.Copy(io.Discard, pr)
+ up.putErr = err
+ _ = pr.CloseWithError(err)
+ close(up.putDone)
+ }()
+
+ // An UploadPart in progress: the part is admitted, then the abort lands
+ // while its body is still being received.
+ contents := []byte("hello")
+ require.NoError(t, up.waitForTurn(1, int64(len(contents))))
+ require.NoError(t, up.abort(context.Background()))
+
+ // The UploadPart resumes: it buffers the part and calls streamPart.
+ rw := multipart.NewRW()
+ _, err := rw.Write(contents)
+ require.NoError(t, err)
+ md5Sum := md5.Sum(contents)
+ err = up.streamPart(1, int64(len(contents)), md5Sum[:], rw)
+ require.ErrorIs(t, err, gofakes3.ErrNoSuchUpload)
+
+ // The reorder buffer reservation must have been returned
+ up.mu.Lock()
+ assert.Equal(t, int64(0), up.buffered)
+ up.mu.Unlock()
+}
+
// TestMultipartOverwrite checks that a completed multipart upload atomically
// replaces an existing object of the same name.
func TestMultipartOverwrite(t *testing.T) {