Merge pull request #988 from jbenet/feat/fuse-id

set proper UID and GID on fuse filesystems
ipfs · Mar 30, 2015 · a768e58 · a768e58
2 parents 8a533be + 9715cab
commit a768e58
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go
@@ -207,7 +207,11 @@ type File struct {
 // Attr returns the attributes of a given node.
 func (d *Directory) Attr() fuse.Attr {
 	log.Debug("Directory Attr")
-	return fuse.Attr{Mode: os.ModeDir | 0555}
+	return fuse.Attr{
+		Mode: os.ModeDir | 0555,
+		Uid:  uint32(os.Getuid()),
+		Gid:  uint32(os.Getgid()),
+	}
 }
 
 // Attr returns the attributes of a given node.
@@ -221,6 +225,8 @@ func (fi *File) Attr() fuse.Attr {
 	return fuse.Attr{
 		Mode: os.FileMode(0666),
 		Size: uint64(size),
+		Uid:  uint32(os.Getuid()),
+		Gid:  uint32(os.Getgid()),
 	}
 }
 

diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go
@@ -92,19 +92,27 @@ func (s *Node) Attr() fuse.Attr {
 	}
 	switch s.cached.GetType() {
 	case ftpb.Data_Directory:
-		return fuse.Attr{Mode: os.ModeDir | 0555}
+		return fuse.Attr{
+			Mode: os.ModeDir | 0555,
+			Uid:  uint32(os.Getuid()),
+			Gid:  uint32(os.Getgid()),
+		}
 	case ftpb.Data_File:
 		size := s.cached.GetFilesize()
 		return fuse.Attr{
 			Mode:   0444,
 			Size:   uint64(size),
 			Blocks: uint64(len(s.Nd.Links)),
+			Uid:    uint32(os.Getuid()),
+			Gid:    uint32(os.Getgid()),
 		}
 	case ftpb.Data_Raw:
 		return fuse.Attr{
 			Mode:   0444,
 			Size:   uint64(len(s.cached.GetData())),
 			Blocks: uint64(len(s.Nd.Links)),
+			Uid:    uint32(os.Getuid()),
+			Gid:    uint32(os.Getgid()),
 		}
 
 	default: