diff --git a/typo3/sysext/core/Resources/Private/Language/locallang_core.xlf b/typo3/sysext/core/Resources/Private/Language/locallang_core.xlf index 26f288055109..b79f7119e52c 100644 --- a/typo3/sysext/core/Resources/Private/Language/locallang_core.xlf +++ b/typo3/sysext/core/Resources/Private/Language/locallang_core.xlf @@ -1206,12 +1206,6 @@ Do you want to refresh it now? Enter search term - - The Install Tool is still using the default password "joh316". Update this within the %sAbout section%s of the Install Tool. - - - The Install Tool is still using the default password "joh316". Update this within the %sImportant actions section%s of the Install Tool. - The default backend user "admin" with password "password" is still present. %sEdit this account%s, either deleting it completely or changing the username and password. diff --git a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php index 368c4ba7b6fd..3c568508011b 100644 --- a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php +++ b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php @@ -15,10 +15,7 @@ namespace TYPO3\CMS\Install\Report; -use TYPO3\CMS\Backend\Routing\UriBuilder; use TYPO3\CMS\Core\Core\Environment; -use TYPO3\CMS\Core\Crypto\PasswordHashing\InvalidPasswordHashException; -use TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory; use TYPO3\CMS\Core\Localization\LanguageService; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Install\Service\EnableFileService; @@ -41,62 +38,11 @@ public function getStatus() { $this->executeAdminCommand(); return [ - 'installToolPassword' => $this->getInstallToolPasswordStatus(), 'installToolProtection' => $this->getInstallToolProtectionStatus(), 'serverResponseStatus' => GeneralUtility::makeInstance(ServerResponseCheck::class)->asStatus(), ]; } - /** - * Checks whether the Install Tool password is set to its default value. - * - * @return Status An object representing the security of the install tool password - */ - protected function getInstallToolPasswordStatus() - { - // @todo @deprecated: This should be removed in TYPO3 v10.0 when install tool allows proper hashes only - $value = $this->getLanguageService()->getLL('status_ok'); - $message = ''; - $severity = Status::OK; - $isDefaultPassword = false; - $installToolPassword = $GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']; - $hashInstance = null; - $hashFactory = GeneralUtility::makeInstance(PasswordHashFactory::class); - try { - $hashInstance = $hashFactory->get($installToolPassword, 'BE'); - } catch (InvalidPasswordHashException $e) { - // $hashInstance stays null - $value = $this->getLanguageService()->getLL('status_wrongValue'); - $message = $e->getMessage(); - $severity = Status::ERROR; - } - if ($installToolPassword !== '' && $hashInstance !== null) { - $isDefaultPassword = $hashInstance->checkPassword('joh316', $installToolPassword); - } elseif ($installToolPassword === 'bacb98acf97e0b6112b1d1b650b84971') { - // using MD5 of legacy default password 'joh316' - $isDefaultPassword = true; - } - if ($isDefaultPassword) { - $value = $this->getLanguageService()->getLL('status_insecure'); - $severity = Status::ERROR; - /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */ - $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class); - $changeInstallToolPasswordUrl = (string)$uriBuilder->buildUriFromRoute('tools_toolssettings'); - $message = sprintf( - $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.installtool_default_password'), - '', - '' - ); - } - return GeneralUtility::makeInstance( - Status::class, - $this->getLanguageService()->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_installToolPassword'), - $value, - $message, - $severity - ); - } - /** * Checks for the existence of the ENABLE_INSTALL_TOOL file. * diff --git a/typo3/sysext/install/Resources/Private/Language/Report/locallang.xlf b/typo3/sysext/install/Resources/Private/Language/Report/locallang.xlf index bc6185d0dd97..7952245ce204 100644 --- a/typo3/sysext/install/Resources/Private/Language/Report/locallang.xlf +++ b/typo3/sysext/install/Resources/Private/Language/Report/locallang.xlf @@ -93,9 +93,6 @@ Your TYPO3 version is up-to-date. - - Install Tool Password - Install Tool diff --git a/typo3/sysext/reports/Resources/Private/Language/locallang_reports.xlf b/typo3/sysext/reports/Resources/Private/Language/locallang_reports.xlf index 9941ea565eba..96fb184c32f9 100644 --- a/typo3/sysext/reports/Resources/Private/Language/locallang_reports.xlf +++ b/typo3/sysext/reports/Resources/Private/Language/locallang_reports.xlf @@ -162,9 +162,6 @@ Debug Exception Handler enabled in Production Context - will show full error messages including stack traces. - - Install Tool Password - Install Tool