[cbox-commit-20] Fix cephfs namespace and zero-size file uploads

pkg/storage/fs/cephfs/cephfs.go

@@ -239,6 +239,13 @@ func (fs *cephfs) ListFolder(ctx context.Context, ref *provider.Reference, mdKey
 		return
 	}
 
+	// The user wants to access their home, create it if it doesn't exist
+	if path == user.home {
+		if err = fs.CreateHome(ctx); err != nil {
+			return
+		}
+	}
+
 	user.op(func(cv *cacheVal) {
 		var dir *cephfs2.Directory
 		if dir, err = cv.mount.OpenDir(path); err != nil {

pkg/storage/fs/cephfs/upload.go

@@ -45,14 +45,7 @@ func (fs *cephfs) Upload(ctx context.Context, ref *provider.Reference, r io.Read
 	user := fs.makeUser(ctx)
 	upload, err := fs.GetUpload(ctx, ref.GetPath())
 	if err != nil {
-		metadata := map[string]string{"sizedeferred": "true"}
-		uploadIDs, err := fs.InitiateUpload(ctx, ref, 0, metadata)
-		if err != nil {
-			return err
-		}
-		if upload, err = fs.GetUpload(ctx, uploadIDs["simple"]); err != nil {
-			return errors.Wrap(err, "cephfs: error retrieving upload")
-		}
+		return errors.Wrap(err, "cephfs: error retrieving upload")
 	}
 
 	uploadInfo := upload.(*fileUpload)
@@ -197,14 +190,6 @@ func (fs *cephfs) NewUpload(ctx context.Context, info tusd.FileInfo) (upload tus
 		ctx:      ctx,
 	}
 
-	if !info.SizeIsDeferred && info.Size == 0 {
-		log.Debug().Interface("info", info).Msg("cephfs: finishing upload for empty file")
-		// no need to create info file and finish directly
-		err = upload.FinishUpload(ctx)
-
-		return
-	}
-
 	// writeInfo creates the file by itself if necessary
 	err = upload.(*fileUpload).writeInfo()
 

pkg/storage/fs/cephfs/user.go

@@ -24,6 +24,7 @@ package cephfs
 import (
 	"context"
 	"fmt"
+	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -216,7 +217,7 @@ func (user *User) fileAsResourceInfo(cv *cacheVal, path string, stat *cephfs2.Ce
 		Etag:              etag,
 		MimeType:          mime.Detect(isDir(_type), path),
 		Mtime:             mtime,
-		Path:              path,
+		Path:              strings.TrimPrefix(path, user.home),
 		PermissionSet:     perms,
 		Size:              size,
 		Owner:             ownerID,
@@ -236,7 +237,6 @@ func (user *User) resolveRef(ref *provider.Reference) (str string, err error) {
 		return "", errtypes.NotSupported("cephfs: entry IDs not currently supported")
 	}
 
-	str = removeLeadingSlash(str) //path must be relative
-
+	str = path.Join(user.home, str)
 	return
 }