fix: apply all fs user rulles

pull/1005/head
Oleg Lobanov 2020-06-22 18:46:22 +02:00
parent 5023e77296
commit 68f8348dde
No known key found for this signature in database
GPG Key ID: 7CC64E41212621B0
1 changed files with 9 additions and 8 deletions

View File

@ -26,19 +26,20 @@ type data struct {
// Check implements rules.Checker.
func (d *data) Check(path string) bool {
for _, rule := range d.user.Rules {
if rule.Matches(path) {
return rule.Allow
}
}
allow := true
for _, rule := range d.settings.Rules {
if rule.Matches(path) {
return rule.Allow
allow = rule.Allow
}
}
return true
for _, rule := range d.user.Rules {
if rule.Matches(path) {
allow = rule.Allow
}
}
return allow
}
func handle(fn handleFunc, prefix string, store *storage.Storage, server *settings.Server) http.Handler {