decomposedfs: make lookup.Path take into account share roots

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
cs3org · Dec 20, 2021 · b6ca718 · b6ca718
1 parent 319edf7
commit b6ca718
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/pkg/storage/utils/decomposedfs/lookup.go b/pkg/storage/utils/decomposedfs/lookup.go
@@ -114,7 +114,7 @@ func (lu *Lookup) NodeFromSpaceID(ctx context.Context, id *provider.ResourceId)
 
 // Path returns the path for node
 func (lu *Lookup) Path(ctx context.Context, n *node.Node) (p string, err error) {
-	for n.ID != n.SpaceRoot {
+	for n.ID != n.SpaceRoot && !(n.ShareRoot != "" && n.ID != n.ShareRoot) {
 		p = filepath.Join(n.Name, p)
 		if n, err = n.Parent(); err != nil {
 			appctx.GetLogger(ctx).

diff --git a/pkg/storage/utils/decomposedfs/node/node.go b/pkg/storage/utils/decomposedfs/node/node.go
@@ -535,13 +535,9 @@ func (n *Node) AsResourceInfo(ctx context.Context, rp *provider.ResourcePermissi
 		setPlainOpaque(ri, "root", n.SpaceRoot)
 	}
 
-	if returnBasename { // FIXME this is not the basename it is the path relative to the root
-		ri.Path = n.Name
-	} else {
-		ri.Path, err = n.lu.Path(ctx, n)
-		if err != nil {
-			return nil, err
-		}
+	ri.Path, err = n.lu.Path(ctx, n)
+	if err != nil {
+		return nil, err
 	}
 
 	ri.MimeType = mime.Detect(nodeType == provider.ResourceType_RESOURCE_TYPE_CONTAINER, ri.Path)