Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable30] fix: (CalDav) Delete invitation link when deleting Calendars or Events #49429

Merged
merged 1 commit into from
Nov 23, 2024
Merged

[stable30] fix: (CalDav) Delete invitation link when deleting Calendars or Events #49429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 51 additions & 2 deletions apps/dav/lib/CalDAV/CalDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
*/
protected array $userDisplayNames;

private string $dbObjectsTable = 'calendarobjects';
private string $dbObjectPropertiesTable = 'calendarobjects_props';
private string $dbObjectInvitationsTable = 'calendar_invitations';
private array $cachedObjects = [];

public function __construct(
Expand Down Expand Up @@ -876,6 +878,8 @@ public function deleteCalendar($calendarId, bool $forceDeletePermanently = false
$calendarData = $this->getCalendarById($calendarId);
$shares = $this->getShares($calendarId);

$this->purgeCalendarInvitations($calendarId);

$qbDeleteCalendarObjectProps = $this->db->getQueryBuilder();
$qbDeleteCalendarObjectProps->delete($this->dbObjectPropertiesTable)
->where($qbDeleteCalendarObjectProps->expr()->eq('calendarid', $qbDeleteCalendarObjectProps->createNamedParameter($calendarId)))
Expand Down Expand Up @@ -1143,7 +1147,7 @@ public function getCalendarObject($calendarId, $objectUri, int $calendarType = s
return $this->cachedObjects[$key];
}
$query = $this->db->getQueryBuilder();
$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification', 'deleted_at'])
$query->select(['id', 'uri', 'uid', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification', 'deleted_at'])
->from('calendarobjects')
->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
Expand All @@ -1165,6 +1169,7 @@ private function rowToCalendarObject(array $row): array {
return [
'id' => $row['id'],
'uri' => $row['uri'],
'uid' => $row['uid'],
'lastmodified' => $row['lastmodified'],
'etag' => '"' . $row['etag'] . '"',
'calendarid' => $row['calendarid'],
Expand Down Expand Up @@ -1485,6 +1490,8 @@ public function deleteCalendarObject($calendarId, $objectUri, $calendarType = se

$this->purgeProperties($calendarId, $data['id']);

$this->purgeObjectInvitations($data['uid']);

if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
$calendarRow = $this->getCalendarById($calendarId);
$shares = $this->getShares($calendarId);
Expand Down Expand Up @@ -1681,7 +1688,7 @@ public function calendarQuery($calendarId, array $filters, $calendarType = self:
}
}
$query = $this->db->getQueryBuilder();
$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification', 'deleted_at'])
$query->select(['id', 'uri', 'uid', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification', 'deleted_at'])
->from('calendarobjects')
->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)))
Expand Down Expand Up @@ -3542,4 +3549,46 @@ private function rowToSubscription($row, array $subscription): array {
}
return $subscription;
}

/**
* delete all invitations from a given calendar
*
* @since 31.0.0
*
* @param int $calendarId
*
* @return void
*/
protected function purgeCalendarInvitations(int $calendarId): void {
// select all calendar object uid's
$cmd = $this->db->getQueryBuilder();
$cmd->select('uid')
->from($this->dbObjectsTable)
->where($cmd->expr()->eq('calendarid', $cmd->createNamedParameter($calendarId)));
$allIds = $cmd->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
// delete all links that match object uid's
$cmd = $this->db->getQueryBuilder();
$cmd->delete($this->dbObjectInvitationsTable)
->where($cmd->expr()->in('uid', $cmd->createNamedParameter('uids'), IQueryBuilder::PARAM_STR_ARRAY));
foreach (array_chunk($allIds, 1000) as $chunckIds) {
$cmd->setParameter('uids', $chunckIds, IQueryBuilder::PARAM_INT_ARRAY);
$cmd->executeStatement();
}
}

/**
* Delete all invitations from a given calendar event
*
* @since 31.0.0
*
* @param string $eventId UID of the event
*
* @return void
*/
protected function purgeObjectInvitations(string $eventId): void {
$cmd = $this->db->getQueryBuilder();
$cmd->delete($this->dbObjectInvitationsTable)
->where($cmd->expr()->eq('uid', $cmd->createNamedParameter($eventId)));
$cmd->executeStatement();
}
}
Loading