Fix access to trash dir (#1356)

* fix nil when access .trash * don't allow setattr on trash files
juicedata · Jan 28, 2022 · 5c6d557 · 5c6d557
1 parent 5a5837e
commit 5c6d557
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/pkg/vfs/vfs.go b/pkg/vfs/vfs.go
@@ -385,8 +385,10 @@ func (v *VFS) Open(ctx Context, ino Ino, flags uint32) (entry *meta.Entry, fh ui
 			h.data, _ = json.MarshalIndent(v.Conf, "", " ")
 		}
 		n := getInternalNode(ino)
-		entry = &meta.Entry{Inode: ino, Attr: n.attr}
-		return
+		if n != nil {
+			entry = &meta.Entry{Inode: ino, Attr: n.attr}
+			return
+		}
 	}
 	defer func() {
 		if entry != nil {

diff --git a/pkg/vfs/vfs_unix.go b/pkg/vfs/vfs_unix.go
@@ -86,8 +86,10 @@ func (v *VFS) Access(ctx Context, ino Ino, mask int) (err syscall.Errno) {
 	}
 	if IsSpecialNode(ino) {
 		node := getInternalNode(ino)
-		err = accessTest(node.attr, mmask, ctx.Uid(), ctx.Gid())
-		return
+		if node != nil {
+			err = accessTest(node.attr, mmask, ctx.Uid(), ctx.Gid())
+			return
+		}
 	}
 
 	err = v.Meta.Access(ctx, ino, uint8(mmask), nil)
@@ -144,7 +146,11 @@ func (v *VFS) SetAttr(ctx Context, ino Ino, set int, opened uint8, mode, uid, gi
 	}()
 	if IsSpecialNode(ino) {
 		n := getInternalNode(ino)
-		entry = &meta.Entry{Inode: ino, Attr: n.attr}
+		if n != nil {
+			entry = &meta.Entry{Inode: ino, Attr: n.attr}
+		} else {
+			err = syscall.EPERM
+		}
 		return
 	}
 	err = syscall.EINVAL