iCal-Ereignisse mit LAST-MODIFIED statt fehlendem DTSTAMP lesen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 3m3s

This commit is contained in:
Lars committed 2026-10-29 15:53:55 +01:00
1 parent 386e2cf0a9
commit 2ae48e77fa
4 files changed
+64 -4

No files matched your search

+9 -4
View File
@@ -120,7 +120,7 @@ public function parseDocument(string $ics): array
}
$calendar[$name] = $property;
} elseif ($stack === ['VCALENDAR', 'VEVENT']) {
if (isset($event[$name]) && in_array($name, ['UID', 'DTSTART', 'DTEND', 'STATUS'], true)) {
if (isset($event[$name]) && in_array($name, ['UID', 'DTSTART', 'DTEND', 'DTSTAMP', 'LAST-MODIFIED', 'STATUS'], true)) {
throw new ChannelSyncException('Doppelte Identitäts- oder Datumsangaben im Kalenderereignis.');
}
$event[$name] = $property;
@@ -145,16 +145,21 @@ public static function text(string $value): string
return preg_replace_callback('/\\\\([nN,;\\\\])/', fn (array $match): string => in_array($match[1], ['n', 'N'], true) ? "\n" : $match[1], $value);
}
/** @param array<string, array{value: string, params: list<string>}> $event */
/**
* Availability feeds may omit DTSTAMP. Validate event-level LAST-MODIFIED in its place,
* retaining the actual original properties and rejecting an invalid present DTSTAMP.
*
* @param array<string, array{value: string, params: list<string>}> $event
*/
private function toPeriod(array $event): ?ExternalPeriod
{
$stamp = $event['DTSTAMP']['value'] ?? '';
$stamp = $event['DTSTAMP']['value'] ?? $event['LAST-MODIFIED']['value'] ?? '';
try {
if (! preg_match('/^\d{8}T\d{6}Z$/D', $stamp) || CarbonImmutable::createFromFormat('!Ymd\THis\Z', $stamp, 'UTC')->format('Ymd\THis\Z') !== $stamp) {
throw new \RuntimeException;
}
} catch (Throwable) {
throw new ChannelSyncException('Ein Ereignis benötigt einen gültigen UTC-Zeitstempel (DTSTAMP).');
throw new ChannelSyncException('Ein Ereignis benötigt einen gültigen UTC-Zeitstempel (DTSTAMP oder ersatzweise LAST-MODIFIED).');
}
foreach (['RRULE', 'RDATE', 'EXDATE', 'RECURRENCE-ID', 'DURATION'] as $unsupported) {
if (isset($event[$unsupported])) {