Skip to content

[stable21] add repair job for unencoded group share uris #25450

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
rullzer merged 4 commits into from
Feb 9, 2021
Merged

[stable21] add repair job for unencoded group share uris #25450

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5b5953
add repair job for unencoded calendars
blizzz Jan 29, 2021
cfc00aa
take into account that UNIQUE index might not work as expected
blizzz Jan 29, 2021
6ebb368
show suggestion to clean up possible invalid shares later
blizzz Jan 29, 2021
a834819
test: adjust expectation
blizzz Jan 29, 2021
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
show suggestion to clean up possible invalid shares later 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz @backportbot
blizzz authored and backportbot[bot] committed Feb 2, 2021
commit 6ebb36826535a01cc94728470d54a019a6cf3d2b
6 changes: 6 additions & 0 deletions lib/private/Repair/RepairDavShares.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ class RepairDavShares implements IRepairStep {
private $groupManager;
/** @var LoggerInterface */
private $logger;
/** @var bool */
private $hintInvalidShares = false;

public function __construct(
IConfig $config,
Expand Down Expand Up @@ -88,6 +90,7 @@ protected function repairUnencodedGroupShares() {
|| !$this->groupManager->groupExists($gid)
|| ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
) {
$this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
continue;
}

Expand Down Expand Up @@ -127,6 +130,9 @@ public function run(IOutput $output) {
&& $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.');
}
}
}
}