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 sftp: fix rmdir deleting a file instead of returning an error

phatlc2fb0f2c58c58
diff --git a/cmd/serve/sftp/handler.go b/cmd/serve/sftp/handler.go
index 8cb7e522a..5aa4fc758 100644
--- a/cmd/serve/sftp/handler.go
+++ b/cmd/serve/sftp/handler.go
@@ -124,7 +124,19 @@ func (v vfsHandler) Filecmd(r *sftp.Request) (err error) {
if err != nil {
return err
}
- case "Rmdir", "Remove":
+ case "Rmdir":
+ node, err := v.Stat(r.Filepath)
+ if err != nil {
+ return err
+ }
+ if !node.IsDir() {
+ return syscall.ENOTDIR
+ }
+ err = node.Remove()
+ if err != nil {
+ return err
+ }
+ case "Remove":
err := v.Remove(r.Filepath)
if err != nil {
return err
diff --git a/cmd/serve/sftp/handler_test.go b/cmd/serve/sftp/handler_test.go
index 27e7c1232..0b5631f5e 100644
--- a/cmd/serve/sftp/handler_test.go
+++ b/cmd/serve/sftp/handler_test.go
@@ -295,6 +295,28 @@ func TestShortSubsystemRequest(t *testing.T) {
assert.NoError(t, err)
}
+// Test that an RMDIR request on a file fails and leaves the file alone,
+// rather than deleting it.
+func TestRmdirFile(t *testing.T) {
+ vfsOpt := vfscommon.Opt
+ client := startTestServer(t, &vfsOpt)
+
+ const fileName = "file.txt"
+ require.NoError(t, writeFile(client, fileName, "hello"))
+
+ assert.Error(t, client.RemoveDirectory(fileName))
+
+ fi, err := client.Stat(fileName)
+ require.NoError(t, err, "file deleted by rmdir")
+ assert.Equal(t, int64(5), fi.Size())
+
+ // RMDIR still removes an empty directory
+ require.NoError(t, client.Mkdir("dir"))
+ require.NoError(t, client.RemoveDirectory("dir"))
+ _, err = client.Stat("dir")
+ assert.True(t, os.IsNotExist(err), "directory not removed: %v", err)
+}
+
// writeFile writes contents to fileName via the client truncating any existing
// data, the way a normal upload does.
func writeFile(client *sftp.Client, fileName, contents string) error {