upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge pull request #34688 from nextcloud/bugfix/34673/dont-crash-with-outdated-share-providers

Browse source 
Don't crash with outdated share provider on update with the web updater
This commit is contained in:
Simon L 2022-10-20 23:50:15 +02:00 committed by GitHub
commit 9aaa370e07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/private/Share20/ProviderFactory.php
View file

@ -40,6 +40,7 @@ use OCA\FederatedFileSharing\Notifications;
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;
@ -47,6 +48,7 @@ use OCP\Share\IManager;
use OCP\Share\IProviderFactory;
use OCP\Share\IShare;
use OCP\Share\IShareProvider;
use Psr\Log\LoggerInterface;
/**
* Class ProviderFactory
@ -257,8 +259,15 @@ class ProviderFactory implements IProviderFactory {
}
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;
}
}
@ -288,9 +297,16 @@ class ProviderFactory implements IProviderFactory {
}
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])) {
@ -351,8 +367,17 @@ class ProviderFactory implements IProviderFactory {
}
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;
}