starred/panel-pelican-dev
1
0
Fork 0
mirror of https://github.com/pelican-dev/panel.git synced 2026-07-16 04:03:50 +03:00
Code Issues 41 Packages Projects Releases 10 Wiki Activity

fix #2435 handle missing event names in webhook dispatcher (#2440)

Browse Source
This commit is contained in:
sangege
2026-07-12 04:36:25 +08:00
committed by GitHub
parent f44ad34dc3
commit 1f2ff09a8b
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Listeners/DispatchWebhooks.php
View File

@@ -100,6 +100,10 @@ class DispatchWebhooks
{ {
$eventName = $activityLogged->model->event; $eventName = $activityLogged->model->event;
if ($eventName === null) {
return;
}
if (!$activityLogged->isServerEvent()) { if (!$activityLogged->isServerEvent()) {
return; return;
} }
@@ -177,6 +181,10 @@ class DispatchWebhooks
$eventName = $activityLogged->model->event; $eventName = $activityLogged->model->event;
$activityLoggedClass = ActivityLogged::class; $activityLoggedClass = ActivityLogged::class;
if ($eventName === null) {
return;
}
$matchingHooks = collect(); $matchingHooks = collect();
if ($this->eventIsWatched($eventName)) { if ($this->eventIsWatched($eventName)) {
@@ -210,8 +218,12 @@ class DispatchWebhooks
} }
} }
protected function eventIsWatched(string $eventName): bool protected function eventIsWatched(?string $eventName): bool
{ {
if ($eventName === null) {
return false;
}
$watchedEvents = cache()->rememberForever('watchedWebhooks', function () { $watchedEvents = cache()->rememberForever('watchedWebhooks', function () {
return WebhookConfiguration::where('scope', WebhookScope::Global) return WebhookConfiguration::where('scope', WebhookScope::Global)
->pluck('events') ->pluck('events')