test(dav): add OPTION_FORGIVING tests for CalDAV Plugin, CalDavBackend and ImportService

Assisted-by: ClaudeCode:claude-sonnet-4-6
Signed-off-by: Timo Lilja <timo.lilja@iki.fi>

Author: Timo Lilja

apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php

@@ -52,7 +52,7 @@ abstract class AbstractCalDavBackend extends TestCase {
 	protected IGroupManager&MockObject $groupManager;
 	protected IEventDispatcher&MockObject $dispatcher;
 	private LoggerInterface&MockObject $logger;
-	private IConfig&MockObject $config;
+	protected IConfig&MockObject $config;
 	private ISecureRandom $random;
 	protected SharingBackend $sharingBackend;
 	protected IDBConnection $db;

apps/dav/tests/unit/CalDAV/CalDavBackendTest.php

@@ -2104,4 +2104,24 @@ public function testDefaultAlarmProperties(): void {
 		// Clean up
 		$this->backend->deleteCalendar($calendars[0]['id'], true);
 	}
+
+	private const ICS_ENTOURAGE = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Test//Test//EN\r\nBEGIN:VEVENT\r\nDTSTART:20260715T100000Z\r\nDTEND:20260715T110000Z\r\nSUMMARY:Test\r\nUID:test-uid-123\r\nX-ENTOURAGE_UUID:test-uid-123\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
+
+	public function testGetDenormalizedDataRejectsNonStandardPropertyWhenFlagDisabled(): void {
+		$this->config->method('getSystemValueBool')
+			->with('dav.forgiving_ical_parser', false)
+			->willReturn(false);
+
+		$this->expectException(\Sabre\VObject\ParseException::class);
+		$this->backend->getDenormalizedData(self::ICS_ENTOURAGE);
+	}
+
+	public function testGetDenormalizedDataAcceptsNonStandardPropertyWhenFlagEnabled(): void {
+		$this->config->method('getSystemValueBool')
+			->with('dav.forgiving_ical_parser', false)
+			->willReturn(true);
+
+		$result = $this->backend->getDenormalizedData(self::ICS_ENTOURAGE);
+		$this->assertSame('test-uid-123', $result['uid']);
+	}
 }

apps/dav/tests/unit/CalDAV/Import/ImportServiceTest.php

@@ -11,22 +11,29 @@
 use OCA\DAV\CalDAV\CalendarImpl;
 use OCA\DAV\CalDAV\Import\ImportService;
 use OCP\Calendar\CalendarImportOptions;
+use OCP\IConfig;
 use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VEvent;
+use Sabre\VObject\ParseException;
 
 class ImportServiceTest extends \Test\TestCase {
 
 	private ImportService $service;
 	private CalendarImpl|MockObject $calendar;
 	private CalDavBackend|MockObject $backend;
+	private IConfig|MockObject $config;
 	private array $importResults = [];
 
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->backend = $this->createMock(CalDavBackend::class);
-		$this->service = new ImportService($this->backend);
+		$this->config = $this->createMock(IConfig::class);
+		$this->config->method('getSystemValueBool')
+			->with('dav.forgiving_ical_parser', false)
+			->willReturn(false);
+		$this->service = new ImportService($this->backend, $this->config);
 		$this->calendar = $this->createMock(CalendarImpl::class);
 
 	}
@@ -148,4 +155,30 @@ public function testImportWithMultiLineUID(): void {
 		$this->assertArrayHasKey($longUID, $result);
 		$this->assertEquals('created', $result[$longUID]['outcome']);
 	}
+
+	private const ICS_ENTOURAGE = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Test//Test//EN\r\nBEGIN:VEVENT\r\nDTSTART:20260715T100000Z\r\nDTEND:20260715T110000Z\r\nSUMMARY:Test\r\nUID:test-uid-123\r\nX-ENTOURAGE_UUID:test-uid-123\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
+
+	public function testImportTextRejectsNonStandardPropertyWhenFlagDisabled(): void {
+		$stream = fopen('php://memory', 'r+');
+		fwrite($stream, self::ICS_ENTOURAGE);
+		rewind($stream);
+
+		$this->expectException(ParseException::class);
+		iterator_to_array($this->service->importText($stream));
+	}
+
+	public function testImportTextAcceptsNonStandardPropertyWhenFlagEnabled(): void {
+		$this->config = $this->createMock(IConfig::class);
+		$this->config->method('getSystemValueBool')
+			->with('dav.forgiving_ical_parser', false)
+			->willReturn(true);
+		$this->service = new ImportService($this->backend, $this->config);
+
+		$stream = fopen('php://memory', 'r+');
+		fwrite($stream, self::ICS_ENTOURAGE);
+		rewind($stream);
+
+		$objects = iterator_to_array($this->service->importText($stream));
+		$this->assertCount(1, $objects);
+	}
 }

apps/dav/tests/unit/CalDAV/PluginTest.php

@@ -9,6 +9,12 @@
 namespace OCA\DAV\Tests\unit\CalDAV;
 
 use OCA\DAV\CalDAV\Plugin;
+use OCP\IConfig;
+use PHPUnit\Framework\MockObject\MockObject;
+use Sabre\DAV\Exception\UnsupportedMediaType;
+use Sabre\DAV\Server as SabreServer;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 use Test\TestCase;
 
 class PluginTest extends TestCase {
@@ -45,4 +51,56 @@ public function testGetCalendarHomeForPrincipal(string $input, string $expected)
 	public function testGetCalendarHomeForUnknownPrincipal(): void {
 		$this->assertNull($this->plugin->getCalendarHomeForPrincipal('FOO/BAR/BLUB'));
 	}
+
+	private const ICS_ENTOURAGE = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Test//Test//EN\r\nBEGIN:VEVENT\r\nDTSTART:20260715T100000Z\r\nDTEND:20260715T110000Z\r\nSUMMARY:Test\r\nUID:test-uid-123\r\nX-ENTOURAGE_UUID:test-uid-123\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
+
+	private function makePlugin(bool $forgiving): Plugin {
+		/** @var IConfig&MockObject $config */
+		$config = $this->createMock(IConfig::class);
+		$config->method('getSystemValueBool')
+			->with('dav.forgiving_ical_parser', false)
+			->willReturn($forgiving);
+
+		$plugin = new class($config) extends Plugin {
+			public function exposeValidateICalendar(string &$data, string $path, bool &$modified, RequestInterface $request, ResponseInterface $response, bool $isNew): void {
+				$this->validateICalendar($data, $path, $modified, $request, $response, $isNew);
+			}
+		};
+
+		/** @var SabreServer&MockObject $server */
+		$server = $this->createMock(SabreServer::class);
+		$server->method('getProperties')->willReturn([]);
+		$server->method('getHTTPPrefer')->willReturn(['handling' => 'lenient']);
+		$server->method('emit')->willReturn(true);
+
+		// Inject server without calling initialize() to avoid its side effects on xml/resourceTypeMapping
+		$prop = new \ReflectionProperty(\Sabre\CalDAV\Plugin::class, 'server');
+		$prop->setValue($plugin, $server);
+
+		return $plugin;
+	}
+
+	public function testValidateICalendarRejectsNonStandardPropertyWhenFlagDisabled(): void {
+		$plugin = $this->makePlugin(false);
+		$data = self::ICS_ENTOURAGE;
+		$modified = false;
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
+
+		$this->expectException(UnsupportedMediaType::class);
+		$plugin->exposeValidateICalendar($data, 'calendars/admin/personal/test.ics', $modified, $request, $response, true);
+	}
+
+	public function testValidateICalendarAcceptsNonStandardPropertyWhenFlagEnabled(): void {
+		$plugin = $this->makePlugin(true);
+		$data = self::ICS_ENTOURAGE;
+		$modified = false;
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
+		$response->expects($this->once())
+			->method('setHeader')
+			->with('X-Sabre-Ew-Gross', $this->stringContains('X-ENTOURAGE_UUID'));
+
+		$plugin->exposeValidateICalendar($data, 'calendars/admin/personal/test.ics', $modified, $request, $response, true);
+	}
 }