Backup_Repos/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash synced 2026-01-07 08:12:36 +01:00
Code Issues Projects Releases Wiki Activity

fix (plg_backend_nfs): gids access calculation

Browse source
This commit is contained in:
MickaelK 2024-05-02 08:20:33 +10:00
parent 2e3cea9312
commit 3a332cc285
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/plugin/plg_backend_nfs/auth_unix.go
View file

@ -20,7 +20,8 @@ type AuthUnix struct {
Gids []uint32
}
func NewUnixAuth(machineName string, uid, gid uint32, gids []uint32) rpc.Auth {
// ref: RFC5531 - page25
func NewAuthUnix(machineName string, uid, gid uint32, gids []uint32) rpc.Auth {
w := new(bytes.Buffer)
if len(gids) > 16 { // limit of NFS in AUTH_UNIX
gids = gids[len(gids)-16 : len(gids)]

20
server/plugin/plg_backend_nfs/index.go
View file

@ -22,6 +22,7 @@ type NfsShare struct {
ctx context.Context
uid uint32
gid uint32
gids []uint32
}
func init() {
@ -43,7 +44,7 @@ func (this NfsShare) Init(params map[string]string, app *App) (IBackend, error)
if err != nil {
return nil, err
}
auth := NewUnixAuth(params["machine_name"], uid, gid, gids)
auth := NewAuthUnix(params["machine_name"], uid, gid, gids)
v, err := mount.Mount(
params["target"],
auth,
@ -51,7 +52,7 @@ func (this NfsShare) Init(params map[string]string, app *App) (IBackend, error)
if err != nil {
return nil, err
}
return NfsShare{mount, v, auth, app.Context, uid, gid}, nil
return NfsShare{mount, v, auth, app.Context, uid, gid, gids}, nil
}
func (this NfsShare) LoginForm() Form {
@ -124,9 +125,11 @@ func (this NfsShare) Meta(path string) Metadata {
return Metadata{}
}
if fattr == nil { // happen on the root of the share
if fattr == nil { // happen at the root
return Metadata{}
} else if fattr.UID == this.uid || fattr.GID == this.gid {
} else if isIn(fattr.UID, []uint32{this.uid}) ||
isIn(fattr.GID, []uint32{this.gid}) ||
isIn(fattr.GID, this.gids) {
return Metadata{}
}
return Metadata{
@ -141,6 +144,15 @@ func (this NfsShare) Meta(path string) Metadata {
}
}
func isIn(id uint32, list []uint32) bool {
for i, _ := range list {
if list[i] == id {
return true
}
}
return false
}
func (this NfsShare) Ls(path string) ([]os.FileInfo, error) {
defer this.Close()
files := make([]os.FileInfo, 0)