Skip to content

Commit

Permalink
Add repair step to fix wrong share ownership
Browse files Browse the repository at this point in the history
Signed-off-by: Louis Chemineau <louis@chmn.me>
  • Loading branch information
artonge authored and icewind1991 committed Sep 29, 2022
1 parent a880f79 commit 248a5a9
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/composer/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -1470,6 +1470,7 @@
'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',
Expand Down
1 change: 1 addition & 0 deletions lib/composer/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -1503,6 +1503,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',
Expand Down
2 changes: 2 additions & 0 deletions lib/private/Repair.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
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;
Expand Down Expand Up @@ -208,6 +209,7 @@ public static function getRepairSteps() {
\OCP\Server::get(RepairDavShares::class),
\OCP\Server::get(LookupServerSendCheck::class),
\OCP\Server::get(AddTokenCleanupJob::class),
\OCP\Server::get(RepairShareOwnership::class),
];
}

Expand Down
94 changes: 94 additions & 0 deletions lib/private/Repair/RepairShareOwnership.php
Original file line number Diff line number Diff line change
@@ -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);
}
}

0 comments on commit 248a5a9

Please sign in to comment.