Make fusermount optional and --allow-other

Author: yousong

cmd/onedriver/main.go

@@ -58,6 +58,10 @@ func main() {
 	versionFlag := flag.BoolP("version", "v", false, "Display program version.")
 	debugOn := flag.BoolP("debug", "d", false, "Enable FUSE debug logging. "+
 		"This logs communication between onedriver and the kernel.")
+	allowOther := flag.BoolP("allow-other", "", false,
+		"Allow access to the mount point for other users.")
+	uid := flag.Uint32P("uid", "", uint32(os.Getuid()), "Owner uid of the mount point.")
+	gid := flag.Uint32P("gid", "", uint32(os.Getgid()), "Owner gid of the mount point.")
 	help := flag.BoolP("help", "h", false, "Displays this help message.")
 	flag.Usage = usage
 	flag.Parse()
@@ -123,13 +127,15 @@ func main() {
 	// create the filesystem
 	log.Info().Msgf("onedriver %s", common.Version())
 	auth := graph.Authenticate(config.AuthConfig, authPath, *headless)
-	filesystem := fs.NewFilesystem(auth, cachePath)
+	filesystem := fs.NewFilesystem(auth, cachePath, fs.OptionOwner(*uid, *gid))
 	go filesystem.DeltaLoop(10 * time.Minute)
 	xdgVolumeInfo(filesystem, auth)
 
 	server, err := fuse.NewServer(filesystem, mountpoint, &fuse.MountOptions{
 		Name:          "onedriver",
 		FsName:        "onedriver",
+		DirectMount:   true,
+		AllowOther:    *allowOther,
 		DisableXAttrs: true,
 		MaxBackground: 1024,
 		Debug:         *debugOn,

fs/cache.go

@@ -21,6 +21,9 @@ import (
 type Filesystem struct {
 	fuse.RawFileSystem
 
+	uid uint32
+	gid uint32
+
 	metadata             sync.Map
 	db                   *bolt.DB
 	content              *LoopbackCache
@@ -51,8 +54,17 @@ var (
 // so we can tell what format the db has
 const fsVersion = "1"
 
+type Option func(fs *Filesystem)
+
+func OptionOwner(uid, gid uint32) Option {
+	return func(fs *Filesystem) {
+		fs.uid = uid
+		fs.gid = gid
+	}
+}
+
 // NewFilesystem creates a new filesystem
-func NewFilesystem(auth *graph.Auth, cacheDir string) *Filesystem {
+func NewFilesystem(auth *graph.Auth, cacheDir string, opts ...Option) *Filesystem {
 	// prepare cache directory
 	if _, err := os.Stat(cacheDir); err != nil {
 		if err = os.Mkdir(cacheDir, 0700); err != nil {
@@ -103,12 +115,18 @@ func NewFilesystem(auth *graph.Auth, cacheDir string) *Filesystem {
 
 	// ok, ready to start fs
 	fs := &Filesystem{
+		uid: uint32(os.Getuid()),
+		gid: uint32(os.Getgid()),
+
 		RawFileSystem: fuse.NewDefaultRawFileSystem(),
 		content:       content,
 		db:            db,
 		auth:          auth,
 		opendirs:      make(map[uint64][]*Inode),
 	}
+	for _, opt := range opts {
+		opt(fs)
+	}
 
 	rootItem, err := graph.GetItem("root", auth)
 	root := NewInodeDriveItem(rootItem)

fs/fs.go

@@ -115,6 +115,26 @@ func isNameRestricted(name string) bool {
 	return disallowedRexp.FindStringIndex(name) != nil
 }
 
+// makeattr is a convenience function to create a set of filesystem attrs for
+// use with syscalls that use or modify attrs.
+func (f *Filesystem) makeAttr(i *Inode) fuse.Attr {
+	mtime := i.ModTime()
+	return fuse.Attr{
+		Ino:   i.NodeID(),
+		Size:  i.Size(),
+		Nlink: i.NLink(),
+		Ctime: mtime,
+		Mtime: mtime,
+		Atime: mtime,
+		Mode:  i.Mode(),
+		// whatever user is running the filesystem is the owner
+		Owner: fuse.Owner{
+			Uid: f.uid,
+			Gid: f.gid,
+		},
+	}
+}
+
 // Statfs returns information about the filesystem. Mainly useful for checking
 // quotas and storage limits.
 func (f *Filesystem) StatFs(cancel <-chan struct{}, in *fuse.InHeader, out *fuse.StatfsOut) fuse.Status {
@@ -180,7 +200,7 @@ func (f *Filesystem) Mkdir(cancel <-chan struct{}, in *fuse.MkdirIn, name string
 	newInode.mode = in.Mode | fuse.S_IFDIR
 
 	out.NodeId = f.InsertChild(id, newInode)
-	out.Attr = newInode.makeAttr()
+	out.Attr = f.makeAttr(newInode)
 	out.SetAttrTimeout(timeout)
 	out.SetEntryTimeout(timeout)
 	return fuse.OK
@@ -305,7 +325,7 @@ func (f *Filesystem) ReadDirPlus(cancel <-chan struct{}, in *fuse.ReadIn, out *f
 		return fuse.EIO
 	}
 	entryOut.NodeId = entry.Ino
-	entryOut.Attr = inode.makeAttr()
+	entryOut.Attr = f.makeAttr(inode)
 	entryOut.SetAttrTimeout(timeout)
 	entryOut.SetEntryTimeout(timeout)
 	return fuse.OK
@@ -369,7 +389,7 @@ func (f *Filesystem) Lookup(cancel <-chan struct{}, in *fuse.InHeader, name stri
 	}
 
 	out.NodeId = child.NodeID()
-	out.Attr = child.makeAttr()
+	out.Attr = f.makeAttr(child)
 	out.SetAttrTimeout(timeout)
 	out.SetEntryTimeout(timeout)
 	return fuse.OK
@@ -412,7 +432,7 @@ func (f *Filesystem) Mknod(cancel <-chan struct{}, in *fuse.MknodIn, name string
 		Str("mode", Octal(in.Mode)).
 		Msg("Creating inode.")
 	out.NodeId = f.InsertChild(parentID, inode)
-	out.Attr = inode.makeAttr()
+	out.Attr = f.makeAttr(inode)
 	out.SetAttrTimeout(timeout)
 	out.SetEntryTimeout(timeout)
 	return fuse.OK
@@ -721,7 +741,7 @@ func (f *Filesystem) GetAttr(cancel <-chan struct{}, in *fuse.GetAttrIn, out *fu
 		Str("path", inode.Path()).
 		Msg("")
 
-	out.Attr = inode.makeAttr()
+	out.Attr = f.makeAttr(inode)
 	out.SetTimeout(timeout)
 	return fuse.OK
 }
@@ -784,7 +804,7 @@ func (f *Filesystem) SetAttr(cancel <-chan struct{}, in *fuse.SetAttrIn, out *fu
 	}
 
 	i.Unlock()
-	out.Attr = i.makeAttr()
+	out.Attr = f.makeAttr(i)
 	out.SetTimeout(timeout)
 	return fuse.OK
 }

fs/inode.go

@@ -3,7 +3,6 @@ package fs
 import (
 	"encoding/json"
 	"math/rand"
-	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -211,26 +210,6 @@ func (i *Inode) HasChildren() bool {
 	return len(i.children) > 0
 }
 
-// makeattr is a convenience function to create a set of filesystem attrs for
-// use with syscalls that use or modify attrs.
-func (i *Inode) makeAttr() fuse.Attr {
-	mtime := i.ModTime()
-	return fuse.Attr{
-		Ino:   i.NodeID(),
-		Size:  i.Size(),
-		Nlink: i.NLink(),
-		Ctime: mtime,
-		Mtime: mtime,
-		Atime: mtime,
-		Mode:  i.Mode(),
-		// whatever user is running the filesystem is the owner
-		Owner: fuse.Owner{
-			Uid: uint32(os.Getuid()),
-			Gid: uint32(os.Getgid()),
-		},
-	}
-}
-
 // IsDir returns if it is a directory (true) or file (false).
 func (i *Inode) IsDir() bool {
 	// 0 if the dir bit is not set