MAGETWO-97901: [2.1.x] SOAP gateway ignores enforced parameters

Author: Oleksandr Gorkun

app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Webapi\Controller\Rest;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Webapi\Rest\Request\ParamOverriderInterface;
 use Magento\Webapi\Model\Config\Converter;
 use Magento\Framework\Reflection\MethodsMap;
@@ -26,15 +27,24 @@ class ParamsOverrider
      */
     private $methodsMap;
 
+    /**
+     * @var SimpleDataObjectConverter
+     */
+    private $dataObjectConverter;
+
     /**
      * Initialize dependencies
      *
      * @param ParamOverriderInterface[] $paramOverriders
+     * @param SimpleDataObjectConverter|null $dataObjectConverter
      */
     public function __construct(
-        array $paramOverriders = []
+        array $paramOverriders = [],
+        SimpleDataObjectConverter $dataObjectConverter = null
     ) {
         $this->paramOverriders = $paramOverriders;
+        $this->dataObjectConverter = $dataObjectConverter
+            ?: ObjectManager::getInstance()->get(SimpleDataObjectConverter::class);
     }
 
     /**
@@ -48,7 +58,7 @@ public function override(array $inputData, array $parameters)
     {
         foreach ($parameters as $name => $paramData) {
             $arrayKeys = explode('.', $name);
-            if ($paramData[Converter::KEY_FORCE] || !$this->isNestedArrayValueSet($inputData, $arrayKeys)) {
+            if (/*$paramData[Converter::KEY_FORCE] || */!$this->isNestedArrayValueSet($inputData, $arrayKeys)) {
                 $paramValue = $paramData[Converter::KEY_VALUE];
                 if (isset($this->paramOverriders[$paramValue])) {
                     $value = $this->paramOverriders[$paramValue]->getOverriddenValue();
@@ -64,15 +74,17 @@ public function override(array $inputData, array $parameters)
     /**
      * Determine if a nested array value is set.
      *
-     * @param array &$nestedArray
+     * @param array $nestedArray
      * @param string[] $arrayKeys
      * @return bool true if array value is set
      */
-    protected function isNestedArrayValueSet(&$nestedArray, $arrayKeys)
+    protected function isNestedArrayValueSet($nestedArray, $arrayKeys)
     {
-        $currentArray = &$nestedArray;
+        //Converting input data to camelCase in order to process both snake and camel style data equally.
+        $currentArray = $this->dataObjectConverter->convertKeysToCamelCase($nestedArray);
 
         foreach ($arrayKeys as $key) {
+            $key = SimpleDataObjectConverter::snakeCaseToCamelCase($key);
             if (!isset($currentArray[$key])) {
                 return false;
             }
@@ -95,12 +107,22 @@ protected function setNestedArrayValue(&$nestedArray, $arrayKeys, $valueToSet)
         $lastKey = array_pop($arrayKeys);
 
         foreach ($arrayKeys as $key) {
+            if (!array_key_exists($key, $currentArray)) {
+                //In case input data uses camelCase format
+                $key = SimpleDataObjectConverter::snakeCaseToCamelCase($key);
+            }
             if (!isset($currentArray[$key])) {
                 $currentArray[$key] = [];
             }
             $currentArray = &$currentArray[$key];
         }
 
+        //In case input data uses camelCase format
+        $camelCaseKey = SimpleDataObjectConverter::snakeCaseToCamelCase($lastKey);
+        if (array_key_exists($camelCaseKey, $currentArray)) {
+            $lastKey = $camelCaseKey;
+        }
+
         $currentArray[$lastKey] = $valueToSet;
     }
 

app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamsOverriderTest.php

@@ -7,6 +7,7 @@
 namespace Magento\Webapi\Test\Unit\Controller\Rest;
 
 use \Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Api\SimpleDataObjectConverter;
 
 /**
  * Test Magento\Webapi\Controller\Rest\ParamsOverrider
@@ -36,10 +37,31 @@ public function testOverrideParams($requestData, $parameters, $expectedOverridde
             ['userContext' => $userContextMock]
         );
 
+        /** @var \PHPUnit_Framework_MockObject_MockObject $objectConverter */
+        $objectConverter = $this->getMockBuilder(SimpleDataObjectConverter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convertKeysToCamelCase'])
+            ->getMock();
+        $objectConverter->expects($this->any())
+            ->method('convertKeysToCamelCase')
+            ->willReturnCallback(
+                function (array $array) {
+                    $converted = [];
+                    foreach ($array as $key => $value) {
+                        $converted[mb_strtolower($key)] = $value;
+                    }
+
+                    return $converted;
+                }
+            );
+
         /** @var \Magento\Webapi\Controller\Rest\ParamsOverrider $paramsOverrider */
         $paramsOverrider = $objectManager->getObject(
             'Magento\Webapi\Controller\Rest\ParamsOverrider',
-            ['paramOverriders' => ['%customer_id%' => $paramOverriderCustomerId ]]
+            [
+                'paramOverriders' => ['%customer_id%' => $paramOverriderCustomerId ],
+                'dataObjectConverter' => $objectConverter
+            ]
         );
 
         $this->assertEquals($expectedOverriddenParams, $paramsOverrider->override($requestData, $parameters));