aboutsummaryrefslogtreecommitdiffstats
path: root/apps/dav/lib
diff options
context:
space:
mode:
Diffstat (limited to 'apps/dav/lib')
-rw-r--r--apps/dav/lib/CalDAV/Calendar.php6
-rw-r--r--apps/dav/lib/CalDAV/CalendarProvider.php35
-rw-r--r--apps/dav/lib/Connector/Sabre/ServerFactory.php2
-rw-r--r--apps/dav/lib/DAV/CustomPropertiesBackend.php100
-rw-r--r--apps/dav/lib/Db/Property.php1
-rw-r--r--apps/dav/lib/Db/PropertyMapper.php37
-rw-r--r--apps/dav/lib/Migration/Version1034Date20250813093701.php53
-rw-r--r--apps/dav/lib/Server.php2
8 files changed, 219 insertions, 17 deletions
diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php
index dd3a4cf3f69..deb00caa93d 100644
--- a/apps/dav/lib/CalDAV/Calendar.php
+++ b/apps/dav/lib/CalDAV/Calendar.php
@@ -36,7 +36,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IRestorable, IShareable
public function __construct(
BackendInterface $caldavBackend,
- $calendarInfo,
+ array $calendarInfo,
IL10N $l10n,
private IConfig $config,
private LoggerInterface $logger,
@@ -60,6 +60,10 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IRestorable, IShareable
$this->l10n = $l10n;
}
+ public function getUri(): string {
+ return $this->calendarInfo['uri'];
+ }
+
/**
* {@inheritdoc}
* @throws Forbidden
diff --git a/apps/dav/lib/CalDAV/CalendarProvider.php b/apps/dav/lib/CalDAV/CalendarProvider.php
index 3cc4039ed36..a8b818e59aa 100644
--- a/apps/dav/lib/CalDAV/CalendarProvider.php
+++ b/apps/dav/lib/CalDAV/CalendarProvider.php
@@ -36,9 +36,14 @@ class CalendarProvider implements ICalendarProvider {
});
}
+ $additionalProperties = $this->getAdditionalPropertiesForCalendars($calendarInfos);
$iCalendars = [];
foreach ($calendarInfos as $calendarInfo) {
- $calendarInfo = array_merge($calendarInfo, $this->getAdditionalProperties($calendarInfo['principaluri'], $calendarInfo['uri']));
+ $user = str_replace('principals/users/', '', $calendarInfo['principaluri']);
+ $path = 'calendars/' . $user . '/' . $calendarInfo['uri'];
+
+ $calendarInfo = array_merge($calendarInfo, $additionalProperties[$path] ?? []);
+
$calendar = new Calendar($this->calDavBackend, $calendarInfo, $this->l10n, $this->config, $this->logger);
$iCalendars[] = new CalendarImpl(
$calendar,
@@ -49,16 +54,34 @@ class CalendarProvider implements ICalendarProvider {
return $iCalendars;
}
- public function getAdditionalProperties(string $principalUri, string $calendarUri): array {
- $user = str_replace('principals/users/', '', $principalUri);
- $path = 'calendars/' . $user . '/' . $calendarUri;
+ /**
+ * @param array{
+ * principaluri: string,
+ * uri: string,
+ * }[] $uris
+ * @return array<string, array<string, string|bool>>
+ */
+ private function getAdditionalPropertiesForCalendars(array $uris): array {
+ $calendars = [];
+ foreach ($uris as $uri) {
+ /** @var string $user */
+ $user = str_replace('principals/users/', '', $uri['principaluri']);
+ if (!array_key_exists($user, $calendars)) {
+ $calendars[$user] = [];
+ }
+ $calendars[$user][] = 'calendars/' . $user . '/' . $uri['uri'];
+ }
- $properties = $this->propertyMapper->findPropertiesByPath($user, $path);
+ $properties = $this->propertyMapper->findPropertiesByPathsAndUsers($calendars);
$list = [];
foreach ($properties as $property) {
if ($property instanceof Property) {
- $list[$property->getPropertyname()] = match ($property->getPropertyname()) {
+ if (!isset($list[$property->getPropertypath()])) {
+ $list[$property->getPropertypath()] = [];
+ }
+
+ $list[$property->getPropertypath()][$property->getPropertyname()] = match ($property->getPropertyname()) {
'{http://owncloud.org/ns}calendar-enabled' => (bool)$property->getPropertyvalue(),
default => $property->getPropertyvalue()
};
diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php
index a8d80dd8429..1b4de841ec6 100644
--- a/apps/dav/lib/Connector/Sabre/ServerFactory.php
+++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php
@@ -14,6 +14,7 @@ use OCA\DAV\CalDAV\DefaultCalendarValidator;
use OCA\DAV\CalDAV\Proxy\ProxyMapper;
use OCA\DAV\DAV\CustomPropertiesBackend;
use OCA\DAV\DAV\ViewOnlyPlugin;
+use OCA\DAV\Db\PropertyMapper;
use OCA\DAV\Files\BrowserErrorPagePlugin;
use OCA\DAV\Files\Sharing\RootCollection;
use OCA\DAV\Upload\CleanupService;
@@ -228,6 +229,7 @@ class ServerFactory {
$tree,
$this->databaseConnection,
$this->userSession->getUser(),
+ \OCP\Server::get(PropertyMapper::class),
\OCP\Server::get(DefaultCalendarValidator::class),
)
)
diff --git a/apps/dav/lib/DAV/CustomPropertiesBackend.php b/apps/dav/lib/DAV/CustomPropertiesBackend.php
index f9a4f8ee986..be7345f25df 100644
--- a/apps/dav/lib/DAV/CustomPropertiesBackend.php
+++ b/apps/dav/lib/DAV/CustomPropertiesBackend.php
@@ -9,13 +9,20 @@
namespace OCA\DAV\DAV;
use Exception;
+use OCA\DAV\CalDAV\CalDavBackend;
use OCA\DAV\CalDAV\Calendar;
+use OCA\DAV\CalDAV\CalendarHome;
use OCA\DAV\CalDAV\CalendarObject;
use OCA\DAV\CalDAV\DefaultCalendarValidator;
+use OCA\DAV\CalDAV\Integration\ExternalCalendar;
+use OCA\DAV\CalDAV\Outbox;
+use OCA\DAV\CalDAV\Trashbin\TrashbinHome;
use OCA\DAV\Connector\Sabre\Directory;
+use OCA\DAV\Db\PropertyMapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\IUser;
+use Sabre\CalDAV\Schedule\Inbox;
use Sabre\DAV\Exception as DavException;
use Sabre\DAV\PropertyStorage\Backend\BackendInterface;
use Sabre\DAV\PropFind;
@@ -97,11 +104,17 @@ class CustomPropertiesBackend implements BackendInterface {
];
/**
+ * Map of well-known property names to default values
+ */
+ private const PROPERTY_DEFAULT_VALUES = [
+ '{http://owncloud.org/ns}calendar-enabled' => '1',
+ ];
+
+ /**
* Properties cache
- *
- * @var array
*/
- private $userCache = [];
+ private array $userCache = [];
+ private array $publishedCache = [];
private XmlService $xmlService;
/**
@@ -114,6 +127,7 @@ class CustomPropertiesBackend implements BackendInterface {
private Tree $tree,
private IDBConnection $connection,
private IUser $user,
+ private PropertyMapper $propertyMapper,
private DefaultCalendarValidator $defaultCalendarValidator,
) {
$this->xmlService = new XmlService();
@@ -197,6 +211,13 @@ class CustomPropertiesBackend implements BackendInterface {
$this->cacheDirectory($path, $node);
}
+ if ($node instanceof CalendarHome && $propFind->getDepth() !== 0) {
+ $backend = $node->getCalDAVBackend();
+ if ($backend instanceof CalDavBackend) {
+ $this->cacheCalendars($node, $requestedProps);
+ }
+ }
+
if ($node instanceof CalendarObject) {
// No custom properties supported on individual events
return;
@@ -316,6 +337,10 @@ class CustomPropertiesBackend implements BackendInterface {
return [];
}
+ if (isset($this->publishedCache[$path])) {
+ return $this->publishedCache[$path];
+ }
+
$qb = $this->connection->getQueryBuilder();
$qb->select('*')
->from(self::TABLE_NAME)
@@ -326,6 +351,7 @@ class CustomPropertiesBackend implements BackendInterface {
$props[$row['propertyname']] = $this->decodeValueFromDatabase($row['propertyvalue'], $row['valuetype']);
}
$result->closeCursor();
+ $this->publishedCache[$path] = $props;
return $props;
}
@@ -364,6 +390,62 @@ class CustomPropertiesBackend implements BackendInterface {
$this->userCache = array_merge($this->userCache, $propsByPath);
}
+ private function cacheCalendars(CalendarHome $node, array $requestedProperties): void {
+ $calendars = $node->getChildren();
+
+ $users = [];
+ foreach ($calendars as $calendar) {
+ if ($calendar instanceof Calendar) {
+ $user = str_replace('principals/users/', '', $calendar->getPrincipalURI());
+ if (!isset($users[$user])) {
+ $users[$user] = ['calendars/' . $user];
+ }
+ $users[$user][] = 'calendars/' . $user . '/' . $calendar->getUri();
+ } elseif ($calendar instanceof Inbox || $calendar instanceof Outbox || $calendar instanceof TrashbinHome || $calendar instanceof ExternalCalendar) {
+ if ($calendar->getOwner()) {
+ $user = str_replace('principals/users/', '', $calendar->getOwner());
+ if (!isset($users[$user])) {
+ $users[$user] = ['calendars/' . $user];
+ }
+ $users[$user][] = 'calendars/' . $user . '/' . $calendar->getName();
+ }
+ }
+ }
+
+ // user properties
+ $properties = $this->propertyMapper->findPropertiesByPathsAndUsers($users);
+
+ $propsByPath = [];
+ foreach ($users as $paths) {
+ foreach ($paths as $path) {
+ $propsByPath[$path] = [];
+ }
+ }
+
+ foreach ($properties as $property) {
+ $propsByPath[$property->getPropertypath()][$property->getPropertyname()] = $this->decodeValueFromDatabase($property->getPropertyvalue(), $property->getValuetype());
+ }
+ $this->userCache = array_merge($this->userCache, $propsByPath);
+
+ // published properties
+ $allowedProps = array_intersect(self::PUBLISHED_READ_ONLY_PROPERTIES, $requestedProperties);
+ if (empty($allowedProps)) {
+ return;
+ }
+ $paths = [];
+ foreach ($users as $nestedPaths) {
+ $paths = array_merge($paths, $nestedPaths);
+ }
+ $paths = array_unique($paths);
+
+ $propsByPath = array_fill_keys(array_values($paths), []);
+ $properties = $this->propertyMapper->findPropertiesByPaths($paths, $allowedProps);
+ foreach ($properties as $property) {
+ $propsByPath[$property->getPropertypath()][$property->getPropertyname()] = $this->decodeValueFromDatabase($property->getPropertyvalue(), $property->getValuetype());
+ }
+ $this->publishedCache = array_merge($this->publishedCache, $propsByPath);
+ }
+
/**
* Returns a list of properties for the given path and current user
*
@@ -410,6 +492,14 @@ class CustomPropertiesBackend implements BackendInterface {
return $props;
}
+ private function isPropertyDefaultValue(string $name, mixed $value): bool {
+ if (!isset(self::PROPERTY_DEFAULT_VALUES[$name])) {
+ return false;
+ }
+
+ return self::PROPERTY_DEFAULT_VALUES[$name] === $value;
+ }
+
/**
* @throws Exception
*/
@@ -426,8 +516,8 @@ class CustomPropertiesBackend implements BackendInterface {
'propertyName' => $propertyName,
];
- // If it was null, we need to delete the property
- if (is_null($propertyValue)) {
+ // If it was null or set to the default value, we need to delete the property
+ if (is_null($propertyValue) || $this->isPropertyDefaultValue($propertyName, $propertyValue)) {
if (array_key_exists($propertyName, $existing)) {
$deleteQuery = $deleteQuery ?? $this->createDeleteQuery();
$deleteQuery
diff --git a/apps/dav/lib/Db/Property.php b/apps/dav/lib/Db/Property.php
index 96c5f75ef4f..6c1e249ac47 100644
--- a/apps/dav/lib/Db/Property.php
+++ b/apps/dav/lib/Db/Property.php
@@ -16,6 +16,7 @@ use OCP\AppFramework\Db\Entity;
* @method string getPropertypath()
* @method string getPropertyname()
* @method string getPropertyvalue()
+ * @method int getValuetype()
*/
class Property extends Entity {
diff --git a/apps/dav/lib/Db/PropertyMapper.php b/apps/dav/lib/Db/PropertyMapper.php
index 1789194ee7a..a3dbdaa7d98 100644
--- a/apps/dav/lib/Db/PropertyMapper.php
+++ b/apps/dav/lib/Db/PropertyMapper.php
@@ -10,6 +10,7 @@ declare(strict_types=1);
namespace OCA\DAV\Db;
use OCP\AppFramework\Db\QBMapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
/**
@@ -39,17 +40,43 @@ class PropertyMapper extends QBMapper {
}
/**
+ * @param array<string, string[]> $calendars
* @return Property[]
+ * @throws \OCP\DB\Exception
*/
- public function findPropertiesByPath(string $userId, string $path): array {
+ public function findPropertiesByPathsAndUsers(array $calendars): array {
$selectQb = $this->db->getQueryBuilder();
$selectQb->select('*')
- ->from(self::TABLE_NAME)
- ->where(
- $selectQb->expr()->eq('userid', $selectQb->createNamedParameter($userId)),
- $selectQb->expr()->eq('propertypath', $selectQb->createNamedParameter($path)),
+ ->from(self::TABLE_NAME);
+
+ foreach ($calendars as $user => $paths) {
+ $selectQb->orWhere(
+ $selectQb->expr()->andX(
+ $selectQb->expr()->eq('userid', $selectQb->createNamedParameter($user)),
+ $selectQb->expr()->in('propertypath', $selectQb->createNamedParameter($paths, IQueryBuilder::PARAM_STR_ARRAY)),
+ )
);
+ }
+
return $this->findEntities($selectQb);
}
+ /**
+ * @param string[] $calendars
+ * @param string[] $allowedProperties
+ * @return Property[]
+ * @throws \OCP\DB\Exception
+ */
+ public function findPropertiesByPaths(array $calendars, array $allowedProperties = []): array {
+ $selectQb = $this->db->getQueryBuilder();
+ $selectQb->select('*')
+ ->from(self::TABLE_NAME)
+ ->where($selectQb->expr()->in('propertypath', $selectQb->createNamedParameter($calendars, IQueryBuilder::PARAM_STR_ARRAY)));
+
+ if ($allowedProperties) {
+ $selectQb->andWhere($selectQb->expr()->in('propertyname', $selectQb->createNamedParameter($allowedProperties, IQueryBuilder::PARAM_STR_ARRAY)));
+ }
+
+ return $this->findEntities($selectQb);
+ }
}
diff --git a/apps/dav/lib/Migration/Version1034Date20250813093701.php b/apps/dav/lib/Migration/Version1034Date20250813093701.php
new file mode 100644
index 00000000000..10be71f067b
--- /dev/null
+++ b/apps/dav/lib/Migration/Version1034Date20250813093701.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\DAV\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+use Override;
+
+class Version1034Date20250813093701 extends SimpleMigrationStep {
+ public function __construct(
+ private IDBConnection $db,
+ ) {
+ }
+
+ /**
+ * @param IOutput $output
+ * @param Closure(): ISchemaWrapper $schemaClosure
+ * @param array $options
+ */
+ #[Override]
+ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+ $qb = $this->db->getQueryBuilder();
+ $qb->delete('properties')
+ ->where($qb->expr()->eq(
+ 'propertyname',
+ $qb->createNamedParameter(
+ '{http://owncloud.org/ns}calendar-enabled',
+ IQueryBuilder::PARAM_STR,
+ ),
+ IQueryBuilder::PARAM_STR,
+ ))
+ ->andWhere($qb->expr()->eq(
+ 'propertyvalue',
+ $qb->createNamedParameter(
+ '1',
+ IQueryBuilder::PARAM_STR,
+ ),
+ IQueryBuilder::PARAM_STR,
+ ))
+ ->executeStatement();
+ }
+}
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index ec3294d94ce..9b4a1b3d33c 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -55,6 +55,7 @@ use OCA\DAV\Connector\Sabre\ZipFolderPlugin;
use OCA\DAV\DAV\CustomPropertiesBackend;
use OCA\DAV\DAV\PublicAuth;
use OCA\DAV\DAV\ViewOnlyPlugin;
+use OCA\DAV\Db\PropertyMapper;
use OCA\DAV\Events\SabrePluginAddEvent;
use OCA\DAV\Events\SabrePluginAuthInitEvent;
use OCA\DAV\Files\BrowserErrorPagePlugin;
@@ -309,6 +310,7 @@ class Server {
$this->server->tree,
\OCP\Server::get(IDBConnection::class),
\OCP\Server::get(IUserSession::class)->getUser(),
+ \OCP\Server::get(PropertyMapper::class),
\OCP\Server::get(DefaultCalendarValidator::class),
)
)
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-16 09:50:55 +0000