Skip to content

Fix invalid preferences #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 23, 2021
Merged

Fix invalid preferences #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd5e798
Replace Preference with Plugin
fredden Jun 8, 2021
6e4aade
Remove invalid preference
fredden Jun 8, 2021
b5b95b8
Correct argument order
fredden Jun 15, 2021
870586a
Merge remote-tracking branch 'upstream/develop' into fix-invalid-pref…
fredden Jun 28, 2021
a1103d1
Merge remote-tracking branch 'upstream/develop' into fix-invalid-pref…
fredden Jul 21, 2021
fc2f09a
Change namespace to appease static tests
fredden Jul 22, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions ...Framework/ControllerActionPredispatch.php → ...tFramework/Plugin/BypassTwoFactorAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,34 @@

declare(strict_types=1);

namespace Magento\TwoFactorAuth\TestFramework;
namespace Magento\TwoFactorAuth\TestFramework\Plugin;

use Closure;
use Magento\Backend\App\AbstractAction;
use Magento\Framework\Event\Observer;
use Magento\TwoFactorAuth\Observer\ControllerActionPredispatch as ParentObserver;
use Magento\TestFramework\Request;
use Magento\TwoFactorAuth\Observer\ControllerActionPredispatch;

/**
* Observer that allows integration controller tests that are not aware of 2FA to run.
* Plugin that allows integration controller tests that are not aware of 2FA to run.
*/
class ControllerActionPredispatch extends ParentObserver
class BypassTwoFactorAuth
{
/**
* @inheritDoc
*/
public function execute(Observer $observer)
{
public function aroundExecute(
ControllerActionPredispatch $subject,
Closure $proceed,
Observer $observer
) : void {
/** @var $controllerAction AbstractAction */
$controllerAction = $observer->getEvent()->getData('controller_action');
if (method_exists($controllerAction, 'getRequest')
&& $controllerAction->getRequest() instanceof \Magento\TestFramework\Request
&& $controllerAction->getRequest() instanceof Request
&& !$controllerAction->getRequest()->getParam('tfa_enabled')
) {
//Hack that allows integration controller tests that are not aware of 2FA to run
return;
}

parent::execute($observer);
$proceed($observer);
}
}
6 changes: 4 additions & 2 deletions TwoFactorAuth/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<preference for="Magento\TwoFactorAuth\Api\DuoAuthenticateInterface" type="Magento\TwoFactorAuth\Model\Provider\Engine\DuoSecurity\Authenticate"/>
<preference for="Magento\TwoFactorAuth\Api\Data\DuoDataInterface" type="Magento\TwoFactorAuth\Model\Data\Provider\Engine\DuoSecurity\Data"/>
<preference for="Magento\TwoFactorAuth\Api\U2fKeyConfigReaderInterface" type="Magento\TwoFactorAuth\Model\Provider\Engine\U2fKey\ConfigReader"/>
<preference for="OTPHP\TOTPInterface" type="OTPHP\TOTP"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this removed?
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This class isn't within scope for dependency injection.

Screenshot_2021-06-15_22-38-40

From what I can tell, this is used as a return type in Magento\TwoFactorAuth\Model\Provider\Engine\Google::getTotp() and Magento\TwoFactorAuth\Model\Provider\Engine\Google\TotpFactory::create(), and as a mock in Magento\TwoFactorAuth\Test\Unit\Model\Provider\Engine\GoogleTest::setUp(). None of these seem to need a Magento preference.

<type name="Magento\Framework\Console\CommandListInterface">
<arguments>
Expand Down Expand Up @@ -87,6 +86,10 @@
<plugin name="fixDefaultUrl" type="Magento\TwoFactorAuth\Plugin\FirstAvailableMenu"/>
</type>

<type name="Magento\TwoFactorAuth\Observer\ControllerActionPredispatch">
<plugin name="bypass_twofactorauth_testframework" type="Magento\TwoFactorAuth\TestFramework\Plugin\BypassTwoFactorAuth" />
</type>

<virtualType name="Magento\TwoFactorAuth\Model\Provider\Google" type="Magento\TwoFactorAuth\Model\Provider">
<arguments>
<argument name="engine" xsi:type="object">Magento\TwoFactorAuth\Model\Provider\Engine\Google</argument>
Expand Down Expand Up @@ -159,5 +162,4 @@
<preference for="Magento\TwoFactorAuth\Api\UserConfigRequestManagerInterface" type="Magento\TwoFactorAuth\Model\UserConfig\UserConfigRequestManager" />
<preference for="Magento\TwoFactorAuth\Api\UserConfigTokenManagerInterface" type="Magento\TwoFactorAuth\Model\UserConfig\SignedTokenManager" />
<preference for="Magento\TwoFactorAuth\Api\UserNotifierInterface" type="Magento\TwoFactorAuth\Model\EmailUserNotifier" />
<preference for="Magento\TwoFactorAuth\Observer\ControllerActionPredispatch" type="Magento\TwoFactorAuth\TestFramework\ControllerActionPredispatch" />
</config>