From 87a79059f0b0e05d4754abaf3b0be6bbfb25bf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 5 Mar 2024 12:37:25 -0500 Subject: [PATCH] fix: #12389, update privilege group check --- src/groups/index.js | 2 +- src/plugins/hooks.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/groups/index.js b/src/groups/index.js index 7faf8d692a60..8aef1a7b51c7 100644 --- a/src/groups/index.js +++ b/src/groups/index.js @@ -56,7 +56,7 @@ Groups.removeEphemeralGroups = function (groups) { return groups; }; -const isPrivilegeGroupRegex = /^cid:(?:\d+|admin):privileges:[\w\-:]+$/; +const isPrivilegeGroupRegex = /^cid:(?:-?\d+|admin):privileges:[\w\-:]+$/; Groups.isPrivilegeGroup = function (groupName) { return isPrivilegeGroupRegex.test(groupName); }; diff --git a/src/plugins/hooks.js b/src/plugins/hooks.js index f10cb6ca8145..aa471af6a83e 100644 --- a/src/plugins/hooks.js +++ b/src/plugins/hooks.js @@ -233,7 +233,7 @@ function hookHandlerPromise(hook, hookObj, params) { if (hook.startsWith('filter:') && returned !== undefined) { _resolve(returned); } else if (hook.startsWith('static:') && hookObj.method.length <= 1) { - // make sure it is resolved if static hook doesn't return anything and doesn't use callback + // make sure it is resolved if static hook doesn't use callback _resolve(); } });