From f35e23b5c6280c4b91d6d35c30c3b0ad319266eb Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Wed, 9 Jun 2021 15:26:52 +0200 Subject: [PATCH] Remove the master password (#4272) Close #3913 --- com.woltlab.wcf/acpTemplateDelete.xml | 7 + com.woltlab.wcf/fileDelete.xml | 8 ++ com.woltlab.wcf/option.xml | 8 +- constants.php | 2 - .../files/acp/templates/masterPassword.tpl | 50 ------- .../acp/templates/masterPasswordInit.tpl | 74 ---------- .../lib/acp/action/LogoutAction.class.php | 1 - .../lib/acp/form/LanguageImportForm.class.php | 12 -- .../LanguageMultilingualismForm.class.php | 12 -- .../lib/acp/form/MasterPasswordForm.class.php | 132 ----------------- .../acp/form/MasterPasswordInitForm.class.php | 133 ------------------ .../files/lib/acp/form/OptionForm.class.php | 6 - .../form/PackageStartInstallForm.class.php | 4 - .../form/PackageUpdateServerAddForm.class.php | 12 -- .../lib/acp/form/UserGroupAddForm.class.php | 13 -- .../acp/form/UserGroupOptionForm.class.php | 12 -- .../PackageInstallationConfirmPage.class.php | 12 -- .../lib/acp/page/PackageUpdatePage.class.php | 12 -- .../install/files/lib/system/WCF.class.php | 4 + .../install/files/lib/system/WCFACP.class.php | 27 +--- .../files/lib/system/WCFSetup.class.php | 2 - wcfsetup/install/files/options.inc.php | 1 - wcfsetup/install/lang/de.xml | 32 ++--- wcfsetup/install/lang/en.xml | 32 ++--- 24 files changed, 55 insertions(+), 553 deletions(-) create mode 100644 com.woltlab.wcf/acpTemplateDelete.xml create mode 100644 com.woltlab.wcf/fileDelete.xml delete mode 100644 wcfsetup/install/files/acp/templates/masterPassword.tpl delete mode 100644 wcfsetup/install/files/acp/templates/masterPasswordInit.tpl delete mode 100755 wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php delete mode 100755 wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php diff --git a/com.woltlab.wcf/acpTemplateDelete.xml b/com.woltlab.wcf/acpTemplateDelete.xml new file mode 100644 index 0000000000..10e84402ca --- /dev/null +++ b/com.woltlab.wcf/acpTemplateDelete.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/com.woltlab.wcf/fileDelete.xml b/com.woltlab.wcf/fileDelete.xml new file mode 100644 index 0000000000..a1f0a46f6a --- /dev/null +++ b/com.woltlab.wcf/fileDelete.xml @@ -0,0 +1,8 @@ + + + + acp/masterPassword.inc.php + lib/acp/form/MasterPasswordForm.class.php + lib/acp/form/MasterPasswordInitForm.class.php + + diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml index 2813b7854e..1fa47391fc 100644 --- a/com.woltlab.wcf/option.xml +++ b/com.woltlab.wcf/option.xml @@ -280,11 +280,6 @@ 1 1 - + + diff --git a/constants.php b/constants.php index c368f8e30f..86ace69315 100644 --- a/constants.php +++ b/constants.php @@ -9,7 +9,6 @@ */ // automatically defined constants/constants defined with classes -\define('MASTER_PASSWORD', ''); \define('PACKAGE_ID', 1); \define('PACKAGE_NAME', ''); \define('RELATIVE_WCF_DIR', ''); @@ -28,7 +27,6 @@ \define('LAST_UPDATE_TIME', 0); \define('WCF_UUID', 'bd096261-15f4-5dc1-9767-01ce08d7c80b'); \define('WOLTLAB_BRANDING', 1); -\define('MODULE_MASTER_PASSWORD', 0); \define('VISITOR_USE_TINY_BUILD', 0); \define('ENABLE_DEBUG_MODE', 1); \define('ENABLE_BENCHMARK', 0); diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl deleted file mode 100644 index 97d2ca08dc..0000000000 --- a/wcfsetup/install/files/acp/templates/masterPassword.tpl +++ /dev/null @@ -1,50 +0,0 @@ -{include file='header' pageTitle='wcf.acp.masterPassword.enter'} - - - -
-

{lang}wcf.acp.masterPassword.enter{/lang}

-
- -

- {lang}wcf.acp.masterPassword.enter.deprecated{/lang} -

- -{include file='formError'} - -
-
- -
-
- - {if $errorField == 'masterPassword'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.acp.masterPassword.error.{@$errorType}{/lang} - {/if} - - {/if} - {lang}wcf.acp.masterPassword.enter.description{/lang} -
- - - {event name='enterFields'} -
- - {event name='sections'} - -
- - - {csrfToken} -
-
- -{include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl deleted file mode 100644 index 9fba333e0a..0000000000 --- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl +++ /dev/null @@ -1,74 +0,0 @@ -{include file='header' pageTitle='wcf.acp.masterPassword.init'} - - - -
-

{lang}wcf.acp.masterPassword.init{/lang}

-
- -{include file='formError'} - -
-
- -
-
- - {if $errorField == 'masterPassword'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.acp.masterPassword.error.{@$errorType}{/lang} - {/if} - - {/if} - {lang}wcf.acp.masterPassword.init.description{/lang} -
- - - -
-
- - {if $errorField == 'confirmMasterPassword'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.acp.masterPassword.error.{@$errorType}{/lang} - {/if} - - {/if} -
- - -
-
-
-

{@$exampleMasterPassword}

- -
-
- - {event name='initFields'} -
- - {event name='sections'} - -
- - - {csrfToken} -
-
- -{include file='footer'} diff --git a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php index 4c32092926..50afa676ae 100755 --- a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php @@ -30,7 +30,6 @@ class LogoutAction extends AbstractSecureAction parent::execute(); WCF::getSession()->clearReauthentication(); - WCF::getSession()->unregister('masterPassword'); $this->executed(); diff --git a/wcfsetup/install/files/lib/acp/form/LanguageImportForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageImportForm.class.php index 0a2433d877..2e6d5de31b 100644 --- a/wcfsetup/install/files/lib/acp/form/LanguageImportForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LanguageImportForm.class.php @@ -11,7 +11,6 @@ use wcf\system\exception\SystemException; use wcf\system\exception\UserInputException; use wcf\system\language\LanguageFactory; use wcf\system\WCF; -use wcf\system\WCFACP; use wcf\util\XML; /** @@ -182,15 +181,4 @@ class LanguageImportForm extends AbstractForm 'packageID' => $this->packageID, ]); } - - /** - * @inheritDoc - */ - public function show() - { - // check master password - WCFACP::checkMasterPassword(); - - parent::show(); - } } diff --git a/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php index d1a18726cf..dbf1a74289 100644 --- a/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php @@ -9,7 +9,6 @@ use wcf\system\cache\builder\LanguageCacheBuilder; use wcf\system\exception\UserInputException; use wcf\system\language\LanguageFactory; use wcf\system\WCF; -use wcf\system\WCFACP; use wcf\util\ArrayUtil; /** @@ -167,15 +166,4 @@ class LanguageMultilingualismForm extends AbstractForm 'languages' => $this->languages, ]); } - - /** - * @inheritDoc - */ - public function show() - { - // check master password - WCFACP::checkMasterPassword(); - - parent::show(); - } } diff --git a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php deleted file mode 100755 index 3bcb9244d8..0000000000 --- a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php +++ /dev/null @@ -1,132 +0,0 @@ - - * @package WoltLabSuite\Core\Acp\Form - * @deprecated 5.4 The master password is deprecated in favor of proper MFA (https://github.com/WoltLab/WCF/issues/3698). - */ -class MasterPasswordForm extends AbstractForm -{ - /** - * master password - * @var string - */ - public $masterPassword = ''; - - /** - * forward url - * @var string - */ - public $url = ''; - - /** - * @inheritDoc - */ - public function readParameters() - { - parent::readParameters(); - - if (\file_exists(WCF_DIR . 'acp/masterPassword.inc.php')) { - require_once(WCF_DIR . 'acp/masterPassword.inc.php'); - } else { - HeaderUtil::redirect(LinkHandler::getInstance()->getLink('MasterPasswordInit')); - - exit; - } - } - - /** - * @inheritDoc - */ - public function readFormParameters() - { - parent::readFormParameters(); - - if (isset($_POST['masterPassword'])) { - $this->masterPassword = $_POST['masterPassword']; - } - if (isset($_POST['url'])) { - $this->url = $_POST['url']; - } - } - - /** - * @inheritDoc - */ - public function validate() - { - parent::validate(); - - if (empty($this->masterPassword)) { - throw new UserInputException('masterPassword'); - } - - // check password - if (!\hash_equals(MASTER_PASSWORD, PasswordUtil::getDoubleSaltedHash($this->masterPassword, MASTER_PASSWORD))) { - throw new UserInputException('masterPassword', 'invalid'); - } - } - - /** - * @inheritDoc - */ - public function save() - { - parent::save(); - - // update session - WCF::getSession()->register('masterPassword', 1); - WCF::getSession()->update(); - WCF::getSession()->disableUpdate(); - - // forward - if (empty($this->url)) { - $this->url = LinkHandler::getInstance()->getLink(); - } - HeaderUtil::redirect($this->url); - - exit; - } - - /** - * @inheritDoc - */ - public function readData() - { - parent::readData(); - - if (empty($_POST) && \mb_strpos(WCF::getSession()->requestURI, 'MasterPassword') === false) { - // The request URI on it's own is not sufficient for environments that use different subdomains. - $protocol = RouteHandler::secureConnection() ? 'https' : 'http'; - $this->url = $protocol . '://' . $_SERVER['HTTP_HOST'] . WCF::getSession()->requestURI; - } - } - - /** - * @inheritDoc - */ - public function assignVariables() - { - parent::assignVariables(); - - WCF::getTPL()->assign([ - 'masterPassword' => $this->masterPassword, - 'relativeWcfDir' => RELATIVE_WCF_DIR, - 'url' => $this->url, - ]); - } -} diff --git a/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php b/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php deleted file mode 100755 index 7388d7a2dd..0000000000 --- a/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php +++ /dev/null @@ -1,133 +0,0 @@ - - * @package WoltLabSuite\Core\Acp\Form - * @deprecated 5.4 The master password is deprecated in favor of proper MFA (https://github.com/WoltLab/WCF/issues/3698). - */ -class MasterPasswordInitForm extends MasterPasswordForm -{ - /** - * master password confirm - * @var string - */ - public $confirmMasterPassword = ''; - - /** - * @inheritDoc - */ - public function readParameters() - { - AbstractForm::readParameters(); - - if (\file_exists(WCF_DIR . 'acp/masterPassword.inc.php')) { - require_once(WCF_DIR . 'acp/masterPassword.inc.php'); - - if (\defined('MASTER_PASSWORD')) { - throw new IllegalLinkException(); - } - } - } - - /** - * @inheritDoc - */ - public function readFormParameters() - { - parent::readFormParameters(); - - if (isset($_POST['confirmMasterPassword'])) { - $this->confirmMasterPassword = $_POST['confirmMasterPassword']; - } - } - - /** - * @inheritDoc - */ - public function validate() - { - AbstractForm::validate(); - - if (empty($this->masterPassword)) { - throw new UserInputException('masterPassword'); - } - - // check password security - if (\mb_strlen($this->masterPassword) < 12) { - throw new UserInputException('masterPassword', 'notSecure'); - } - // digits - if (!Regex::compile('\d')->match($this->masterPassword)) { - throw new UserInputException('masterPassword', 'notSecure'); - } - // latin characters (lower-case) - if (!Regex::compile('[a-z]')->match($this->masterPassword)) { - throw new UserInputException('masterPassword', 'notSecure'); - } - // latin characters (upper-case) - if (!Regex::compile('[A-Z]')->match($this->masterPassword)) { - throw new UserInputException('masterPassword', 'notSecure'); - } - - // password equals username - if ($this->masterPassword == WCF::getUser()->username) { - throw new UserInputException('masterPassword', 'notSecure'); - } - - // confirm master password - if (empty($this->confirmMasterPassword)) { - throw new UserInputException('confirmMasterPassword'); - } - - if ($this->confirmMasterPassword != $this->masterPassword) { - throw new UserInputException('confirmMasterPassword', 'notEqual'); - } - } - - /** - * @inheritDoc - */ - public function save() - { - // write master password file - $file = new File(WCF_DIR . 'acp/masterPassword.inc.php'); - $file->write("masterPassword) . "'); -?>"); - $file->close(); - FileUtil::makeWritable(WCF_DIR . 'acp/masterPassword.inc.php'); - - parent::save(); - } - - /** - * @inheritDoc - */ - public function assignVariables() - { - parent::assignVariables(); - - WCF::getTPL()->assign([ - 'confirmMasterPassword' => $this->confirmMasterPassword, - 'exampleMasterPassword' => PasswordUtil::getRandomPassword(16), - 'relativeWcfDir' => RELATIVE_WCF_DIR, - ]); - } -} diff --git a/wcfsetup/install/files/lib/acp/form/OptionForm.class.php b/wcfsetup/install/files/lib/acp/form/OptionForm.class.php index 3ce2eb46bc..4ff8836dd2 100644 --- a/wcfsetup/install/files/lib/acp/form/OptionForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/OptionForm.class.php @@ -9,7 +9,6 @@ use wcf\system\exception\IllegalLinkException; use wcf\system\menu\acp\ACPMenu; use wcf\system\style\StyleHandler; use wcf\system\WCF; -use wcf\system\WCFACP; use wcf\util\StringUtil; /** @@ -136,11 +135,6 @@ class OptionForm extends AbstractOptionListForm // check permission WCF::getSession()->checkPermissions(['admin.configuration.canEditOption']); - if ($this->category->categoryName == 'module') { - // check master password - WCFACP::checkMasterPassword(); - } - // show form parent::show(); } diff --git a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php index 669c05633c..68d299ea75 100755 --- a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php @@ -14,7 +14,6 @@ use wcf\system\package\PackageInstallationDispatcher; use wcf\system\package\validation\PackageValidationException; use wcf\system\package\validation\PackageValidationManager; use wcf\system\WCF; -use wcf\system\WCFACP; use wcf\util\FileUtil; /** @@ -252,9 +251,6 @@ class PackageStartInstallForm extends AbstractForm throw new PermissionDeniedException(); } - // check master password - WCFACP::checkMasterPassword(); - parent::show(); } } diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php index 7a7f935baa..30d54df781 100755 --- a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php @@ -9,7 +9,6 @@ use wcf\form\AbstractForm; use wcf\system\exception\UserInputException; use wcf\system\request\LinkHandler; use wcf\system\WCF; -use wcf\system\WCFACP; use wcf\util\StringUtil; use wcf\util\Url; @@ -166,15 +165,4 @@ class PackageUpdateServerAddForm extends AbstractForm 'action' => 'add', ]); } - - /** - * @inheritDoc - */ - public function show() - { - // check master password - WCFACP::checkMasterPassword(); - - parent::show(); - } } diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php index cf073030f8..a8504c2749 100755 --- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php @@ -9,7 +9,6 @@ use wcf\system\language\I18nHandler; use wcf\system\option\user\group\UserGroupOptionHandler; use wcf\system\request\LinkHandler; use wcf\system\WCF; -use wcf\system\WCFACP; use wcf\util\StringUtil; /** @@ -272,16 +271,4 @@ class UserGroupAddForm extends AbstractOptionListForm 'requireMultifactor' => $this->requireMultifactor, ]); } - - /** - * @inheritDoc - */ - public function show() - { - // check master password - WCFACP::checkMasterPassword(); - - // show form - parent::show(); - } } diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php index da47640221..6a11d77a98 100644 --- a/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php @@ -17,7 +17,6 @@ use wcf\system\exception\UserInputException; use wcf\system\option\user\group\IUserGroupGroupOptionType; use wcf\system\option\user\group\IUserGroupOptionType; use wcf\system\WCF; -use wcf\system\WCFACP; /** * Shows the user group option form to edit a single option. @@ -314,17 +313,6 @@ class UserGroupOptionForm extends AbstractForm ]); } - /** - * @inheritDoc - */ - public function show() - { - // check master password - WCFACP::checkMasterPassword(); - - parent::show(); - } - /** * Validates object options and permissions. * diff --git a/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php index e1bff0da04..8789c0fc5b 100644 --- a/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php @@ -8,7 +8,6 @@ use wcf\system\exception\IllegalLinkException; use wcf\system\package\PackageInstallationDispatcher; use wcf\system\package\validation\PackageValidationManager; use wcf\system\WCF; -use wcf\system\WCFACP; /** * Shows a confirmation page prior to start installing. @@ -111,15 +110,4 @@ class PackageInstallationConfirmPage extends AbstractPage 'installingImportedStyle' => $this->installingImportedStyle, ]); } - - /** - * @inheritDoc - */ - public function show() - { - // check master password - WCFACP::checkMasterPassword(); - - parent::show(); - } } diff --git a/wcfsetup/install/files/lib/acp/page/PackageUpdatePage.class.php b/wcfsetup/install/files/lib/acp/page/PackageUpdatePage.class.php index a40808c9a0..306ef4a347 100644 --- a/wcfsetup/install/files/lib/acp/page/PackageUpdatePage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PackageUpdatePage.class.php @@ -5,7 +5,6 @@ namespace wcf\acp\page; use wcf\page\AbstractPage; use wcf\system\package\PackageUpdateDispatcher; use wcf\system\WCF; -use wcf\system\WCFACP; /** * Shows the package update confirmation form. @@ -54,15 +53,4 @@ class PackageUpdatePage extends AbstractPage 'availableUpdates' => $this->availableUpdates, ]); } - - /** - * @inheritDoc - */ - public function show() - { - // check master password - WCFACP::checkMasterPassword(); - - parent::show(); - } } diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 78fd4d703f..27c9009486 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -466,6 +466,10 @@ class WCF // Cover photos are always enabled since 5.4. // https://github.com/WoltLab/WCF/issues/3902 \define('MODULE_USER_COVER_PHOTO', 1); + + // The master password has been removed since 5.5. + // https://github.com/WoltLab/WCF/issues/3913 + \define('MODULE_MASTER_PASSWORD', 0); } /** diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php index 018707978f..f257053780 100644 --- a/wcfsetup/install/files/lib/system/WCFACP.class.php +++ b/wcfsetup/install/files/lib/system/WCFACP.class.php @@ -2,8 +2,6 @@ namespace wcf\system; -use wcf\acp\form\MasterPasswordForm; -use wcf\acp\form\MasterPasswordInitForm; use wcf\data\menu\Menu; use wcf\data\menu\MenuCache; use wcf\system\application\ApplicationHandler; @@ -288,29 +286,6 @@ class WCFACP extends WCF */ public static function checkMasterPassword() { - if ( - \defined('MODULE_MASTER_PASSWORD') - && MODULE_MASTER_PASSWORD == 1 - && !WCF::getSession()->getVar('masterPassword') - ) { - if (ENABLE_ENTERPRISE_MODE && WCF::getUser()->hasOwnerAccess()) { - return; - } - - if (\file_exists(WCF_DIR . 'acp/masterPassword.inc.php')) { - require_once(WCF_DIR . 'acp/masterPassword.inc.php'); - } - if (\defined('MASTER_PASSWORD')) { - $form = new MasterPasswordForm(); - $form->__run(); - - exit; - } else { - $form = new MasterPasswordInitForm(); - $form->__run(); - - exit; - } - } + // Does nothing. The master password has been removed since version 5.5. } } diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index 5d6bc90e76..283e2664b2 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -38,7 +38,6 @@ use wcf\util\XML; \define('PACKAGE_ID', 0); \define('HTTP_SEND_X_FRAME_OPTIONS', 0); \define('CACHE_SOURCE_TYPE', 'disk'); -\define('MODULE_MASTER_PASSWORD', 1); \define('ENABLE_DEBUG_MODE', 1); \define('ENABLE_BENCHMARK', 0); \define('ENABLE_ENTERPRISE_MODE', 0); @@ -1338,7 +1337,6 @@ class WCFSetup extends WCF $factory->load(); SessionHandler::getInstance()->changeUser($admin); - SessionHandler::getInstance()->register('masterPassword', 1); SessionHandler::getInstance()->register('__wcfSetup_developerMode', self::$developerMode); SessionHandler::getInstance()->register('__wcfSetup_directories', self::$directories); SessionHandler::getInstance()->register('__wcfSetup_imagick', ImagickImageAdapter::isSupported()); diff --git a/wcfsetup/install/files/options.inc.php b/wcfsetup/install/files/options.inc.php index e5a7210d9b..35d82f0f1d 100644 --- a/wcfsetup/install/files/options.inc.php +++ b/wcfsetup/install/files/options.inc.php @@ -29,7 +29,6 @@ if (\file_exists(WCF_DIR . 'cookiePrefix.txt')) { \define('CACHE_SOURCE_TYPE', 'disk'); \define('IMAGE_ADAPTER_TYPE', 'gd'); -\define('MODULE_MASTER_PASSWORD', 0); \define('TIMEZONE', 'Europe/Berlin'); \define('ENABLE_DEBUG_MODE', 1); diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index d4ae44c832..6ad67afc62 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -1055,20 +1055,6 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z - - - - - {@$relativeWcfDir}acp/masterPassword.inc.php {if LANGUAGE_USE_INFORMAL_VARIANT}löschst{else}löschen{/if}.]]> - - - {@$relativeWcfDir}acp/masterPassword.inc.php {if LANGUAGE_USE_INFORMAL_VARIANT}löschst{else}löschen{/if}.]]> - - - - - Mehrfaktor-Authentifizierung schützt Benutzerkonten zuverlässiger und in allen Bereichen. Falls gewünscht, können einzelne Benutzergruppen verpflichtet werden, die Mehrfaktor-Authentifizierung einzurichten, bevor diese sensible Bereiche, wie beispielsweise die Administrationsoberfläche betreten können.]]> - @@ -1382,8 +1368,6 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z - - @@ -5541,4 +5525,20 @@ Benachrichtigungen auf {PAGE_TITLE|lang + + + + + + + + + + + + + + + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 1c6f3245aa..a3c0e29974 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1033,20 +1033,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details - - - - - {@$relativeWcfDir}acp/masterPassword.inc.php.]]> - {@$relativeWcfDir}acp/masterPassword.inc.php.]]> - - - - - - - Multi-factor Authentication protects accounts more reliably and in all areas. If desired, specific user groups can be required to set up multi-factor authentication, before they are able to enter sensitive areas, such as the Administration Control Panel.]]> - @@ -1360,8 +1346,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details - - @@ -5542,4 +5526,20 @@ your notifications on {PAGE_TITLE|langu + + + + + + + + + + + + + + + + -- 2.20.1