قرینه از
https://github.com/matomo-org/matomo.git
synced 2025-08-21 22:47:43 +00:00
065efa10af
* Adds proxy class for DI methods * use di proxy class * introduce proxy classes for logging * use proxy classes * submodule updates * fix typos * replace useage of DI\object with DI\autowire * Provide method to ask for confirmation in console method (capsulates usage of ConfirmationQuestion) * provide methods for using console helpers, instead of direct usage in plugins * refactor our console commands so they don't need to typehint input and output interfaces * Add proxy methods to add command options without using InputOption constants * Add proxy methods to add command arguments without using InputArgument constants * fix typo * proxy dependency exceptions * adjustments and fixes * use a custom di container class and di exceptions * submodule update * fix test * improve inline documentation * disallow using getHelper method in console commands * Ensure trim is always passed a string param Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com> * submodule updates * submodule updates --------- Co-authored-by: Michal Kleiner <michal@innocraft.com> Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com>
71 خطوط
3.2 KiB
PHP
71 خطوط
3.2 KiB
PHP
<?php
|
|
|
|
return array(
|
|
'Piwik\Plugins\TwoFactorAuth\Dao\TwoFaSecretRandomGenerator' => Piwik\DI::autowire('Piwik\Plugins\TwoFactorAuth\Dao\TwoFaSecretStaticGenerator'),
|
|
'Piwik\Plugins\TwoFactorAuth\Dao\RecoveryCodeRandomGenerator' => Piwik\DI::autowire('Piwik\Plugins\TwoFactorAuth\Dao\RecoveryCodeStaticGenerator'),
|
|
'Piwik\Plugins\TwoFactorAuth\TwoFactorAuthentication' => Piwik\DI::decorate(function ($previous) {
|
|
/** @var Piwik\Plugins\TwoFactorAuth\TwoFactorAuthentication $previous */
|
|
|
|
if (!\Piwik\SettingsPiwik::isMatomoInstalled()) {
|
|
return $previous;
|
|
}
|
|
|
|
$fakeCorrectAuthCode = \Piwik\Container\StaticContainer::get('test.vars.fakeCorrectAuthCode');
|
|
if (!empty($fakeCorrectAuthCode) && !\Piwik\Common::isPhpCliMode()) {
|
|
$staticSecret = new \Piwik\Plugins\TwoFactorAuth\Dao\TwoFaSecretStaticGenerator();
|
|
$secret = $staticSecret->generateSecret();
|
|
|
|
require_once PIWIK_DOCUMENT_ROOT . '/libs/Authenticator/TwoFactorAuthenticator.php';
|
|
$authenticator = new \TwoFactorAuthenticator();
|
|
$_GET['authcode'] = $authenticator->getCode($secret);
|
|
$_GET['authCode'] = $_GET['authcode'];
|
|
$_POST['authCode'] = $_GET['authcode'];
|
|
$_POST['authcode'] = $_GET['authcode'];
|
|
$_REQUEST['authcode'] = $_GET['authcode'];
|
|
$_REQUEST['authCode'] = $_GET['authcode'];
|
|
}
|
|
|
|
return $previous;
|
|
}),
|
|
'Piwik\Plugins\TwoFactorAuth\Dao\RecoveryCodeDao' => Piwik\DI::decorate(function ($previous) {
|
|
/** @var Piwik\Plugins\TwoFactorAuth\Dao\RecoveryCodeDao $previous */
|
|
|
|
if (!\Piwik\SettingsPiwik::isMatomoInstalled()) {
|
|
return $previous;
|
|
}
|
|
|
|
$restoreCodes = \Piwik\Container\StaticContainer::get('test.vars.restoreRecoveryCodes');
|
|
if (!empty($restoreCodes)) {
|
|
// we ensure this recovery code always works for those users
|
|
foreach (array('with2FA', 'with2FADisable') as $user) {
|
|
$previous->useRecoveryCode($user, '123456'); // we are using it first to make sure there is no duplicate
|
|
$previous->insertRecoveryCode($user, '123456');
|
|
\Piwik\Option::deleteLike(\Piwik\Plugins\TwoFactorAuth\TwoFactorAuthentication::OPTION_PREFIX_TWO_FA_CODE_USED . '%');
|
|
}
|
|
}
|
|
|
|
return $previous;
|
|
}),
|
|
'Piwik\Plugins\TwoFactorAuth\SystemSettings' => Piwik\DI::decorate(function ($previous) {
|
|
/** @var Piwik\Plugins\TwoFactorAuth\SystemSettings $previous */
|
|
if (!\Piwik\SettingsPiwik::isMatomoInstalled()) {
|
|
return $previous;
|
|
}
|
|
|
|
Piwik\Access::doAsSuperUser(function () use ($previous) {
|
|
$requireTwoFa = \Piwik\Container\StaticContainer::get('test.vars.requireTwoFa');
|
|
if (!empty($requireTwoFa)) {
|
|
$previous->twoFactorAuthRequired->setValue(1);
|
|
} else {
|
|
try {
|
|
$previous->twoFactorAuthRequired->setValue(0);
|
|
} catch (Exception $e) {
|
|
// may fail when matomo is trying to update or so
|
|
}
|
|
}
|
|
});
|
|
|
|
return $previous;
|
|
})
|
|
);
|