fix ocis move (#1177)

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Sep 17, 2020 · 345aaf8 · 345aaf8
1 parent 9f1e7a2
commit 345aaf8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog/unreleased/fix-oci-move.md b/changelog/unreleased/fix-oci-move.md
@@ -0,0 +1,5 @@
+Bugfix: Fix ocis move
+
+When renaming a file we updating the name attribute on the wrong node, causing the path construction to use the wrong name. This fixes the litmus move_coll test.
+
+https://github.com/cs3org/reva/pull/1177
diff --git a/pkg/storage/fs/ocis/tree.go b/pkg/storage/fs/ocis/tree.go
@@ -141,7 +141,8 @@ func (t *Tree) Move(ctx context.Context, oldNode *Node, newNode *Node) (err erro
 			return errors.Wrap(err, "ocisfs: could not rename child")
 		}
 
-		tgtPath := filepath.Join(t.pw.Root, "nodes", newNode.ID)
+		// the new node id might be different, so we need to use the old nodes id
+		tgtPath := filepath.Join(t.pw.Root, "nodes", oldNode.ID)
 
 		// update name attribute
 		if err := xattr.Set(tgtPath, "user.ocis.name", []byte(newNode.Name)); err != nil {