cphipps/watchstate
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

With multi-user support, it doesn't make sense to log spam webhooks with invalid user ID, so we use Debug level instead and option to increase the level via debug_trace additional option

Browse Source
This commit is contained in:
arabcoders
2025-05-16 09:44:32 +03:00
parent 66405caba8
commit 157bcd45ad
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/API/Backend/Webhooks.php
View File

@@ -97,6 +97,8 @@ final class Webhooks
$request = $client->processRequest($request); $request = $client->processRequest($request);
$attr = $request->getAttributes(); $attr = $request->getAttributes();
$debugTrace = true === (bool)ag($backend, 'options.' . Options::DEBUG_TRACE);
if (null !== ($userId = ag($backend, 'user', null)) && true === (bool)ag($backend, 'webhook.match.user')) { if (null !== ($userId = ag($backend, 'user', null)) && true === (bool)ag($backend, 'webhook.match.user')) {
if (null === ($requestUser = ag($attr, 'user.id'))) { if (null === ($requestUser = ag($attr, 'user.id'))) {
$message = "Request payload didn't contain a user id. Backend requires a user check."; $message = "Request payload didn't contain a user id. Backend requires a user check.";
@@ -109,7 +111,7 @@ final class Webhooks
'req_user' => $requestUser ?? 'NOT SET', 'req_user' => $requestUser ?? 'NOT SET',
'config_user' => $userId, 'config_user' => $userId,
]); ]);
$this->write($request, Level::Info, $message); $this->write($request, $debugTrace ? Level::Notice : Level::Debug, $message);
return api_error($message, Status::BAD_REQUEST); return api_error($message, Status::BAD_REQUEST);
} }
} }
@@ -126,7 +128,7 @@ final class Webhooks
'req_uid' => $requestBackendId ?? 'NOT SET', 'req_uid' => $requestBackendId ?? 'NOT SET',
'config_uid' => $uuid, 'config_uid' => $uuid,
]); ]);
$this->write($request, Level::Info, $message); $this->write($request, $debugTrace ? Level::Notice : Level::Debug, $message);
return api_error($message, Status::BAD_REQUEST); return api_error($message, Status::BAD_REQUEST);
} }
} }
@@ -137,7 +139,6 @@ final class Webhooks
} }
} }
$debugTrace = true === (bool)ag($backend, 'options.' . Options::DEBUG_TRACE);
$metadataOnly = true === (bool)ag($backend, 'options.' . Options::IMPORT_METADATA_ONLY); $metadataOnly = true === (bool)ag($backend, 'options.' . Options::IMPORT_METADATA_ONLY);
if (true !== $metadataOnly && true !== (bool)ag($backend, 'import.enabled')) { if (true !== $metadataOnly && true !== (bool)ag($backend, 'import.enabled')) {