mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26954 from nextcloud/backport/26879/stable20 

[stable20]  Don't break OCC if an app is breaking in it's Application class
This commit is contained in:
Morris Jobke 2021-05-18 09:32:22 +02:00 committed by GitHub
parent 247c576533 a0e0627de0
commit da32428c3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/private/AppFramework/Bootstrap/Coordinator.php
View File

@ -105,22 +105,24 @@ class Coordinator {
*/ */
$appNameSpace = App::buildAppNamespace($appId); $appNameSpace = App::buildAppNamespace($appId);
$applicationClassName = $appNameSpace . '\\AppInfo\\Application'; $applicationClassName = $appNameSpace . '\\AppInfo\\Application';
if (class_exists($applicationClassName) && in_array(IBootstrap::class, class_implements($applicationClassName), true)) { try {
try { if (class_exists($applicationClassName) && in_array(IBootstrap::class, class_implements($applicationClassName), true)) {
/** @var IBootstrap|App $application */ try {
$apps[$appId] = $application = $this->serverContainer->query($applicationClassName); /** @var IBootstrap|App $application */
} catch (QueryException $e) { $apps[$appId] = $application = $this->serverContainer->query($applicationClassName);
// Weird, but ok } catch (QueryException $e) {
continue; // Weird, but ok
} continue;
try { }
$application->register($this->registrationContext->for($appId)); $application->register($this->registrationContext->for($appId));
} catch (Throwable $e) {
$this->logger->logException($e, [
'message' => 'Error during app service registration: ' . $e->getMessage(),
'level' => ILogger::FATAL,
]);
} }
} catch (Throwable $e) {
$this->logger->logException($e, [
'message' => 'Error during app service registration: ' . $e->getMessage(),
'level' => ILogger::FATAL,
'app' => $appId,
]);
continue;
} }
} }

10
lib/private/legacy/OC_App.php
View File

@ -128,7 +128,15 @@ class OC_App {
ob_start(); ob_start();
foreach ($apps as $app) { foreach ($apps as $app) {
if (!isset(self::$loadedApps[$app]) && ($types === [] || self::isType($app, $types))) { if (!isset(self::$loadedApps[$app]) && ($types === [] || self::isType($app, $types))) {
self::loadApp($app); try {
self::loadApp($app);
} catch (\Throwable $e) {
\OC::$server->getLogger()->logException($e, [
'message' => 'Error during app loading: ' . $e->getMessage(),
'level' => ILogger::FATAL,
'app' => $app,
]);
}
} }
} }
ob_end_clean(); ob_end_clean();