fixup! fix: calendar subscription memory exhaustion

Signed-off-by: SebastianKrupinski <[email protected]>

Author: SebastianKrupinski

apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php

@@ -9,6 +9,7 @@
 namespace OCA\DAV\CalDAV\WebcalCaching;
 
 use OCA\DAV\CalDAV\CalDavBackend;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCA\DAV\CalDAV\Import\ImportService;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\PropPatch;
@@ -30,6 +31,7 @@ public function __construct(
 		private CalDavBackend $calDavBackend,
 		private LoggerInterface $logger,
 		private Connection $connection,
+		private ITimeFactory $time,
 		private ImportService $importService,
 	) {
 	}
@@ -40,6 +42,17 @@ public function refreshSubscription(string $principalUri, string $uri) {
 			return;
 		}
 
+		// Check the refresh rate if there is any
+		if (!empty($subscription[self::REFRESH_RATE])) {
+			// add the refresh interval to the last modified timestamp
+			$refreshInterval = new \DateInterval($subscription[self::REFRESH_RATE]);
+			$updateTime = $this->time->getDateTime();
+			$updateTime->setTimestamp($subscription['lastmodified'])->add($refreshInterval);
+			if ($updateTime->getTimestamp() > $this->time->getTime()) {
+				return;
+			}
+		}
+
 		$result = $this->connection->queryWebcalFeed($subscription);
 		if (!$result) {
 			return;
@@ -71,6 +84,10 @@ public function refreshSubscription(string $principalUri, string $uri) {
 
 				// Some calendar providers (e.g. Google, MS) use very long UIDs
 				if (strlen($vBase->UID->getValue()) > 512) {
+					$this->logger->warning('Skipping calendar object with overly long UID from subscription "{subscriptionId}"', [
+						'subscriptionId' => $subscription['id'],
+						'uid' => $vBase->UID->getValue(),
+					]);
 					continue;
 				}
 

apps/dav/tests/unit/CalDAV/WebcalCaching/RefreshWebcalServiceTest.php

@@ -11,6 +11,7 @@
 use OCA\DAV\CalDAV\Import\ImportService;
 use OCA\DAV\CalDAV\WebcalCaching\Connection;
 use OCA\DAV\CalDAV\WebcalCaching\RefreshWebcalService;
+use OCP\AppFramework\Utility\ITimeFactory;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\Exception\BadRequest;
@@ -24,6 +25,7 @@ class RefreshWebcalServiceTest extends TestCase {
 	private Connection&MockObject $connection;
 	private LoggerInterface&MockObject $logger;
 	private ImportService&MockObject $importService;
+	private ITimeFactory&MockObject $timeFactory;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -32,6 +34,10 @@ protected function setUp(): void {
 		$this->connection = $this->createMock(Connection::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->importService = $this->createMock(ImportService::class);
+		$this->timeFactory = $this->createMock(ITimeFactory::class);
+		// Default time factory behavior: current time is far in the future so refresh always happens
+		$this->timeFactory->method('getTime')->willReturn(PHP_INT_MAX);
+		$this->timeFactory->method('getDateTime')->willReturn(new \DateTime());
 	}
 
 	/**
@@ -50,6 +56,7 @@ public function testRun(string $body, string $format, string $result): void {
 			$this->caldavBackend,
 			$this->logger,
 			$this->connection,
+			$this->timeFactory,
 			$this->importService
 		);
 
@@ -118,6 +125,7 @@ public function testRunIdentical(string $uid, array $calendarObject, string $bod
 			$this->caldavBackend,
 			$this->logger,
 			$this->connection,
+			$this->timeFactory,
 			$this->importService
 		);
 
@@ -179,6 +187,7 @@ public function testSubscriptionNotFound(): void {
 			$this->caldavBackend,
 			$this->logger,
 			$this->connection,
+			$this->timeFactory,
 			$this->importService
 		);
 
@@ -198,6 +207,7 @@ public function testConnectionReturnsNull(): void {
 			$this->caldavBackend,
 			$this->logger,
 			$this->connection,
+			$this->timeFactory,
 			$this->importService
 		);
 
@@ -234,6 +244,7 @@ public function testDeletedObjectsArePurged(): void {
 			$this->caldavBackend,
 			$this->logger,
 			$this->connection,
+			$this->timeFactory,
 			$this->importService
 		);
 
@@ -295,6 +306,7 @@ public function testLongUidIsSkipped(): void {
 			$this->caldavBackend,
 			$this->logger,
 			$this->connection,
+			$this->timeFactory,
 			$this->importService
 		);
 
@@ -313,8 +325,8 @@ public function testLongUidIsSkipped(): void {
 				],
 			]);
 
-		// Create a UID that is longer than 255 characters
-		$longUid = str_repeat('a', 256);
+		// Create a UID that is longer than 512 characters
+		$longUid = str_repeat('a', 513);
 		$body = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Test//Test//EN\r\nBEGIN:VEVENT\r\nUID:$longUid\r\nDTSTAMP:20160218T133704Z\r\nDTSTART:20160218T133704Z\r\nSUMMARY:Event with long UID\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
 		$stream = $this->createStreamFromString($body);
 
@@ -346,7 +358,7 @@ public function testLongUidIsSkipped(): void {
 	public function testRunCreateCalendarNoException(string $body, string $format, string $result): void {
 		$refreshWebcalService = $this->getMockBuilder(RefreshWebcalService::class)
 			->onlyMethods(['getSubscription'])
-			->setConstructorArgs([$this->caldavBackend, $this->logger, $this->connection, $this->importService])
+			->setConstructorArgs([$this->caldavBackend, $this->logger, $this->connection, $this->timeFactory, $this->importService])
 			->getMock();
 
 		$refreshWebcalService
@@ -399,7 +411,7 @@ public function testRunCreateCalendarNoException(string $body, string $format, s
 	public function testRunCreateCalendarBadRequest(string $body, string $format, string $result): void {
 		$refreshWebcalService = $this->getMockBuilder(RefreshWebcalService::class)
 			->onlyMethods(['getSubscription'])
-			->setConstructorArgs([$this->caldavBackend, $this->logger, $this->connection, $this->importService])
+			->setConstructorArgs([$this->caldavBackend, $this->logger, $this->connection, $this->timeFactory, $this->importService])
 			->getMock();
 
 		$refreshWebcalService