Browse Source

set mount point to existing permissions

fix https://github.com/chrislusf/seaweedfs/issues/806
pull/809/head
Chris Lu 6 years ago
parent
commit
03c7447ad6
  1. 24
      weed/command/mount_std.go
  2. 6
      weed/filesys/dir.go
  3. 5
      weed/filesys/wfs.go

24
weed/command/mount_std.go

@ -4,7 +4,10 @@ package command
import (
"fmt"
"os"
"os/user"
"runtime"
"strconv"
"strings"
"time"
@ -28,6 +31,24 @@ func runMount(cmd *Command, args []string) bool {
fuse.Unmount(*mountOptions.dir)
// detect mount folder mode
mountMode := os.ModeDir | 0755
if fileInfo, err := os.Stat(*mountOptions.dir); err == nil {
mountMode = os.ModeDir | fileInfo.Mode()
println(*mountOptions.dir, "mount mode", mountMode)
}
// detect current user
uid, gid := uint32(0), uint32(0)
if u, err := user.Current(); err == nil {
if parsedId, pe := strconv.ParseUint(u.Uid, 10, 32); pe == nil {
uid = uint32(parsedId)
}
if parsedId, pe := strconv.ParseUint(u.Gid, 10, 32); pe == nil {
gid = uint32(parsedId)
}
}
util.SetupProfiling(*mountCpuProfile, *mountMemProfile)
c, err := fuse.Mount(
@ -77,6 +98,9 @@ func runMount(cmd *Command, args []string) bool {
DataCenter: *mountOptions.dataCenter,
DirListingLimit: *mountOptions.dirListingLimit,
EntryCacheTtl: 3 * time.Second,
MountUid: uid,
MountGid: gid,
MountMode: mountMode,
}))
if err != nil {
fuse.Unmount(*mountOptions.dir)

6
weed/filesys/dir.go

@ -34,8 +34,10 @@ func (dir *Dir) Attr(context context.Context, attr *fuse.Attr) error {
// https://github.com/bazil/fuse/issues/196
attr.Valid = time.Second
if dir.Path == "/" {
attr.Mode = os.ModeDir | 0777
if dir.Path == dir.wfs.option.FilerMountRootPath {
attr.Uid = dir.wfs.option.MountUid
attr.Gid = dir.wfs.option.MountGid
attr.Mode = dir.wfs.option.MountMode
return nil
}

5
weed/filesys/wfs.go

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"math"
"os"
"sync"
"time"
@ -26,6 +27,10 @@ type Option struct {
DataCenter string
DirListingLimit int
EntryCacheTtl time.Duration
MountUid uint32
MountGid uint32
MountMode os.FileMode
}
var _ = fs.FS(&WFS{})

Loading…
Cancel
Save