Skip to content
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

[stable25] Don't crash with outdated share provider on update with the web updater #34712

Merged
merged 3 commits into from
Oct 21, 2022
Merged

[stable25] Don't crash with outdated share provider on update with the web updater #34712

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a5a804
Don't crash with outdated share provider
nickvergessen Oct 20, 2022
b851446
Also catch in getProvider
nickvergessen Oct 20, 2022
707fc65
Fix PHP CS
nickvergessen Oct 20, 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
39 changes: 32 additions & 7 deletions lib/private/Share20/ProviderFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,15 @@
use OCA\FederatedFileSharing\TokenHandler;
use OCA\ShareByMail\Settings\SettingsManager;
use OCA\ShareByMail\ShareByMailProvider;
use OCA\Talk\Share\RoomShareProvider;
use OCP\Defaults;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IServerContainer;
use OCP\Share\IManager;
use OCP\Share\IProviderFactory;
use OCP\Share\IShare;
use OCP\Share\IShareProvider;
use Psr\Log\LoggerInterface;

/**
* Class ProviderFactory
Expand Down Expand Up @@ -257,8 +259,15 @@ protected function getRoomShareProvider() {
}

try {
$this->roomShareProvider = $this->serverContainer->query('\OCA\Talk\Share\RoomShareProvider');
} catch (\OCP\AppFramework\QueryException $e) {
/**
* @psalm-suppress UndefinedClass
*/
$this->roomShareProvider = $this->serverContainer->get(RoomShareProvider::class);
} catch (\Throwable $e) {
$this->serverContainer->get(LoggerInterface::class)->error(
$e->getMessage(),
['exception' => $e]
);
return null;
}
}
Expand Down Expand Up @@ -288,9 +297,16 @@ public function getProvider($id) {
}

foreach ($this->registeredShareProviders as $shareProvider) {
/** @var IShareProvider $instance */
$instance = $this->serverContainer->get($shareProvider);
$this->shareProviders[$instance->identifier()] = $instance;
try {
/** @var IShareProvider $instance */
$instance = $this->serverContainer->get($shareProvider);
$this->shareProviders[$instance->identifier()] = $instance;
} catch (\Throwable $e) {
$this->serverContainer->get(LoggerInterface::class)->error(
$e->getMessage(),
['exception' => $e]
);
}
}

if (isset($this->shareProviders[$id])) {
Expand Down Expand Up @@ -351,8 +367,17 @@ public function getAllProviders() {
}

foreach ($this->registeredShareProviders as $shareProvider) {
/** @var IShareProvider $instance */
$instance = $this->serverContainer->get($shareProvider);
try {
/** @var IShareProvider $instance */
$instance = $this->serverContainer->get($shareProvider);
} catch (\Throwable $e) {
$this->serverContainer->get(LoggerInterface::class)->error(
$e->getMessage(),
['exception' => $e]
);
continue;
}

if (!isset($this->shareProviders[$instance->identifier()])) {
$this->shareProviders[$instance->identifier()] = $instance;
}
Expand Down