From e7d56229691729e16b136b62b8ada43151676a93 Mon Sep 17 00:00:00 2001 From: Gabriel MABILLE Date: Thu, 16 May 2024 09:53:20 +0200 Subject: [PATCH] RBAC: No need to filter permissions on cache hit (#87941) --- pkg/services/accesscontrol/acimpl/service.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkg/services/accesscontrol/acimpl/service.go b/pkg/services/accesscontrol/acimpl/service.go index 92e75e3a704..23be6f849cb 100644 --- a/pkg/services/accesscontrol/acimpl/service.go +++ b/pkg/services/accesscontrol/acimpl/service.go @@ -578,17 +578,10 @@ func (s *Service) searchUserPermissionsFromCache(orgID int64, searchOptions acce return nil, false } + s.log.Debug("Using cached permissions", "key", key) metrics.MAccessSearchUserPermissionsCacheUsage.WithLabelValues(accesscontrol.CacheHit).Inc() - s.log.Debug("Using cached permissions", "key", key) - filteredPermissions := make([]accesscontrol.Permission, 0) - for _, permission := range permissions.([]accesscontrol.Permission) { - if PermissionMatchesSearchOptions(permission, &searchOptions) { - filteredPermissions = append(filteredPermissions, permission) - } - } - - return filteredPermissions, true + return permissions.([]accesscontrol.Permission), true } func PermissionMatchesSearchOptions(permission accesscontrol.Permission, searchOptions *accesscontrol.SearchOptions) bool {