A free open source IT asset/license management system
Fixed RB-22042 - better handle non-dates in calendar API
snipe5e18ae453305
diff --git a/app/Http/Controllers/Api/CalendarEventsController.php b/app/Http/Controllers/Api/CalendarEventsController.phpindex c4f8f13f57..912f8725fc 100644--- a/app/Http/Controllers/Api/CalendarEventsController.php+++ b/app/Http/Controllers/Api/CalendarEventsController.php@@ -113,15 +113,28 @@ class CalendarEventsController extends Controllerprotected function resolveRange(Request $request): array{return [- $request->filled('start')- ? Carbon::parse($request->input('start'))- : now()->subMonths(3)->startOfDay(),- $request->filled('end')- ? Carbon::parse($request->input('end'))- : now()->addMonths(3)->endOfDay(),+ $this->parseDateOrDefault($request->input('start'), fn() => now()->subMonths(3)->startOfDay()),+ $this->parseDateOrDefault($request->input('end'), fn() => now()->addMonths(3)->endOfDay()),];}+ /**+ * Force a `start` / `end` query param to a Carbon or fall back+ * to the provided default.+ */+ private function parseDateOrDefault(mixed $value, callable $default): Carbon+ {+ if (!is_string($value) || trim($value) === '') {+ return $default();+ }++ try {+ return Carbon::parse($value);+ } catch (\Throwable) {+ return $default();+ }+ }+/*** `event_type[]=a&event_type[]=b` (repeatable) or `event_type=a,b`* (single param, comma-split). Empty or missing means "all types".diff --git a/tests/Feature/CalendarEvents/CalendarEventsApiTest.php b/tests/Feature/CalendarEvents/CalendarEventsApiTest.phpindex 2b71041295..38af8167b2 100644--- a/tests/Feature/CalendarEvents/CalendarEventsApiTest.php+++ b/tests/Feature/CalendarEvents/CalendarEventsApiTest.php@@ -56,6 +56,37 @@ class CalendarEventsApiTest extends TestCase implements TestsFullMultipleCompani$this->assertNotEmpty($matching['url']);}+ public function test_array_shaped_start_param_falls_back_to_default_without_500()+ {+ // Regression pin: a probe URL like+ // `?start[$ptt]=2026-10-01T00:00:00Z` makes $request->input('start')+ // return an array, which Carbon::parse would reject with a+ // TypeError and bubble out as a 500. resolveRange() now+ // coerces non-string input to the default window, so the+ // probe gets a normal 200 instead of a stack trace. Same+ // guard on `end`.+ $actor = User::factory()->superuser()->create();++ $this->actingAsForApi($actor)+ ->getJson('/api/v1/calendar/events?start[$ptt]=2026-10-01T00:00:00Z&end=2026-10-08T00:00:00Z')+ ->assertOk();++ $this->actingAsForApi($actor)+ ->getJson('/api/v1/calendar/events?start=2026-10-01T00:00:00Z&end[$ptt]=2026-10-08T00:00:00Z')+ ->assertOk();+ }++ public function test_unparseable_start_param_falls_back_to_default_without_500()+ {+ // Companion guard: non-array garbage like `?start=not-a-date`+ // also hits the catch block instead of 500ing out.+ $actor = User::factory()->superuser()->create();++ $this->actingAsForApi($actor)+ ->getJson('/api/v1/calendar/events?start=not-a-date&end=also-garbage')+ ->assertOk();+ }+public function test_range_filter_hides_events_outside_visible_window(){$actor = User::factory()->superuser()->create();