From c9059c75a47dda64150a46529eae12d5ca1fd6b7 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Mon, 1 Jun 2026 16:46:17 +0100 Subject: [PATCH] Use injected 'params' directly for audit resource labels audits.resource labels only reference URL path params (resource IDs), so the audit code can use the injected 'params' local directly instead of reconstructing the full resolved param set. The path+query/body+default reconstruction now lives only in the cache hook, where the screenshot cache.resource label genuinely needs query params. Co-Authored-By: Claude Opus 4.8 (1M context) --- app/controllers/shared/api.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 4c947b5f4e..7c7e7f2555 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -863,13 +863,6 @@ Http::shutdown() } } - // Reproduce the resolved param set: injected path values take precedence - // over query/body params, falling back to each param's declared default. - $requestParams = []; - foreach ($route->getParams() as $key => $param) { - $requestParams[$key] = $params[$key] ?? $request->getParam($key, $param['default']); - } - /** * Abuse labels */ @@ -910,7 +903,7 @@ Http::shutdown() */ $pattern = $route->getLabel('audits.resource', null); if (! empty($pattern)) { - $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user, $project); + $resource = $parseLabel($pattern, $responsePayload, $params, $user, $project); if (! empty($resource) && $resource !== $pattern) { $auditContext->resource = $resource; }