Merge pull request #25393 from nextcloud/fix/25165/repair-dav-shares

add repair job for unencoded group share uris

4 files changed, 143 insertions, 1 deletions

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index f51274171f0..49b138714a7 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -1305,6 +1305,7 @@ return array(
     'OC\\Repair\\Owncloud\\SaveAccountsTableData' => $baseDir . '/lib/private/Repair/Owncloud/SaveAccountsTableData.php',
     'OC\\Repair\\Owncloud\\UpdateLanguageCodes' => $baseDir . '/lib/private/Repair/Owncloud/UpdateLanguageCodes.php',
     'OC\\Repair\\RemoveLinkShares' => $baseDir . '/lib/private/Repair/RemoveLinkShares.php',
+    'OC\\Repair\\RepairDavShares' => $baseDir . '/lib/private/Repair/RepairDavShares.php',
     'OC\\Repair\\RepairInvalidShares' => $baseDir . '/lib/private/Repair/RepairInvalidShares.php',
     'OC\\Repair\\RepairMimeTypes' => $baseDir . '/lib/private/Repair/RepairMimeTypes.php',
     'OC\\Repair\\SqliteAutoincrement' => $baseDir . '/lib/private/Repair/SqliteAutoincrement.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 3f1983a11c0..373db9144bd 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -1334,6 +1334,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Repair\\Owncloud\\SaveAccountsTableData' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/SaveAccountsTableData.php',
         'OC\\Repair\\Owncloud\\UpdateLanguageCodes' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/UpdateLanguageCodes.php',
         'OC\\Repair\\RemoveLinkShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RemoveLinkShares.php',
+        'OC\\Repair\\RepairDavShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairDavShares.php',
         'OC\\Repair\\RepairInvalidShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairInvalidShares.php',
         'OC\\Repair\\RepairMimeTypes' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairMimeTypes.php',
         'OC\\Repair\\SqliteAutoincrement' => __DIR__ . '/../../..' . '/lib/private/Repair/SqliteAutoincrement.php',
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index e4f75b43fdc..e7c6f729a8f 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -65,6 +65,7 @@ use OC\Repair\OldGroupMembershipShares;
 use OC\Repair\Owncloud\DropAccountTermsTable;
 use OC\Repair\Owncloud\SaveAccountsTableData;
 use OC\Repair\RemoveLinkShares;
+use OC\Repair\RepairDavShares;
 use OC\Repair\RepairInvalidShares;
 use OC\Repair\RepairMimeTypes;
 use OC\Repair\SqliteAutoincrement;
@@ -189,6 +190,7 @@ class Repair implements IOutput {
 			\OC::$server->get(ShippedDashboardEnable::class),
 			\OC::$server->get(AddBruteForceCleanupJob::class),
 			\OC::$server->get(AddCheckForUserCertificatesJob::class),
+			\OC::$server->get(RepairDavShares::class)
 		];
 	}
 
@@ -221,7 +223,7 @@ class Repair implements IOutput {
 			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connectionAdapter, true),
 			new SqliteAutoincrement($connection),
 			new SaveAccountsTableData($connectionAdapter, $config),
-			new DropAccountTermsTable($connectionAdapter)
+			new DropAccountTermsTable($connectionAdapter),
 		];
 
 		return $steps;
diff --git a/lib/private/Repair/RepairDavShares.php b/lib/private/Repair/RepairDavShares.php
new file mode 100644
index 00000000000..64104c1e28a
--- /dev/null
+++ b/lib/private/Repair/RepairDavShares.php
@@ -0,0 +1,138 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Repair;
+
+use OCP\DB\Exception;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+use Psr\Log\LoggerInterface;
+use function strlen;
+use function substr;
+use function urldecode;
+use function urlencode;
+
+class RepairDavShares implements IRepairStep {
+	protected const GROUP_PRINCIPAL_PREFIX = 'principals/groups/';
+
+	/** @var IConfig */
+	private $config;
+	/** @var IDBConnection */
+	private $dbc;
+	/** @var IGroupManager */
+	private $groupManager;
+	/** @var LoggerInterface */
+	private $logger;
+	/** @var bool */
+	private $hintInvalidShares = false;
+
+	public function __construct(
+		IConfig $config,
+		IDBConnection $dbc,
+		IGroupManager $groupManager,
+		LoggerInterface $logger
+	) {
+		$this->config = $config;
+		$this->dbc = $dbc;
+		$this->groupManager = $groupManager;
+		$this->logger = $logger;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getName() {
+		return 'Repair DAV shares';
+	}
+
+	protected function repairUnencodedGroupShares() {
+		$qb = $this->dbc->getQueryBuilder();
+		$qb->select(['id', 'principaluri'])
+			->from('dav_shares')
+			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
+
+		$updateQuery = $this->dbc->getQueryBuilder();
+		$updateQuery->update('dav_shares')
+			->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
+			->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
+
+		$statement = $qb->execute();
+		while ($share = $statement->fetch()) {
+			$gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
+			$decodedGid = urldecode($gid);
+			$encodedGid = urlencode($gid);
+			if ($gid === $encodedGid
+				|| !$this->groupManager->groupExists($gid)
+				|| ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
+			) {
+				$this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
+				continue;
+			}
+
+			// Repair when
+			// + the group name needs encoding
+			// + AND it is not encoded yet
+			// + AND there are no ambivalent groups
+
+			try {
+				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
+				$logParameters = [
+					'app' => 'core',
+					'id' => $share['id'],
+					'old' => $share['principaluri'],
+					'new' => $fixedPrincipal,
+				];
+				$updateQuery
+					->setParameter('updatedPrincipalUri', $fixedPrincipal)
+					->setParameter('shareId', $share['id'])
+					->execute();
+				$this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
+			} catch (Exception $e) {
+				$logParameters['message'] = $e->getMessage();
+				$logParameters['exception'] = $e;
+				$this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function run(IOutput $output) {
+		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+		if (version_compare($versionFromBeforeUpdate, '20.0.7', '<')
+			&& $this->repairUnencodedGroupShares()
+		) {
+			$output->info('Repaired DAV group shares');
+			if ($this->hintInvalidShares) {
+				$output->info('Invalid shares might be left in the database, running "occ dav:remove-invalid-shares" can remove them.');
+			}
+		}
+	}
+}