-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
[stable23] Add repair command to fix wrong share ownership #35040
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a0048a1
Add repair step to fix wrong share ownership
artonge 3354523
move share owner repair to occ command
icewind1991 c8a25d4
More verbose output for repair share ownership cmd
PVince81 b694313
update shares directly in db
icewind1991 3b6a37b
split repairing into two stages to prevent long open transaction
icewind1991 f07073b
remove no longer needed code
icewind1991 c6a9a83
fix repairing non user shares when repairing all shares
icewind1991 060c607
update autoloader
icewind1991 8c097af
fix concat usage
icewind1991 adfdb96
fix php 7.3 compat
icewind1991 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
move share owner repair to occ command
Signed-off-by: Robin Appelman <[email protected]>
- Loading branch information
commit 33545230ef3d847c0c855f93f68f7827dab8ed1d
There are no files selected for viewing
This file contains hidden or 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,134 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2020 Arthur Schiwon <[email protected]> | ||
| * | ||
| * @author Arthur Schiwon <[email protected]> | ||
| * | ||
| * @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\Core\Command\Maintenance; | ||
|
|
||
| use Symfony\Component\Console\Command\Command; | ||
| use OCP\DB\QueryBuilder\IQueryBuilder; | ||
| use OCP\IDBConnection; | ||
| use OCP\IUser; | ||
| use OCP\IUserManager; | ||
| use OCP\Share\IManager; | ||
| use Symfony\Component\Console\Helper\ProgressBar; | ||
| use Symfony\Component\Console\Input\InputArgument; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Input\InputOption; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
|
|
||
| class RepairShareOwnership extends Command { | ||
| private IDBConnection $dbConnection; | ||
| private IManager $shareManager; | ||
| private IUserManager $userManager; | ||
|
|
||
| public function __construct( | ||
| IDBConnection $dbConnection, | ||
| IManager $shareManager, | ||
| IUserManager $userManager | ||
| ) { | ||
| $this->dbConnection = $dbConnection; | ||
| $this->shareManager = $shareManager; | ||
| $this->userManager = $userManager; | ||
| parent::__construct(); | ||
| } | ||
|
|
||
| protected function configure() { | ||
| $this | ||
| ->setName('maintenance:repair-share-owner') | ||
| ->setDescription('repair invalid share-owner entries in the database') | ||
| ->addOption('dry-run', null, InputOption::VALUE_NONE, "List detected issues without fixing them") | ||
| ->addArgument('user', InputArgument::OPTIONAL, "User to fix incoming shares for, if omitted all users will be fixed"); | ||
| } | ||
|
|
||
| protected function execute(InputInterface $input, OutputInterface $output): int { | ||
| $dryRun = $input->getOption('dry-run'); | ||
| $userId = $input->getArgument('user'); | ||
| if ($userId) { | ||
| $user = $this->userManager->get($userId); | ||
| if (!$user) { | ||
| $output->writeln("<error>user $userId not found</error>"); | ||
| return 1; | ||
| } | ||
| $found = $this->repairWrongShareOwnershipForUser($user, $dryRun); | ||
| } else { | ||
| $found = []; | ||
| $userCount = $this->userManager->countSeenUsers(); | ||
| $progress = new ProgressBar($output, $userCount); | ||
| $this->userManager->callForSeenUsers(function (IUser $user) use ($dryRun, &$found, $progress) { | ||
| $progress->advance(); | ||
| $found = array_merge($found, $this->repairWrongShareOwnershipForUser($user, $dryRun)); | ||
| }); | ||
| $progress->finish(); | ||
| $output->writeln(""); | ||
| } | ||
| foreach ($found as $item) { | ||
| $output->writeln($item); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| protected function repairWrongShareOwnershipForUser(IUser $user, bool $dryRun = true): array { | ||
| $qb = $this->dbConnection->getQueryBuilder(); | ||
| $brokenShare = $qb | ||
| ->select('s.id', 'm.user_id', 's.uid_owner', 's.uid_initiator', 's.share_with', 's.share_type') | ||
| ->from('share', 's') | ||
| ->join('s', 'filecache', 'f', $qb->expr()->eq('s.item_source', $qb->expr()->castColumn('f.fileid', IQueryBuilder::PARAM_STR))) | ||
| ->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')) | ||
| ->andWhere($qb->expr()->eq('s.share_with', $qb->createNamedParameter($user->getUID()))) | ||
| ->executeQuery() | ||
| ->fetchAll(); | ||
|
|
||
| $found = []; | ||
|
|
||
| foreach ($brokenShare as $queryResult) { | ||
| $shareId = (int) $queryResult['id']; | ||
| $shareType = (int) $queryResult['share_type']; | ||
| $initiator = $queryResult['uid_initiator']; | ||
| $receiver = $queryResult['share_with']; | ||
| $owner = $queryResult['uid_owner']; | ||
| $mountOwner = $queryResult['user_id']; | ||
|
|
||
| $found[] = "Found share from $initiator to $receiver, owned by $owner, that should be owned by $mountOwner"; | ||
|
|
||
| if ($dryRun) { | ||
| continue; | ||
| } | ||
|
|
||
| $provider = $this->shareManager->getProviderForType($shareType); | ||
| $share = $provider->getShareById($shareId); | ||
|
|
||
| if ($share->getShareOwner() === $share->getSharedBy()) { | ||
| $share->setSharedBy($mountOwner); | ||
| } | ||
| $share->setShareOwner($mountOwner); | ||
|
|
||
| $this->shareManager->updateShare($share); | ||
| } | ||
|
|
||
| return $found; | ||
| } | ||
| } | ||
This file contains hidden or 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 was deleted.
Oops, something went wrong.
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.