Skip to content

[stable32] fix(dav): Use an exhaustive list for allowed serialized classes #58522

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

Open
backportbot wants to merge 1 commit into
base: stable32
Choose a base branch
from
+33 −14
Open

[stable32] fix(dav): Use an exhaustive list for allowed serialized classes #58522

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
47 changes: 33 additions & 14 deletions apps/dav/lib/DAV/CustomPropertiesBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,34 @@ class CustomPropertiesBackend implements BackendInterface {
'{http://owncloud.org/ns}calendar-enabled' => '1',
];

/**
* Allowed classes for deserialization
*
* @var class-string[]
*/
private const ALLOWED_SERIALIZED_CLASSES = [
\Sabre\CalDAV\Xml\Property\AllowedSharingModes::class,
\Sabre\CalDAV\Xml\Property\EmailAddressSet::class,
\Sabre\CalDAV\Xml\Property\Invite::class,
\Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp::class,
\Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet::class,
\Sabre\CalDAV\Xml\Property\SupportedCalendarData::class,
\Sabre\CalDAV\Xml\Property\SupportedCollationSet::class,
\Sabre\CardDAV\Xml\Property\SupportedAddressData::class,
\Sabre\CardDAV\Xml\Property\SupportedCollationSet::class,
\Sabre\DAV\Xml\Property\Complex::class,
\Sabre\DAV\Xml\Property\GetLastModified::class,
\Sabre\DAV\Xml\Property\Href::class,
\Sabre\DAV\Xml\Property\Invite::class,
\Sabre\DAV\Xml\Property\LocalHref::class,
\Sabre\DAV\Xml\Property\LockDiscovery::class,
\Sabre\DAV\Xml\Property\ResourceType::class,
\Sabre\DAV\Xml\Property\ShareAccess::class,
\Sabre\DAV\Xml\Property\SupportedLock::class,
\Sabre\DAV\Xml\Property\SupportedMethodSet::class,
\Sabre\DAV\Xml\Property\SupportedReportSet::class,
];

/**
* Properties cache
*/
Expand Down Expand Up @@ -625,10 +653,7 @@ private function encodeValueForDatabase(string $path, string $name, mixed $value
"Property \"$name\" has an invalid value of type " . gettype($value),
);
} else {
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\\')) {
if (!in_array($value::class, self::ALLOWED_SERIALIZED_CLASSES)) {
throw new DavException(
"Property \"$name\" has an invalid value of class " . $value::class,
);
Expand All @@ -652,16 +677,10 @@ private function decodeValueFromDatabase(string $value, int $valueType): mixed {
case self::PROPERTY_TYPE_HREF:
return new Href($value);
case self::PROPERTY_TYPE_OBJECT:
if (preg_match('/^a:/', $value)) {
// Array, unserialize only scalar values
return unserialize(str_replace('\x00', chr(0), $value), ['allowed_classes' => false]);
}
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');
}
// some databases can not handel null characters, these are custom encoded during serialization
// this custom encoding needs to be first reversed before unserializing
return unserialize(str_replace('\x00', chr(0), $value));
return unserialize(
str_replace('\x00', chr(0), $value),
['allowed_classes' => self::ALLOWED_SERIALIZED_CLASSES]
);
default:
return $value;
};
Expand Down
Loading