From 00927f3ba3c6a2b79c3eb2ec2f9f885f672d769c Mon Sep 17 00:00:00 2001 From: jamesread Date: Thu, 21 Dec 2023 01:22:18 +0000 Subject: [PATCH] Revert "ACL check was broken, addToEveryAction should come first (#204)" This reverts commit b0faecfa75f812ee50183ea35ca98bcb80b331d8. --- internal/acl/acl.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/acl/acl.go b/internal/acl/acl.go index c322330..979d37b 100644 --- a/internal/acl/acl.go +++ b/internal/acl/acl.go @@ -111,11 +111,11 @@ func buildUserAcls(cfg *config.Config, user *AuthenticatedUser) { } func isACLRelevant(cfg *config.Config, actionAcls []string, acl config.AccessControlList, user *AuthenticatedUser) bool { - if acl.AddToEveryAction { - return true + if !slices.Contains(user.acls, acl.Name) { + return false } - if slices.Contains(user.acls, acl.Name) { + if acl.AddToEveryAction { return true }