From fc85059554fd105a33c8c34fd1378bc20a8c9b76 Mon Sep 17 00:00:00 2001 From: Stephen Gruzin Date: Tue, 21 Jul 2026 22:03:32 -0700 Subject: [PATCH] Made sure that allow list allows events if its in the list, not if all exceptions are met. Just at least 1 --- frontend/src/lib/event.utils.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/src/lib/event.utils.ts b/frontend/src/lib/event.utils.ts index 097c738..8b2e4bf 100644 --- a/frontend/src/lib/event.utils.ts +++ b/frontend/src/lib/event.utils.ts @@ -77,8 +77,13 @@ export const resourcesExpandRequirementsPublic = export function eventResourceAllowListToFilterString(allowedResources: string[]) { let filterString = ""; for (let i = 0; i < allowedResources.length; i++) { - filterString += ` && resources ~ "${allowedResources[i]}"`; + if (i == 0) { + filterString += ` && ( resources ~ "${allowedResources[i]}"`; + } else { + filterString += ` || resources ~ "${allowedResources[i]}"`; + } } + filterString += " )"; return filterString; } @@ -93,8 +98,13 @@ export function eventResourceBlockListToFilterString(blockedResources: string[]) export function eventTagAllowListToFilterString(allowedTags: string[]) { let filterString = ""; for (let i = 0; i < allowedTags.length; i++) { - filterString += ` && tags ~ "${allowedTags[i]}"`; + if (i == 0) { + filterString += ` && ( tags ~ "${allowedTags[i]}"`; + } else { + filterString += ` || tags ~ "${allowedTags[i]}"`; + } } + filterString += " )"; return filterString; }