Merge pull request #40 from magento-commerce/imported-magento-security-package-297

MC-42905: Unable to Plugin to \Magento\TwoFactorAuth\Observer\ControllerActionPredispatch

Author: nathanjosiah

TwoFactorAuth/TestFramework/ControllerActionPredispatch.php renamed to TwoFactorAuth/TestFramework/Plugin/BypassTwoFactorAuth.php

@@ -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);
     }
 }

TwoFactorAuth/etc/di.xml

@@ -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"/>
 
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
@@ -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>
@@ -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>