nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: change the code as requested

Browse Source
This commit is contained in:
jmq 2023-08-12 21:41:11 +08:00
parent a7585b993c
commit 205832bde7
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
auth/hook.go
View File

@ -230,7 +230,7 @@ func (a *HookAuth) GetUser(d *users.User) *users.User {
Asc: a.Fields.GetBoolean("user.sorting.asc", d.Sorting.Asc), Asc: a.Fields.GetBoolean("user.sorting.asc", d.Sorting.Asc),
By: a.Fields.GetString("user.sorting.by", d.Sorting.By), By: a.Fields.GetString("user.sorting.by", d.Sorting.By),
}, },
Rules: a.Fields.GetRules("user.perm.rule", d.Rules), Rules: a.Fields.GetRules("user.perm.rules", d.Rules),
Commands: a.Fields.GetArray("user.commands", d.Commands), Commands: a.Fields.GetArray("user.commands", d.Commands),
HideDotfiles: a.Fields.GetBoolean("user.hideDotfiles", d.HideDotfiles), HideDotfiles: a.Fields.GetBoolean("user.hideDotfiles", d.HideDotfiles),
Perm: perms, Perm: perms,
@ -264,7 +264,7 @@ var validHookFields = []string{
"user.perm.delete", "user.perm.delete",
"user.perm.share", "user.perm.share",
"user.perm.download", "user.perm.download",
"user.perm.rule", "user.perm.rules",
} }
// IsValid checks if the provided field is on the valid fields list // IsValid checks if the provided field is on the valid fields list
@ -310,14 +310,11 @@ func (hf *hookFields) GetRules(k string, dv []rules.Rule) []rules.Rule {
if !ok { if !ok {
return dv return dv
} }
var dvv []rules.Rule var Rules []rules.Rule
for _, ruleString := range strings.Split(val, ";") { err := json.Unmarshal([]byte(val), &Rules)
var rule rules.Rule if err != nil {
err := json.Unmarshal([]byte(ruleString), &rule) log.Printf("hook: json format in user.perm.rules is incorrect. %s", err)
if err != nil { return dv
return dv
}
dvv = append(dvv, rule)
} }
return dvv return Rules
} }