2 files changed, 70 insertions, 0 deletions
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index b1a824ba5e3..5b6daa36a03 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -50,6 +50,7 @@ use OC\Repair\Owncloud\MigrateOauthTables;
 use OC\Repair\Owncloud\MoveAvatars;
 use OC\Repair\Owncloud\SaveAccountsTableData;
 use OC\Repair\Owncloud\UpdateLanguageCodes;
+use OC\Repair\RemoveBrokenProperties;
 use OC\Repair\RemoveLinkShares;
 use OC\Repair\RepairDavShares;
 use OC\Repair\RepairInvalidShares;
@@ -206,6 +207,7 @@ class Repair implements IOutput {
 	public static function getExpensiveRepairSteps() {
 		return [
 			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
+			new RemoveBrokenProperties(\OCP\Server::get(IDBConnection::class)),
 			new RepairMimeTypes(
 				\OCP\Server::get(IConfig::class),
 				\OCP\Server::get(IAppConfig::class),
diff --git a/lib/private/Repair/RemoveBrokenProperties.php b/lib/private/Repair/RemoveBrokenProperties.php
new file mode 100644
index 00000000000..85939b39e5e
--- /dev/null
+++ b/lib/private/Repair/RemoveBrokenProperties.php
@@ -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");
+	}
+}