Merge pull request #18113 from nextcloud/bugfix/15967/webcal_cache_headers

Add refresh-interval to exported calendars

4 files changed, 100 insertions, 1 deletions

diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php
index 1084430719a..e6948d1151e 100644
--- a/apps/dav/composer/composer/autoload_classmap.php
+++ b/apps/dav/composer/composer/autoload_classmap.php
@@ -41,6 +41,7 @@ return array(
     'OCA\\DAV\\CalDAV\\CalendarManager' => $baseDir . '/../lib/CalDAV/CalendarManager.php',
     'OCA\\DAV\\CalDAV\\CalendarObject' => $baseDir . '/../lib/CalDAV/CalendarObject.php',
     'OCA\\DAV\\CalDAV\\CalendarRoot' => $baseDir . '/../lib/CalDAV/CalendarRoot.php',
+    'OCA\\DAV\\CalDAV\\ICSExportPlugin\\ICSExportPlugin' => $baseDir . '/../lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php',
     'OCA\\DAV\\CalDAV\\InvitationResponse\\InvitationResponseServer' => $baseDir . '/../lib/CalDAV/InvitationResponse/InvitationResponseServer.php',
     'OCA\\DAV\\CalDAV\\Outbox' => $baseDir . '/../lib/CalDAV/Outbox.php',
     'OCA\\DAV\\CalDAV\\Plugin' => $baseDir . '/../lib/CalDAV/Plugin.php',
diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php
index b3f5688166a..4a26ceb040f 100644
--- a/apps/dav/composer/composer/autoload_static.php
+++ b/apps/dav/composer/composer/autoload_static.php
@@ -56,6 +56,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\CalDAV\\CalendarManager' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarManager.php',
         'OCA\\DAV\\CalDAV\\CalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarObject.php',
         'OCA\\DAV\\CalDAV\\CalendarRoot' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarRoot.php',
+        'OCA\\DAV\\CalDAV\\ICSExportPlugin\\ICSExportPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php',
         'OCA\\DAV\\CalDAV\\InvitationResponse\\InvitationResponseServer' => __DIR__ . '/..' . '/../lib/CalDAV/InvitationResponse/InvitationResponseServer.php',
         'OCA\\DAV\\CalDAV\\Outbox' => __DIR__ . '/..' . '/../lib/CalDAV/Outbox.php',
         'OCA\\DAV\\CalDAV\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/Plugin.php',
diff --git a/apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php b/apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php
new file mode 100644
index 00000000000..3fe8477a0aa
--- /dev/null
+++ b/apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @copyright 2019, Georg Ehrke <oc.list@georgehrke.com>
+ *
+ * @author Georg Ehrke <oc.list@georgehrke.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\DAV\CalDAV\ICSExportPlugin;
+
+use OCP\IConfig;
+use OCP\ILogger;
+use Sabre\HTTP\ResponseInterface;
+use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\InvalidDataException;
+use Sabre\VObject\Property\ICalendar\Duration;
+
+/**
+ * Class ICSExportPlugin
+ *
+ * @package OCA\DAV\CalDAV\ICSExportPlugin
+ */
+class ICSExportPlugin extends \Sabre\CalDAV\ICSExportPlugin {
+
+	/** @var IConfig */
+	private $config;
+
+	/** @var ILogger */
+	private $logger;
+
+	/** @var string */
+	private const DEFAULT_REFRESH_INTERVAL = 'PT4H';
+
+	/**
+	 * ICSExportPlugin constructor.
+	 *
+	 * @param IConfig $config
+	 */
+	public function __construct(IConfig $config, ILogger $logger) {
+		$this->config = $config;
+		$this->logger = $logger;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response) {
+		if (!isset($properties['{http://nextcloud.com/ns}refresh-interval'])) {
+			$value = $this->config->getAppValue('dav', 'defaultRefreshIntervalExportedCalendars', self::DEFAULT_REFRESH_INTERVAL);
+			$properties['{http://nextcloud.com/ns}refresh-interval'] = $value;
+		}
+
+		return parent::generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, $response);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function mergeObjects(array $properties, array $inputObjects) {
+		$vcalendar = parent::mergeObjects($properties, $inputObjects);
+
+		if (isset($properties['{http://nextcloud.com/ns}refresh-interval'])) {
+			$refreshIntervalValue = $properties['{http://nextcloud.com/ns}refresh-interval'];
+			try {
+				DateTimeParser::parseDuration($refreshIntervalValue);
+			} catch (InvalidDataException $ex) {
+				$this->logger->debug('Invalid refresh interval for exported calendar, falling back to default value ...');
+				$refreshIntervalValue = self::DEFAULT_REFRESH_INTERVAL;
+			}
+
+			// https://tools.ietf.org/html/rfc7986#section-5.7
+			$refreshInterval = new Duration($vcalendar, 'REFRESH-INTERVAL', $refreshIntervalValue);
+			$refreshInterval->add('VALUE', 'DURATION');
+			$vcalendar->add($refreshInterval);
+
+			// Legacy property for compatibility
+			$vcalendar->{'X-PUBLISHED-TTL'} = $refreshIntervalValue;
+		}
+
+		return $vcalendar;
+	}
+
+}
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index 7dd1cf3a8fa..2e2615283d1 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -149,7 +149,7 @@ class Server {
 		// calendar plugins
 		if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
 			$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-			$this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+			$this->server->addPlugin(new \OCA\DAV\CalDAV\ICSExportPlugin\ICSExportPlugin(\OC::$server->getConfig(), \OC::$server->getLogger()));
 			$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
 			if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
 				$this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));