X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7aa1bc6eaf4d340d6e45226003b776d521309d69..a68ec8b7bed718acbbc55900e41847b1d319874c:/services/keep-web/webdav.go

diff --git a/services/keep-web/webdav.go b/services/keep-web/webdav.go
index af83681f9c..0039f04eef 100644
--- a/services/keep-web/webdav.go
+++ b/services/keep-web/webdav.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package keepweb
 
 import (
 	"crypto/rand"
@@ -16,7 +16,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 
 	"golang.org/x/net/context"
 	"golang.org/x/net/webdav"
@@ -36,7 +36,10 @@ var (
 // existence automatically so sequences like "mkcol foo; put foo/bar"
 // work as expected.
 type webdavFS struct {
-	collfs  arvados.CollectionFileSystem
+	collfs arvados.FileSystem
+	// prefix works like fs.Sub: Stat(name) calls
+	// Stat(prefix+name) in the wrapped filesystem.
+	prefix  string
 	writing bool
 	// webdav PROPFIND reads the first few bytes of each file
 	// whose filename extension isn't recognized, which is
@@ -47,13 +50,16 @@ type webdavFS struct {
 }
 
 func (fs *webdavFS) makeparents(name string) {
-	dir, name := path.Split(name)
+	if !fs.writing {
+		return
+	}
+	dir, _ := path.Split(name)
 	if dir == "" || dir == "/" {
 		return
 	}
 	dir = dir[:len(dir)-1]
 	fs.makeparents(dir)
-	fs.collfs.Mkdir(dir, 0755)
+	fs.collfs.Mkdir(fs.prefix+dir, 0755)
 }
 
 func (fs *webdavFS) Mkdir(ctx context.Context, name string, perm os.FileMode) error {
@@ -62,21 +68,26 @@ func (fs *webdavFS) Mkdir(ctx context.Context, name string, perm os.FileMode) er
 	}
 	name = strings.TrimRight(name, "/")
 	fs.makeparents(name)
-	return fs.collfs.Mkdir(name, 0755)
+	return fs.collfs.Mkdir(fs.prefix+name, 0755)
 }
 
 func (fs *webdavFS) OpenFile(ctx context.Context, name string, flag int, perm os.FileMode) (f webdav.File, err error) {
-	writing := flag&(os.O_WRONLY|os.O_RDWR) != 0
+	writing := flag&(os.O_WRONLY|os.O_RDWR|os.O_TRUNC) != 0
 	if writing {
 		fs.makeparents(name)
 	}
-	f, err = fs.collfs.OpenFile(name, flag, perm)
+	f, err = fs.collfs.OpenFile(fs.prefix+name, flag, perm)
 	if !fs.writing {
 		// webdav module returns 404 on all OpenFile errors,
 		// but returns 405 Method Not Allowed if OpenFile()
 		// succeeds but Write() or Close() fails. We'd rather
-		// have 405.
-		f = writeFailer{File: f, err: errReadOnly}
+		// have 405. writeFailer ensures Close() fails if the
+		// file is opened for writing *or* Write() is called.
+		var err error
+		if writing {
+			err = errReadOnly
+		}
+		f = writeFailer{File: f, err: err}
 	}
 	if fs.alwaysReadEOF {
 		f = readEOF{File: f}
@@ -85,22 +96,27 @@ func (fs *webdavFS) OpenFile(ctx context.Context, name string, flag int, perm os
 }
 
 func (fs *webdavFS) RemoveAll(ctx context.Context, name string) error {
-	return fs.collfs.RemoveAll(name)
+	return fs.collfs.RemoveAll(fs.prefix + name)
 }
 
 func (fs *webdavFS) Rename(ctx context.Context, oldName, newName string) error {
 	if !fs.writing {
 		return errReadOnly
 	}
+	if strings.HasSuffix(oldName, "/") {
+		// WebDAV "MOVE foo/ bar/" means rename foo to bar.
+		oldName = oldName[:len(oldName)-1]
+		newName = strings.TrimSuffix(newName, "/")
+	}
 	fs.makeparents(newName)
-	return fs.collfs.Rename(oldName, newName)
+	return fs.collfs.Rename(fs.prefix+oldName, fs.prefix+newName)
 }
 
 func (fs *webdavFS) Stat(ctx context.Context, name string) (os.FileInfo, error) {
 	if fs.writing {
 		fs.makeparents(name)
 	}
-	return fs.collfs.Stat(name)
+	return fs.collfs.Stat(fs.prefix + name)
 }
 
 type writeFailer struct {
@@ -109,10 +125,15 @@ type writeFailer struct {
 }
 
 func (wf writeFailer) Write([]byte) (int, error) {
+	wf.err = errReadOnly
 	return 0, wf.err
 }
 
 func (wf writeFailer) Close() error {
+	err := wf.File.Close()
+	if err != nil {
+		wf.err = err
+	}
 	return wf.err
 }