Skip to content

fix: truncating caldav subscription data before saving on DB #63295

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
madbob wants to merge 1 commit into
base: master
Choose a base branch
from
+46 −10
Open

fix: truncating caldav subscription data before saving on DB #63295

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
32 changes: 22 additions & 10 deletions apps/dav/lib/CalDAV/CalDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,13 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
* @var array
*/
public array $subscriptionPropertyMap = [
'{DAV:}displayname' => ['displayname', 'string'],
'{http://apple.com/ns/ical/}refreshrate' => ['refreshrate', 'string'],
'{http://apple.com/ns/ical/}calendar-order' => ['calendarorder', 'int'],
'{http://apple.com/ns/ical/}calendar-color' => ['calendarcolor', 'string'],
'{http://calendarserver.org/ns/}subscribed-strip-todos' => ['striptodos', 'bool'],
'{http://calendarserver.org/ns/}subscribed-strip-alarms' => ['stripalarms', 'string'],
'{http://calendarserver.org/ns/}subscribed-strip-attachments' => ['stripattachments', 'string'],
'{DAV:}displayname' => ['displayname', 'string', 100],
'{http://apple.com/ns/ical/}refreshrate' => ['refreshrate', 'string', 10],
'{http://apple.com/ns/ical/}calendar-order' => ['calendarorder', 'int', 0],
'{http://apple.com/ns/ical/}calendar-color' => ['calendarcolor', 'string', 255],
'{http://calendarserver.org/ns/}subscribed-strip-todos' => ['striptodos', 'bool', 0],
'{http://calendarserver.org/ns/}subscribed-strip-alarms' => ['stripalarms', 'bool', 0],
'{http://calendarserver.org/ns/}subscribed-strip-attachments' => ['stripattachments', 'bool', 0],
];

/**
Expand Down Expand Up @@ -3040,9 +3040,14 @@ public function createSubscription($principalUri, $uri, array $properties) {

$propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];

foreach ($this->subscriptionPropertyMap as $xmlName => [$dbName, $type]) {
foreach ($this->subscriptionPropertyMap as $xmlName => [$dbName, $type, $length]) {
if (array_key_exists($xmlName, $properties)) {
$values[$dbName] = $properties[$xmlName];
if ($type == 'string') {
$values[$dbName] = mb_substr($properties[$xmlName], 0, $length);
} else {
$values[$dbName] = $properties[$xmlName];
}

if (in_array($dbName, $propertiesBoolean)) {
$values[$dbName] = true;
}
Expand Down Expand Up @@ -3099,7 +3104,14 @@ public function updateSubscription($subscriptionId, PropPatch $propPatch) {
$newValues['source'] = $propertyValue->getHref();
} else {
$fieldName = $this->subscriptionPropertyMap[$propertyName][0];
$newValues[$fieldName] = $propertyValue;
$fieldType = $this->subscriptionPropertyMap[$propertyName][1];

if ($fieldType === 'string') {
$fieldLength = $this->subscriptionPropertyMap[$propertyName][2];
$newValues[$fieldName] = mb_substr($propertyValue, 0, $fieldLength);
} else {
$newValues[$fieldName] = $propertyValue;
}
}
}

Expand Down
24 changes: 24 additions & 0 deletions apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,30 @@ public function testSubscriptions(): void {
$this->assertCount(0, $subscriptions);
}

public function testSubscriptionsHugeProps(): void {
$first_longname = 'This is a very long name, longer than 100 characters, used on purpose with the intention to test truncation';
$second_longname = 'Another very long name, longer than 100 characters, used to test truncation while updating the subscription';

$id = $this->backend->createSubscription(self::UNIT_TEST_USER, 'Subscription', [
'{DAV:}displayname' => $first_longname,
'{http://calendarserver.org/ns/}source' => new Href('test-source'),
'{http://apple.com/ns/ical/}calendar-color' => '#1C4587',
'{http://calendarserver.org/ns/}subscribed-strip-todos' => ''
]);

$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
$this->assertEquals(mb_substr($first_longname, 0, 100), $subscriptions[0]['{DAV:}displayname']);

$patch = new PropPatch([
'{DAV:}displayname' => $second_longname,
]);
$this->backend->updateSubscription($id, $patch);
$patch->commit();

$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
$this->assertEquals(mb_substr($second_longname, 0, 100), $subscriptions[0]['{DAV:}displayname']);
}

public static function providesSchedulingData(): array {
$data = <<<EOS
BEGIN:VCALENDAR
Expand Down
Loading