fix: make webdav put atomic

This commit is contained in:
OpenClaw Agent
2026-09-22 00:58:38 +08:00
parent 098d79c253
commit 0b57e776d3
2 changed files with 57 additions and 23 deletions
+14 -12
View File
@@ -1110,33 +1110,35 @@ func (f *webdavStorageFS) Create(ctx context.Context, name string, body io.ReadC
return nil, false, statErr return nil, false, statErr
} }
exclusive := opts != nil && opts.IfNoneMatch.IsWildcard() exclusive := opts != nil && opts.IfNoneMatch.IsWildcard()
var file *os.File
if exclusive { if exclusive {
file, err = createExclusive(f.store, p) file, createErr := createExclusive(f.store, p)
} else { if createErr != nil {
file, err = f.store.Create(p) if os.IsExist(createErr) {
}
if err != nil {
if exclusive && os.IsExist(err) {
return nil, false, webdav.NewHTTPError(http.StatusPreconditionFailed, fmt.Errorf("destination exists")) return nil, false, webdav.NewHTTPError(http.StatusPreconditionFailed, fmt.Errorf("destination exists"))
} }
return nil, false, err return nil, false, createErr
} }
_, copyErr := io.Copy(file, body) _, copyErr := io.Copy(file, body)
closeErr := file.Close() closeErr := file.Close()
body.Close() body.Close()
if copyErr != nil { if copyErr != nil {
if exclusive {
_ = f.store.Remove(p) _ = f.store.Remove(p)
}
return nil, false, copyErr return nil, false, copyErr
} }
if closeErr != nil { if closeErr != nil {
if exclusive {
_ = f.store.Remove(p) _ = f.store.Remove(p)
}
return nil, false, closeErr return nil, false, closeErr
} }
} else {
// Write into a sibling temporary file and atomically replace the
// destination only after the complete request body has been received.
// A failed PUT therefore cannot truncate or corrupt the old file.
if err := copyFileToDestination(f.store, body, p); err != nil {
body.Close()
return nil, false, err
}
body.Close()
}
fi, err := f.info(p) fi, err := f.info(p)
return fi, true, err return fi, true, err
} }
+32
View File
@@ -3,6 +3,7 @@ package api
import ( import (
"context" "context"
"errors" "errors"
"io"
"net/http/httptest" "net/http/httptest"
"os" "os"
"path/filepath" "path/filepath"
@@ -147,6 +148,10 @@ type failingReader struct{}
func (failingReader) Read([]byte) (int, error) { return 0, errors.New("source read failed") } func (failingReader) Read([]byte) (int, error) { return 0, errors.New("source read failed") }
type readCloser struct{ io.Reader }
func (r readCloser) Close() error { return nil }
func TestWebDAVStorageFSCopyFailureDoesNotCorruptDestination(t *testing.T) { func TestWebDAVStorageFSCopyFailureDoesNotCorruptDestination(t *testing.T) {
root := t.TempDir() root := t.TempDir()
store := storage.Local{Root: root} store := storage.Local{Root: root}
@@ -172,6 +177,33 @@ func TestWebDAVStorageFSCopyFailureDoesNotCorruptDestination(t *testing.T) {
} }
} }
func TestWebDAVStorageFSCreateFailureDoesNotCorruptDestination(t *testing.T) {
root := t.TempDir()
store := storage.Local{Root: root}
if err := os.WriteFile(filepath.Join(root, "dst.txt"), []byte("original"), 0o644); err != nil {
t.Fatal(err)
}
fs := &webdavStorageFS{store: store}
_, _, err := fs.Create(context.Background(), "/dst.txt", readCloser{Reader: failingReader{}}, nil)
if err == nil {
t.Fatal("expected PUT body failure")
}
got, err := os.ReadFile(filepath.Join(root, "dst.txt"))
if err != nil {
t.Fatal(err)
}
if string(got) != "original" {
t.Fatalf("destination was corrupted: %q", got)
}
matches, err := filepath.Glob(filepath.Join(root, "dst.txt.chfs-copy-*"))
if err != nil {
t.Fatal(err)
}
if len(matches) != 0 {
t.Fatalf("temporary PUT files leaked: %v", matches)
}
}
func TestWebDAVStorageFSCopyAndMove(t *testing.T) { func TestWebDAVStorageFSCopyAndMove(t *testing.T) {
root1 := t.TempDir() root1 := t.TempDir()
root2 := t.TempDir() root2 := t.TempDir()