From 4390d4b509831651278f26bcbe756848b840e959 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <bfr@qbus.de>
Date: Thu, 16 Apr 2020 17:53:40 +0200
Subject: [PATCH] [BUGFIX] Boot container for E-Mail check in install tool
Since #90266 install tool E-Mails are templated and
custom logos, viewhelpers or services may be loaded.
A custom backend login logo caused the usage of the f:image
ViewHelper which triggered the FileIndexRepository which
wasn't configured for the install tool context.
Therefore we need to provide a fully booted
symfony container in order for dependency injection
to work for all core and third party extensions,
especially when using a customized SystemEmail template.
Resolves: #91067
Releases: master
Change-Id: Ia2cb06dfecd7bb9bd757b37849c1345e538dfffc
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64205
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Martin Hotmann <martinhotmann@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Benjamin Franzke <bfr@qbus.de>
Reviewed-by: Martin Hotmann <martinhotmann@gmail.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benjamin Franzke <bfr@qbus.de>
---
.../Classes/Controller/EnvironmentController.php | 15 +++++++++++++++
typo3/sysext/install/Classes/ServiceProvider.php | 8 ++++++++
2 files changed, 23 insertions(+)
diff --git a/typo3/sysext/install/Classes/Controller/EnvironmentController.php b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
index 71d3e7db55e4..05db0f086499 100644
--- a/typo3/sysext/install/Classes/Controller/EnvironmentController.php
+++ b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
@@ -38,6 +38,7 @@ use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Install\FolderStructure\DefaultFactory;
use TYPO3\CMS\Install\FolderStructure\DefaultPermissionsCheck;
+use TYPO3\CMS\Install\Service\LateBootService;
use TYPO3\CMS\Install\SystemEnvironment\Check;
use TYPO3\CMS\Install\SystemEnvironment\DatabaseCheck;
use TYPO3\CMS\Install\SystemEnvironment\SetupCheck;
@@ -48,6 +49,17 @@ use TYPO3\CMS\Install\SystemEnvironment\SetupCheck;
*/
class EnvironmentController extends AbstractController
{
+ /**
+ * @var LateBootService
+ */
+ private $lateBootService;
+
+ public function __construct(
+ LateBootService $lateBootService
+ ) {
+ $this->lateBootService = $lateBootService;
+ }
+
/**
* Main "show the cards" view
*
@@ -239,6 +251,8 @@ class EnvironmentController extends AbstractController
*/
public function mailTestAction(ServerRequestInterface $request): ResponseInterface
{
+ $container = $this->lateBootService->getContainer();
+ $backup = $this->lateBootService->makeCurrent($container);
$messages = new FlashMessageQueue('install');
$recipient = $request->getParsedBody()['install']['email'];
if (empty($recipient) || !GeneralUtility::validEmail($recipient)) {
@@ -283,6 +297,7 @@ class EnvironmentController extends AbstractController
));
}
}
+ $this->lateBootService->makeCurrent(null, $backup);
return new JsonResponse([
'success' => true,
'status' => $messages,
diff --git a/typo3/sysext/install/Classes/ServiceProvider.php b/typo3/sysext/install/Classes/ServiceProvider.php
index ce153a61e946..e7279fa076b4 100644
--- a/typo3/sysext/install/Classes/ServiceProvider.php
+++ b/typo3/sysext/install/Classes/ServiceProvider.php
@@ -47,6 +47,7 @@ class ServiceProvider extends AbstractServiceProvider
Service\ClearCacheService::class => [ static::class, 'getClearCacheService' ],
Service\LoadTcaService::class => [ static::class, 'getLoadTcaService' ],
Middleware\Maintenance::class => [ static::class, 'getMaintenanceMiddleware' ],
+ Controller\EnvironmentController::class => [ static::class, 'getEnvironmentController' ],
Controller\UpgradeController::class => [ static::class, 'getUpgradeController' ],
Command\LanguagePackCommand::class => [ static::class, 'getLanguagePackCommand' ],
Command\UpgradeWizardRunCommand::class => [ static::class, 'getUpgradeWizardRunCommand' ],
@@ -107,6 +108,13 @@ class ServiceProvider extends AbstractServiceProvider
);
}
+ public static function getEnvironmentController(ContainerInterface $container): Controller\EnvironmentController
+ {
+ return new Controller\EnvironmentController(
+ $container->get(Service\LateBootService::class)
+ );
+ }
+
public static function getUpgradeController(ContainerInterface $container): Controller\UpgradeController
{
return new Controller\UpgradeController(
--
GitLab