Add repair step to fix wrong share ownership

Signed-off-by: Louis Chemineau <louis@chmn.me>

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 65df6735b47993334be2a2d73a67f8cf0ce26339..f773fe4b16b94037159ef9cbb500cd86c83849cc 100644 (file)
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -1481,6 +1481,7 @@ return array(
     '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\\RepairShareOwnership' => $baseDir . '/lib/private/Repair/RepairShareOwnership.php',
     'OC\\Repair\\SqliteAutoincrement' => $baseDir . '/lib/private/Repair/SqliteAutoincrement.php',
     'OC\\RichObjectStrings\\Validator' => $baseDir . '/lib/private/RichObjectStrings/Validator.php',
     'OC\\Route\\CachingRouter' => $baseDir . '/lib/private/Route/CachingRouter.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index f99cc5c4111f85efaf851c6a629377e08aedbb6e..a41a2a58e184c21848debb0ab42364b73df5663b 100644 (file)
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -1514,6 +1514,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         '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\\RepairShareOwnership' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairShareOwnership.php',
         'OC\\Repair\\SqliteAutoincrement' => __DIR__ . '/../../..' . '/lib/private/Repair/SqliteAutoincrement.php',
         'OC\\RichObjectStrings\\Validator' => __DIR__ . '/../../..' . '/lib/private/RichObjectStrings/Validator.php',
         'OC\\Route\\CachingRouter' => __DIR__ . '/../../..' . '/lib/private/Route/CachingRouter.php',

diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 5f4747721ca3ace038f6ba9f97f42e234356711e..b8875f199451bde692f50175fdaee8a9bc1747c6 100644 (file)
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -80,6 +80,7 @@ use OC\Repair\Owncloud\SaveAccountsTableData;
 use OC\Repair\Owncloud\UpdateLanguageCodes;
 use OC\Repair\RemoveLinkShares;
 use OC\Repair\RepairDavShares;
+use OC\Repair\RepairShareOwnership;
 use OC\Repair\RepairInvalidShares;
 use OC\Repair\RepairMimeTypes;
 use OC\Repair\SqliteAutoincrement;
@@ -209,6 +210,7 @@ class Repair implements IOutput {
                        \OCP\Server::get(LookupServerSendCheck::class),
                        \OCP\Server::get(AddTokenCleanupJob::class),
                        \OCP\Server::get(CleanUpAbandonedApps::class),
+                       \OCP\Server::get(RepairShareOwnership::class),
                ];
        }
 

diff --git a/lib/private/Repair/RepairShareOwnership.php b/lib/private/Repair/RepairShareOwnership.php
new file mode 100644 (file)
index 0000000..b7ff476
--- /dev/null
+++ b/lib/private/Repair/RepairShareOwnership.php
@@ -0,0 +1,94 @@
+<?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\IDBConnection;
+use OCP\Share\IManager;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class RepairShareOwnership implements IRepairStep {
+       private IDBConnection $dbConnection;
+       private IManager $shareManager;
+
+       public function __construct(
+               IDBConnection $dbConnection,
+               IManager $shareManager
+       ) {
+               $this->dbConnection = $dbConnection;
+               $this->shareManager = $shareManager;
+       }
+
+       /**
+        * @inheritDoc
+        */
+       public function getName() {
+               return 'Repair shares ownership';
+       }
+
+       protected function repairWrongShareOwnership(IOutput $output, bool $dryRun = true) {
+               $qb = $this->dbConnection->getQueryBuilder();
+               $brokenShare = $qb
+                       ->select('s.id', 'm.user_id', 's.uid_owner', 's.uid_initiator', 's.share_with')
+                       ->from('share', 's')
+                       ->join('s', 'filecache', 'f', $qb->expr()->eq('s.item_source', 'f.fileid'))
+                       ->join('s', 'mounts', 'm', $qb->expr()->eq('f.storage', 'm.storage_id'))
+                       ->where($qb->expr()->neq('m.user_id', 's.uid_owner'))
+                       ->andWhere($qb->expr()->eq($qb->func()->concat($qb->expr()->literal('/'), 'm.user_id', $qb->expr()->literal('/')), 'm.mount_point'))
+                       ->executeQuery()
+                       ->fetchAll();
+
+               foreach ($brokenShare as $queryResult) {
+                       $shareId = $queryResult['id'];
+                       $initiator = $queryResult['uid_initiator'];
+                       $receiver = $queryResult['share_with'];
+                       $owner = $queryResult['uid_owner'];
+                       $mountOwner = $queryResult['user_id'];
+
+                       $output->info("Found share from $initiator to $receiver, owned by $owner, that should be owned by $mountOwner");
+
+                       if ($dryRun) {
+                               continue;
+                       }
+
+                       $share = $this->shareManager->getShareById($shareId);
+
+                       if ($share->getShareOwner() === $share->getSharedBy()) {
+                               $share->setSharedBy($mountOwner);
+                       }
+                       $share->setShareOwner($mountOwner);
+
+                       $this->shareManager->updateShare($share);
+               }
+       }
+
+       /**
+        * @inheritDoc
+        */
+       public function run(IOutput $output) {
+               $this->repairWrongShareOwnership($output);
+       }
+}