Skip to content

feat(dav): Directly access shared calendars by URI #36681

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

Draft
tcitworld wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat(dav): Directly access shared calendars by URI #36681

Show file tree
Hide file tree
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
81 changes: 80 additions & 1 deletion apps/dav/lib/CalDAV/CalDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ public function getCalendarsForUser($principalUri) {
->where($query->expr()->in('s.principaluri', $query->createParameter('principaluri')))
->andWhere($query->expr()->eq('s.type', $query->createParameter('type')))
->setParameter('type', 'calendar')
->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
->setParameter('principaluri', $principals, IQueryBuilder::PARAM_STR_ARRAY);

$result = $query->executeQuery();

Expand Down Expand Up @@ -657,6 +657,85 @@ public function getCalendarByUri($principal, $uri) {
return $calendar;
}

public function getSharedCalendarByUri(string $principalUri, string $calendarSharedUri): ?array {
// query for shared calendars
[$calendarUri, ] = explode('_shared_by_', $calendarSharedUri, 2);

$principals = $this->principalBackend->getGroupMembership($principalUri, true);
$principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUri));

$principals[] = $principalUri;

$fields = array_column($this->propertyMap, 0);
$fields[] = 'a.id';
$fields[] = 'a.uri';
$fields[] = 'a.synctoken';
$fields[] = 'a.components';
$fields[] = 'a.principaluri';
$fields[] = 'a.transparent';
$fields[] = 's.access';
$query = $this->db->getQueryBuilder();
$query->select($fields)
->from('dav_shares', 's')
->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
->where($query->expr()->eq('a.uri', $query->createParameter('uri')))
->andWhere($query->expr()->in('s.principaluri', $query->createParameter('principaluri')))
->andWhere($query->expr()->eq('s.type', $query->createParameter('type')))
->setParameter('uri', $calendarUri)
->setParameter('type', 'calendar')
->setParameter('principaluri', $principals, IQueryBuilder::PARAM_STR_ARRAY);

$result = $query->executeQuery();

$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';

$calendar = null;

while ($row = $result->fetch()) {
$row['principaluri'] = (string)$row['principaluri'];
if ($row['principaluri'] === $principalUri) {
continue;
}

$readOnly = (int)$row['access'] === Backend::ACCESS_READ;
if (isset($calendars[$row['id']])) {

Check failure

Code scanning / Psalm

UndefinedVariable

Cannot find referenced variable $calendars
if ($readOnly) {
// New share can not have more permissions then the old one.
continue;
}
if (isset($calendars[$row['id']][$readOnlyPropertyName]) &&
$calendars[$row['id']][$readOnlyPropertyName] === 0) {
// Old share is already read-write, no more permissions can be gained
continue;
}
}

// Fixes for shared calendars
[, $name] = Uri\split($row['principaluri']);

Check failure

Code scanning / Psalm

UndefinedFunction

Function Sabre\Uri\split does not exist
$row['displayname'] = $row['displayname'] . ' (' . ($this->userManager->getDisplayName($name) ?? ($name ?? '')) . ')';

$components = [];
if ($row['components']) {
$components = explode(',', $row['components']);
}

$calendar = [
'id' => $row['id'],
'uri' => $row['uri'] . '_shared_by_' . $name,
'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
$readOnlyPropertyName => $readOnly,
];
}
$calendar = $this->rowToCalendar($row, $calendar);

Check notice

Code scanning / Psalm

PossiblyUndefinedVariable

Possibly undefined variable $row, first seen on line 694

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 2 of OCA\DAV\CalDAV\CalDavBackend::rowToCalendar cannot be null, possibly null value provided
$calendar = $this->addOwnerPrincipalToCalendar($calendar);
return $this->addResourceTypeToCalendar($row, $calendar);
}

/**
* @return array{id: int, uri: string, '{http://calendarserver.org/ns/}getctag': string, '{http://sabredav.org/ns}sync-token': int, '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set': SupportedCalendarComponentSet, '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp': ScheduleCalendarTransp, '{urn:ietf:params:xml:ns:caldav}calendar-timezone': ?string }|null
*/
Expand Down
5 changes: 3 additions & 2 deletions apps/dav/lib/CalDAV/CalendarHome.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,9 @@ public function getChild($name) {
}

// Fallback to cover shared calendars
foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
if ($calendar['uri'] === $name) {
if ($this->caldavBackend instanceof CalDavBackend) {
$calendar = $this->caldavBackend->getSharedCalendarByUri($this->principalInfo['uri'], $name);
if(!empty($calendar)) {
return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
}
}
Expand Down