Merge pull request #6862 from magento-cia/cia-2.4-develop-fixes-05132021

[cia] MC-36035: Prevent input based resource allocation

Author: admanesachin

app/etc/di.xml

@@ -1927,4 +1927,41 @@
             </argument>
         </arguments>
     </type>
+    <preference for="Magento\Framework\Webapi\Validator\ServiceInputValidatorInterface" type="Magento\Framework\Webapi\Validator\CompositeServiceInputValidator"/>
+    <type name="Magento\Framework\Webapi\Validator\CompositeServiceInputValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="entityArrayValidator" xsi:type="object">Magento\Framework\Webapi\Validator\EntityArrayValidator</item>
+                <item name="searchCriteriaValidator" xsi:type="object">Magento\Framework\Webapi\Validator\SearchCriteriaValidator</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Webapi\Validator\EntityArrayValidator">
+        <arguments>
+            <argument name="complexArrayItemLimit" xsi:type="number">20</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Webapi\Validator\SearchCriteriaValidator">
+        <arguments>
+            <argument name="maximumPageSize" xsi:type="number">300</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Framework\GraphQl\Query\Resolver\Argument\ValidatorInterface" type="Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\CompositeValidator"/>
+    <type name="Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\CompositeValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="searchCriteriaValidator" xsi:type="object">Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\SearchCriteriaValidator</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\SearchCriteriaValidator">
+        <arguments>
+            <argument name="maxPageSize" xsi:type="number">300</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Webapi\ServiceInputProcessor">
+        <arguments>
+            <argument name="defaultPageSize" xsi:type="number">20</argument>
+        </arguments>
+    </type>
 </config>

dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/OperationRepositoryInterfaceTest.php

@@ -36,6 +36,7 @@ public function testGetListByBulkStartTime()
                     ],
                 ],
                 'current_page' => 1,
+                'page_size' => 20,
             ],
         ];
 
@@ -93,6 +94,7 @@ public function testGetList()
                     ],
                 ],
                 'current_page' => 1,
+                'page_size' => 20,
             ],
         ];
 

dev/tests/api-functional/testsuite/Magento/Framework/Api/Search/SearchTest.php

@@ -38,7 +38,7 @@ public function testCatalogSearch()
                         ]
                     ]
                 ],
-                'page_size' => 999,
+                'page_size' => 300,
                 'current_page' => 0,
             ],
         ];

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoListTest.php

@@ -84,7 +84,7 @@ public function testCreditmemoList()
         $searchCriteriaBuilder->addFilters([$stateFilter]);
         $searchCriteriaBuilder->addFilters([$incrementFilter, $zeroStatusFilter]);
         $searchCriteriaBuilder->addSortOrder($sortOrder);
-
+        $searchCriteriaBuilder->setPageSize(20);
         $searchData = $searchCriteriaBuilder->create()->__toArray();
 
         $requestData = ['searchCriteria' => $searchData];

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceListTest.php

@@ -71,6 +71,7 @@ public function testInvoiceList()
         $searchCriteriaBuilder->addFilters([$stateFilter]);
         $searchCriteriaBuilder->addFilters([$incrementFilter, $zeroStatusFilter]);
         $searchCriteriaBuilder->addSortOrder($sortOrder);
+        $searchCriteriaBuilder->setPageSize(20);
         $searchData = $searchCriteriaBuilder->create()->__toArray();
 
         $requestData = ['searchCriteria' => $searchData];

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php

@@ -135,6 +135,7 @@ private function getSearchData() : array
         $searchCriteriaBuilder->addFilters([$filter1]);
         $searchCriteriaBuilder->addFilters([$filter2, $filter3]);
         $searchCriteriaBuilder->addSortOrder($sortOrder);
+        $searchCriteriaBuilder->setPageSize(20);
         $searchData = $searchCriteriaBuilder->create()->__toArray();
 
         return $searchData;

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php

@@ -67,7 +67,7 @@ public function testShipmentList()
         $searchCriteriaBuilder->addFilters([$filter1, $filter2]);
         $searchCriteriaBuilder->addFilters([$filter3]);
         $searchCriteriaBuilder->addSortOrder($sortOrder);
-
+        $searchCriteriaBuilder->setPageSize(20);
         $searchData = $searchCriteriaBuilder->create()->__toArray();
 
         $requestData = ['searchCriteria' => $searchData];

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/TransactionTest.php

@@ -145,7 +145,7 @@ public function testTransactionList()
         $searchCriteriaBuilder->addFilters([$filter1, $filter2]);
         $searchCriteriaBuilder->addFilters([$filter3, $filter4]);
         $searchCriteriaBuilder->addSortOrder($sortOrder);
-
+        $searchCriteriaBuilder->setPageSize(20);
         $searchData = $searchCriteriaBuilder->create()->__toArray();
 
         $requestData = ['searchCriteria' => $searchData];

dev/tests/api-functional/testsuite/Magento/SalesRule/Api/CouponManagementTest.php

@@ -156,7 +156,7 @@ protected function getList($ruleId)
                     ],
                 ],
                 'current_page' => 1,
-                'page_size' => 9999,
+                'page_size' => 300,
             ],
         ];
 

dev/tests/api-functional/testsuite/Magento/SalesRule/Api/CouponRepositoryTest.php

@@ -134,6 +134,7 @@ public function testGetListWithMultipleFiltersAndSorting()
         $searchCriteriaBuilder->addFilters([$filter1, $filter2]);
         $searchCriteriaBuilder->addFilters([$filter3]);
         $searchCriteriaBuilder->addSortOrder($sortOrder);
+        $searchCriteriaBuilder->setPageSize(20);
         $searchData = $searchCriteriaBuilder->create()->__toArray();
         $requestData = ['searchCriteria' => $searchData];