"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 webdav: fix transfers failing after 5 minutes with --auth-proxy
Nick Craig-Wood7e6d6fa838a8
diff --git a/cmd/serve/webdav/webdav.go b/cmd/serve/webdav/webdav.goindex d36be62a3..32db09bb5 100644--- a/cmd/serve/webdav/webdav.go+++ b/cmd/serve/webdav/webdav.go@@ -310,6 +310,7 @@ func newWebDAV(ctx context.Context, f fs.Fs, opt *Options, vfsOpt *vfscommon.Optrouter := w.server.Router()router.Use(+ w.provider.HoldVFS,webDAVCompressMiddleware(),middleware.SetHeader("Accept-Ranges", "bytes"),middleware.SetHeader("Server", "rclone/"+fs.Version),diff --git a/cmd/serve/webdav/webdav_test.go b/cmd/serve/webdav/webdav_test.goindex 0254ea2bd..10ce4241c 100644--- a/cmd/serve/webdav/webdav_test.go+++ b/cmd/serve/webdav/webdav_test.go@@ -14,6 +14,7 @@ import ("io""net/http""os"+ "path/filepath""strings""testing"@@ -25,6 +26,7 @@ import ("github.com/rclone/rclone/fs/config/obscure""github.com/rclone/rclone/fs/filter""github.com/rclone/rclone/fs/rc"+ "github.com/rclone/rclone/lib/random""github.com/rclone/rclone/vfs/vfscommon""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"@@ -452,3 +454,43 @@ func TestNewWebDAVError(t *testing.T) {require.Error(t, err)assert.Nil(t, w)}++// TestAuthProxyDownloadOutlivesCache checks a download in progress+// carries on working when the auth proxy drops its VFS from its cache,+// as it does when a download takes longer than the cache expiry time.+func TestAuthProxyDownloadOutlivesCache(t *testing.T) {+ root := t.TempDir()+ contents := random.String(32 * 1024 * 1024)+ require.NoError(t, os.WriteFile(filepath.Join(root, "download.bin"), []byte(contents), 0666))++ prog, err := filepath.Abs("../servetest/proxy_code.go")+ require.NoError(t, err)+ opt := Opt+ opt.HTTP.ListenAddr = []string{testBindAddress}+ proxyOpt := proxy.Opt+ proxyOpt.AuthProxy = "go run " + prog + " " + root+ w, err := newWebDAV(context.Background(), nil, &opt, &vfscommon.Opt, &proxyOpt)+ require.NoError(t, err)+ go func() {+ require.NoError(t, w.Serve())+ }()+ defer func() { assert.NoError(t, w.Shutdown()) }()++ req, err := http.NewRequest("GET", w.server.URLs()[0]+"download.bin", nil)+ require.NoError(t, err)+ req.SetBasicAuth(testUser, testPass)+ resp, err := http.DefaultClient.Do(req)+ require.NoError(t, err)+ defer func() { _ = resp.Body.Close() }()+ require.Equal(t, http.StatusOK, resp.StatusCode)+ start := make([]byte, 1024)+ _, err = io.ReadFull(resp.Body, start)+ require.NoError(t, err)++ // Drop everything from the proxy's cache as if it had expired+ w.provider.Proxy().Shutdown()++ rest, err := io.ReadAll(resp.Body)+ require.NoError(t, err)+ assert.True(t, contents == string(start)+string(rest), "download corrupted")+}