Skip to content

[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.

Sign up for GitHub

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
blizzz merged 10 commits into from
Nov 23, 2022
Merged

[stable23] Add repair command to fix wrong share ownership #35040

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 Apr 28, 2022
3354523
move share owner repair to occ command
icewind1991 Sep 29, 2022
c8a25d4
More verbose output for repair share ownership cmd
PVince81 Sep 29, 2022
b694313
update shares directly in db
icewind1991 Sep 30, 2022
3b6a37b
split repairing into two stages to prevent long open transaction
icewind1991 Oct 11, 2022
f07073b
remove no longer needed code
icewind1991 Oct 18, 2022
c6a9a83
fix repairing non user shares when repairing all shares
icewind1991 Oct 18, 2022
060c607
update autoloader
icewind1991 Nov 8, 2022
8c097af
fix concat usage
icewind1991 Nov 10, 2022
adfdb96
fix php 7.3 compat
icewind1991 Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update shares directly in db 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot-nextcloud
icewind1991 authored and backportbot-nextcloud[bot] committed Nov 8, 2022
commit b694313929602e9b7fef500ec3f994173ff92596
30 changes: 17 additions & 13 deletions core/Command/Maintenance/RepairShareOwnership.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,13 @@

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();
}
Expand All @@ -65,6 +62,7 @@ protected function configure() {
protected function execute(InputInterface $input, OutputInterface $output): int {
$dryRun = $input->getOption('dry-run');
$userId = $input->getArgument('user');
$this->dbConnection->beginTransaction();
if ($userId) {
$user = $this->userManager->get($userId);
if (!$user) {
Expand All @@ -86,13 +84,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
foreach ($found as $item) {
$output->writeln($item);
}
$this->dbConnection->commit();

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', 's.file_target')
->select('s.id', 'm.user_id', 's.uid_owner', 's.uid_initiator', 's.share_with', 's.file_target')
->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'))
Expand All @@ -104,9 +104,14 @@ protected function repairWrongShareOwnershipForUser(IUser $user, bool $dryRun =

$found = [];

$update = $this->dbConnection->getQueryBuilder();
$update->update('share')
->set('uid_owner', $update->createParameter('share_owner'))
->set('uid_initiator', $update->createParameter('share_initiator'))
->where($update->expr()->eq('id', $update->createParameter('share_id')));

foreach ($brokenShare as $queryResult) {
$shareId = (int) $queryResult['id'];
$shareType = (int) $queryResult['share_type'];
$fileTarget = $queryResult['file_target'];
$initiator = $queryResult['uid_initiator'];
$receiver = $queryResult['share_with'];
Expand All @@ -119,15 +124,14 @@ protected function repairWrongShareOwnershipForUser(IUser $user, bool $dryRun =
continue;
}

$provider = $this->shareManager->getProviderForType($shareType);
$share = $provider->getShareById($shareId);

if ($share->getShareOwner() === $share->getSharedBy()) {
$share->setSharedBy($mountOwner);
$update->setParameter('share_id', $shareId, IQueryBuilder::PARAM_INT);
$update->setParameter('share_owner', $mountOwner);
if ($initiator === $owner) {
$update->setParameter('share_initiator', $mountOwner);
} else {
$update->setParameter('share_initiator', $initiator);
}
$share->setShareOwner($mountOwner);

$this->shareManager->updateShare($share);
$update->executeStatement();
}

return $found;
Expand Down