MAGETWO-46478: Frontend CAPTCHA Bypass

Author: Bohdan Korablov

lib/internal/Magento/Framework/Event/Config/Converter.php

@@ -38,7 +38,7 @@ public function convert($source)
                 $config['name'] = $observerNameNode->nodeValue;
                 $eventObservers[$observerNameNode->nodeValue] = $config;
             }
-            $output[$eventName] = $eventObservers;
+            $output[mb_strtolower($eventName)] = $eventObservers;
         }
         return $output;
     }

lib/internal/Magento/Framework/Event/Manager.php

@@ -10,35 +10,28 @@
 
 class Manager implements ManagerInterface
 {
-    /**
-     * Events cache
-     *
-     * @var array
-     */
-    protected $_events = [];
-
     /**
      * Event invoker
      *
      * @var InvokerInterface
      */
-    protected $_invoker;
+    protected $invoker;
 
     /**
      * Event config
      *
      * @var ConfigInterface
      */
-    protected $_eventConfig;
+    protected $eventConfig;
 
     /**
      * @param InvokerInterface $invoker
      * @param ConfigInterface $eventConfig
      */
     public function __construct(InvokerInterface $invoker, ConfigInterface $eventConfig)
     {
-        $this->_invoker = $invoker;
-        $this->_eventConfig = $eventConfig;
+        $this->invoker = $invoker;
+        $this->eventConfig = $eventConfig;
     }
 
     /**
@@ -53,16 +46,17 @@ public function __construct(InvokerInterface $invoker, ConfigInterface $eventCon
      */
     public function dispatch($eventName, array $data = [])
     {
+        $eventName = mb_strtolower($eventName);
         \Magento\Framework\Profiler::start('EVENT:' . $eventName, ['group' => 'EVENT', 'name' => $eventName]);
-        foreach ($this->_eventConfig->getObservers($eventName) as $observerConfig) {
+        foreach ($this->eventConfig->getObservers($eventName) as $observerConfig) {
             $event = new \Magento\Framework\Event($data);
             $event->setName($eventName);
 
             $wrapper = new Observer();
             $wrapper->setData(array_merge(['event' => $event], $data));
 
             \Magento\Framework\Profiler::start('OBSERVER:' . $observerConfig['name']);
-            $this->_invoker->dispatch($observerConfig, $wrapper);
+            $this->invoker->dispatch($observerConfig, $wrapper);
             \Magento\Framework\Profiler::stop('OBSERVER:' . $observerConfig['name']);
         }
         \Magento\Framework\Profiler::stop('EVENT:' . $eventName);

lib/internal/Magento/Framework/Event/Test/Unit/Config/ConverterTest.php

@@ -5,35 +5,44 @@
  */
 namespace Magento\Framework\Event\Test\Unit\Config;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Event\Config\Converter;
+
 class ConverterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Event\Config\Converter
+     * @var Converter
      */
-    protected $_model;
+    protected $model;
 
     /**
      * @var string
      */
-    protected $_filePath;
+    protected $filePath;
 
     /**
      * @var \DOMDocument
      */
-    protected $_source;
+    protected $source;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
 
     protected function setUp()
     {
-        $this->_filePath = __DIR__ . '/_files/';
-        $this->_source = new \DOMDocument();
-        $this->_model = new \Magento\Framework\Event\Config\Converter();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->filePath = __DIR__ . '/_files/';
+        $this->source = new \DOMDocument();
+        $this->model = $this->objectManagerHelper->getObject(Converter::class);
     }
 
     public function testConvert()
     {
-        $this->_source->loadXML(file_get_contents($this->_filePath . 'event_config.xml'));
-        $convertedFile = include $this->_filePath . 'event_config.php';
-        $this->assertEquals($convertedFile, $this->_model->convert($this->_source));
+        $this->source->loadXML(file_get_contents($this->filePath . 'event_config.xml'));
+        $convertedFile = include $this->filePath . 'event_config.php';
+        $this->assertEquals($convertedFile, $this->model->convert($this->source));
     }
 
     /**
@@ -42,7 +51,7 @@ public function testConvert()
      */
     public function testConvertThrowsExceptionWhenDomIsInvalid()
     {
-        $this->_source->loadXML(file_get_contents($this->_filePath . 'event_invalid_config.xml'));
-        $this->_model->convert($this->_source);
+        $this->source->loadXML(file_get_contents($this->filePath . 'event_invalid_config.xml'));
+        $this->model->convert($this->source);
     }
 }

lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/event_config.php

@@ -15,5 +15,8 @@
             'shared' => false,
             'name' => 'observer_2',
         ],
+    ],
+    'some_eventname' => [
+        'observer_3' => ['instance' => 'instance_3', 'name' => 'observer_3'],
     ]
 ];

lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/event_config.xml

@@ -13,4 +13,7 @@
     <event name="event_2">
         <observer name="observer_2" instance="instance_2" disabled="true" shared="false" />
     </event>
+    <event name="some_eventName">
+        <observer name="observer_3" instance="instance_3" disabled="false" shared="true" />
+    </event>
 </config>

lib/internal/Magento/Framework/Event/Test/Unit/ManagerTest.php

@@ -5,6 +5,11 @@
  */
 namespace Magento\Framework\Event\Test\Unit;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Event\InvokerInterface;
+use Magento\Framework\Event\ConfigInterface;
+use Magento\Framework\Event\Manager as EventManager;
+
 /**
  * Class ManagerTest
  *
@@ -15,74 +20,74 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_invoker;
+    protected $invokerMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_eventFactory;
+    protected $eventFactory;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_event;
+    protected $event;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_wrapperFactory;
+    protected $wrapperFactory;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_observer;
+    protected $observer;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_eventConfigMock;
+    protected $eventConfigMock;
 
     /**
      * @var \Magento\Framework\Event\Manager
      */
-    protected $_eventManager;
+    protected $eventManager;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
 
     protected function setUp()
     {
-        $this->_invoker = $this->getMock('Magento\Framework\Event\InvokerInterface');
-        $this->_eventConfigMock = $this->getMock('Magento\Framework\Event\ConfigInterface');
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->invokerMock = $this->getMock(InvokerInterface::class);
+        $this->eventConfigMock = $this->getMock(ConfigInterface::class);
 
-        $this->_eventManager = new \Magento\Framework\Event\Manager($this->_invoker, $this->_eventConfigMock);
+        $this->eventManager = $this->objectManagerHelper->getObject(
+            EventManager::class,
+            [
+                'invoker' => $this->invokerMock,
+                'eventConfig' => $this->eventConfigMock
+            ]
+        );
     }
 
     public function testDispatch()
     {
-        $this->_eventConfigMock->expects(
-            $this->once()
-        )->method(
-            'getObservers'
-        )->with(
-            'some_event'
-        )->will(
-            $this->returnValue(
-                ['observer' => ['instance' => 'class', 'method' => 'method', 'name' => 'observer']]
-            )
-        );
-        $this->_eventManager->dispatch('some_event', ['123']);
+        $this->eventConfigMock->expects($this->once())
+            ->method('getObservers')
+            ->with('some_eventname')
+            ->willReturn(['observer' => ['instance' => 'class', 'method' => 'method', 'name' => 'observer']]);
+        $this->eventManager->dispatch('some_eventName', ['123']);
     }
 
     public function testDispatchWithEmptyEventObservers()
     {
-        $this->_eventConfigMock->expects(
-            $this->once()
-        )->method(
-            'getObservers'
-        )->with(
-            'some_event'
-        )->will(
-            $this->returnValue([])
-        );
-        $this->_invoker->expects($this->never())->method('dispatch');
-        $this->_eventManager->dispatch('some_event');
+        $this->eventConfigMock->expects($this->once())
+            ->method('getObservers')
+            ->with('some_event')
+            ->willReturn([]);
+        $this->invokerMock->expects($this->never())->method('dispatch');
+        $this->eventManager->dispatch('some_event');
     }
 }