Skip to content

[stable26] fix(dav): Restrict properties allowed object classes #55858

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

Merged
nickvergessen merged 4 commits into from
Oct 20, 2025
Merged

[stable26] fix(dav): Restrict properties allowed object classes #55858

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b63106
fix(dav): Restrict properties allowed object classes
come-nc Oct 14, 2025
ae76ac8
fix(dav): Allow arrays (of scalars) in property values
come-nc Oct 14, 2025
d04ef20
fix(dav): Allow array of array of scalars, and fix error message
come-nc Oct 16, 2025
4cfc6e7
fix(dav): Adapt changes to stable28 code
come-nc Oct 20, 2025
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
Next Next commit
fix(dav): Restrict properties allowed object classes 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Oct 20, 2025
commit 9b631065ff3da32ed8287c7acaf1e27f825a0462
21 changes: 18 additions & 3 deletions apps/dav/lib/DAV/CustomPropertiesBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,19 @@ private function encodeValueForDatabase($value): array {
$valueType = self::PROPERTY_TYPE_XML;
$value = $value->getXml();
} else {
if (!is_object($value)) {
throw new DavException(
"Property \"$name\" has an invalid value of type " . gettype($value),
);
}
if (!str_starts_with($value::class, 'Sabre\\DAV\\Xml\\Property\\')
&& !str_starts_with($value::class, 'Sabre\\CalDAV\\Xml\\Property\\')
&& !str_starts_with($value::class, 'Sabre\\CardDAV\\Xml\\Property\\')
&& !str_starts_with($value::class, 'OCA\\DAV\\')) {
throw new DavException(
"Property \"$name\" has an invalid value of class " . $value::class,
);
}
$valueType = self::PROPERTY_TYPE_OBJECT;
$value = serialize($value);
}
Expand All @@ -435,16 +448,18 @@ private function encodeValueForDatabase($value): array {
/**
* @return mixed|Complex|string
*/
private function decodeValueFromDatabase(string $value, int $valueType) {
private function decodeValueFromDatabase(string $value, int $valueType): mixed {
switch ($valueType) {
case self::PROPERTY_TYPE_XML:
return new Complex($value);
case self::PROPERTY_TYPE_OBJECT:
if (!preg_match('/^O\:\d+\:\"(OCA\\\\DAV\\\\|Sabre\\\\(Cal|Card)?DAV\\\\Xml\\\\Property\\\\)/', $value)) {
throw new \LogicException('Found an object class serialized in DB that is not allowed');
}
return unserialize($value);
case self::PROPERTY_TYPE_STRING:
default:
return $value;
}
};
}

private function createDeleteQuery(): IQueryBuilder {
Expand Down