Merge pull request #13441 from nextcloud/backport/13430-14

[stable14] Respect classification of calendar events in activity stream
2019-01-09 20:21:41 +01:00 · 2019-01-09 20:21:41 +01:00 · d52666da09
parent 4696a32e08 32a2125281
commit d52666da09
6 changed files with 148 additions and 4 deletions
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@ -5,7 +5,7 @@
 	<name>WebDAV</name>
 	<summary>WebDAV endpoint</summary>
 	<description>WebDAV endpoint</description>
-	<version>1.6.0</version>
+	<version>1.6.1</version>
 	<licence>agpl</licence>
 	<author>owncloud.org</author>
 	<namespace>DAV</namespace>
@ -30,6 +30,7 @@
 			<step>OCA\DAV\Migration\FixBirthdayCalendarComponent</step>
 			<step>OCA\DAV\Migration\CalDAVRemoveEmptyValue</step>
 			<step>OCA\DAV\Migration\BuildCalendarSearchIndex</step>
+			<step>OCA\DAV\Migration\RemoveClassifiedEventActivity</step>
 		</post-migration>
 	</repair-steps>

--- a/apps/dav/composer/composer/autoload_classmap.php
+++ b/apps/dav/composer/composer/autoload_classmap.php
@ -148,6 +148,7 @@ return array(
    'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
    'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => $baseDir . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
    'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => $baseDir . '/../lib/Migration/FixBirthdayCalendarComponent.php',
+    'OCA\\DAV\\Migration\\RemoveClassifiedEventActivity' => $baseDir . '/../lib/Migration/RemoveClassifiedEventActivity.php',
    'OCA\\DAV\\Migration\\Version1004Date20170825134824' => $baseDir . '/../lib/Migration/Version1004Date20170825134824.php',
    'OCA\\DAV\\Migration\\Version1004Date20170919104507' => $baseDir . '/../lib/Migration/Version1004Date20170919104507.php',
    'OCA\\DAV\\Migration\\Version1004Date20170924124212' => $baseDir . '/../lib/Migration/Version1004Date20170924124212.php',
--- a/apps/dav/composer/composer/autoload_static.php
+++ b/apps/dav/composer/composer/autoload_static.php
@ -163,6 +163,7 @@ class ComposerStaticInitDAV
        'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
        'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => __DIR__ . '/..' . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
        'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => __DIR__ . '/..' . '/../lib/Migration/FixBirthdayCalendarComponent.php',
+        'OCA\\DAV\\Migration\\RemoveClassifiedEventActivity' => __DIR__ . '/..' . '/../lib/Migration/RemoveClassifiedEventActivity.php',
        'OCA\\DAV\\Migration\\Version1004Date20170825134824' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170825134824.php',
        'OCA\\DAV\\Migration\\Version1004Date20170919104507' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170919104507.php',
        'OCA\\DAV\\Migration\\Version1004Date20170924124212' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170924124212.php',
--- a/apps/dav/lib/CalDAV/Activity/Backend.php
+++ b/apps/dav/lib/CalDAV/Activity/Backend.php
@ -27,6 +27,7 @@ namespace OCA\DAV\CalDAV\Activity;

 use OCA\DAV\CalDAV\Activity\Provider\Calendar;
 use OCA\DAV\CalDAV\Activity\Provider\Event;
+use OCA\DAV\CalDAV\CalDavBackend;
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager as IActivityManager;
 use OCP\IGroup;
@ -415,6 +416,7 @@ class Backend {
 			$currentUser = $owner;
 		}

+		$classification = $objectData['classification'] ?? CalDavBackend::CLASSIFICATION_PUBLIC;
 		$object = $this->getObjectNameAndType($objectData);
 		$action = $action . '_' . $object['type'];

@ -434,6 +436,11 @@ class Backend {
 		$users[] = $owner;

 		foreach ($users as $user) {
+			if ($classification === CalDavBackend::CLASSIFICATION_PRIVATE && $user !== $owner) {
+				// Private events are only shown to the owner
+				continue;
+			}
+
 			$event->setAffectedUser($user)
 				->setSubject(
 					$user === $currentUser ? $action . '_self' : $action,
@ -446,7 +453,8 @@ class Backend {
 						],
 						'object' => [
 							'id' => $object['id'],
-							'name' => $object['name'],
+							'name' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner ? 'Busy' : $object['name'],
+							'classified' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner,
 						],
 					]
 				);
--- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
@ -23,6 +23,7 @@

 namespace OCA\DAV\CalDAV\Activity\Provider;

+use OCA\DAV\CalDAV\CalDavBackend;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IManager;
@ -131,14 +132,14 @@ class Event extends Base {
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'event' => $this->generateObjectParameter($parameters['object']),
+						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
 					];
 				case self::SUBJECT_OBJECT_ADD . '_event_self':
 				case self::SUBJECT_OBJECT_DELETE . '_event_self':
 				case self::SUBJECT_OBJECT_UPDATE . '_event_self':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'event' => $this->generateObjectParameter($parameters['object']),
+						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
 					];
 			}
 		}
@ -168,4 +169,12 @@ class Event extends Base {

 		throw new \InvalidArgumentException();
 	}
+
+	private function generateClassifiedObjectParameter(array $eventData) {
+		$parameter = $this->generateObjectParameter($eventData);
+		if (!empty($eventData['classified'])) {
+			$parameter['name'] = $this->l->t('Busy');
+		}
+		return $parameter;
+	}
 }
--- a/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php
+++ b/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php
@ -0,0 +1,124 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.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\Migration;
+
+use OCA\DAV\CalDAV\CalDavBackend;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class RemoveClassifiedEventActivity implements IRepairStep {
+
+	/** @var IDBConnection */
+	private $connection;
+
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getName() {
+		return 'Remove activity entries of private events';
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function run(IOutput $output) {
+		if (!$this->connection->tableExists('activity')) {
+			return;
+		}
+
+		$deletedEvents = $this->removePrivateEventActivity();
+		$deletedEvents += $this->removeConfidentialUncensoredEventActivity();
+
+		$output->info("Removed $deletedEvents activity entries");
+	}
+
+	protected function removePrivateEventActivity(): int {
+		$deletedEvents = 0;
+
+		$delete = $this->connection->getQueryBuilder();
+		$delete->delete('activity')
+			->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
+			->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
+			->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
+			->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')));
+
+		$query = $this->connection->getQueryBuilder();
+		$query->select('c.principaluri', 'o.calendarid', 'o.uid')
+			->from('calendarobjects', 'o')
+			->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
+			->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_PRIVATE)));
+		$result = $query->execute();
+
+		while ($row = $result->fetch()) {
+			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
+				->setParameter('type', 'calendar')
+				->setParameter('calendar_id', $row['calendarid'])
+				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%');
+			$deletedEvents += $delete->execute();
+		}
+		$result->closeCursor();
+
+		return $deletedEvents;
+	}
+
+	protected function removeConfidentialUncensoredEventActivity(): int {
+		$deletedEvents = 0;
+
+		$delete = $this->connection->getQueryBuilder();
+		$delete->delete('activity')
+			->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
+			->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
+			->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
+			->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')))
+			->andWhere($delete->expr()->notLike('subjectparams', $delete->createParameter('filtered_name')));
+
+		$query = $this->connection->getQueryBuilder();
+		$query->select('c.principaluri', 'o.calendarid', 'o.uid')
+			->from('calendarobjects', 'o')
+			->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
+			->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_CONFIDENTIAL)));
+		$result = $query->execute();
+
+		while ($row = $result->fetch()) {
+			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
+				->setParameter('type', 'calendar')
+				->setParameter('calendar_id', $row['calendarid'])
+				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%')
+				->setParameter('filtered_name', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '","name":"Busy"') . '%');
+			$deletedEvents += $delete->execute();
+		}
+		$result->closeCursor();
+
+		return $deletedEvents;
+	}
+
+	protected function getPrincipal(string $principalUri): string {
+		$uri = explode('/', $principalUri);
+		return $uri[2];
+	}
+}