-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: replace null character when serializing
Signed-off-by: SebastianKrupinski <[email protected]>
- Loading branch information
1 parent
063ce54
commit 2edb819
Showing
6 changed files
with
96 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2017, Georg Ehrke <[email protected]> | ||
| * | ||
|
|
@@ -481,4 +482,21 @@ public function moveProvider() { | |
| [str_repeat('long_path1', 100), str_repeat('long_path2', 100)] | ||
| ]; | ||
| } | ||
|
|
||
| public function testDecodeValueFromDatabaseObjectCurrent(): void { | ||
| $propertyValue = 'O:48:"Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp":1:{s:8:"\x00*\x00value";s:6:"opaque";}'; | ||
| $propertyType = 3; | ||
| $decodeValue = $this->invokePrivate($this->backend, 'decodeValueFromDatabase', [$propertyValue, $propertyType]); | ||
| $this->assertInstanceOf(\Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp::class, $decodeValue); | ||
| $this->assertEquals('opaque', $decodeValue->getValue()); | ||
| } | ||
|
|
||
| public function testDecodeValueFromDatabaseObjectLegacy(): void { | ||
| $propertyValue = 'O:48:"Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp":1:{s:8:"' . chr(0) . '*' . chr(0) . 'value";s:6:"opaque";}'; | ||
| $propertyType = 3; | ||
| $decodeValue = $this->invokePrivate($this->backend, 'decodeValueFromDatabase', [$propertyValue, $propertyType]); | ||
| $this->assertInstanceOf(\Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp::class, $decodeValue); | ||
| $this->assertEquals('opaque', $decodeValue->getValue()); | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| namespace OC\Repair; | ||
|
|
||
| use OCP\DB\QueryBuilder\IQueryBuilder; | ||
| use OCP\IDBConnection; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\IRepairStep; | ||
|
|
||
| class RemoveBrokenProperties implements IRepairStep { | ||
| /** | ||
| * RemoveBrokenProperties constructor. | ||
| * | ||
| * @param IDBConnection $db | ||
| */ | ||
| public function __construct( | ||
| private IDBConnection $db, | ||
| ) { | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| public function getName() { | ||
| return 'Remove broken DAV object properties'; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| public function run(IOutput $output) { | ||
| // retrieve all object properties | ||
| $qb = $this->db->getQueryBuilder(); | ||
| $qb->select('id', 'propertyvalue') | ||
| ->from('properties') | ||
| ->where($qb->expr()->eq('valuetype', $qb->createNamedParameter('3', IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT)); | ||
| $result = $qb->executeQuery(); | ||
| // find broken object properties | ||
| $brokenIds = []; | ||
| while ($entry = $result->fetch()) { | ||
| if (!empty($entry['propertyvalue'])) { | ||
| $object = @unserialize(str_replace('\x00', chr(0), $entry['propertyvalue'])); | ||
| if ($object === false) { | ||
| $brokenIds[] = $entry['id']; | ||
| } | ||
| } else { | ||
| $brokenIds[] = $entry['id']; | ||
| } | ||
| } | ||
| $result->closeCursor(); | ||
| // delete broken object properties | ||
| $qb = $this->db->getQueryBuilder(); | ||
| $qb->delete('properties') | ||
| ->where($qb->expr()->in('id', $qb->createParameter('ids'), IQueryBuilder::PARAM_STR_ARRAY)); | ||
| foreach (array_chunk($brokenIds, 1000) as $chunkIds) { | ||
| $qb->setParameter('ids', $chunkIds, IQueryBuilder::PARAM_STR_ARRAY); | ||
| $qb->executeStatement(); | ||
| } | ||
| $total = count($brokenIds); | ||
| $output->info("$total broken object properties removed"); | ||
| } | ||
| } |