Skip to content

Commit d2c897b

Browse files
committed
AC-465: Allow to configure input limit for RESTful endpoints
1 parent b301069 commit d2c897b

File tree

7 files changed

+6
-56
lines changed

7 files changed

+6
-56
lines changed

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/HttpClient/CurlClient.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,8 @@ public function put($url, $data, $headers = [])
118118
$curlOpts[CURLOPT_CUSTOMREQUEST] = \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT;
119119
$headers[] = 'Content-Length: ' . strlen($data);
120120
$curlOpts[CURLOPT_POSTFIELDS] = $data;
121-
try{
122-
$resp = $this->invokeApi($url, $curlOpts, $headers);
123-
}catch (\Exception $e){
124-
var_dump([
125-
'message' => $e->getMessage(),
126-
'code' => $e->getCode(),
127-
'file' => $e->getFile(),
128-
'traceAsString' => $e->getTraceAsString(),
129-
]);
130-
throw $e;
131-
}
121+
122+
$resp = $this->invokeApi($url, $curlOpts, $headers);
132123
return $resp["body"];
133124
}
134125

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,7 @@ public function call($serviceInfo, $arguments = [], $storeCode = null, $integrat
9999
$response = $this->restClient->post($resourcePath, $arguments, $authHeader);
100100
break;
101101
case Request::HTTP_METHOD_PUT:
102-
try{
103-
$response = $this->restClient->put($resourcePath, $arguments, $authHeader);
104-
}catch (\Exception $e){
105-
var_dump([
106-
'message' => $e->getMessage(),
107-
'code' => $e->getCode(),
108-
'file' => $e->getFile(),
109-
'traceAsString' => $e->getTraceAsString(),
110-
]);
111-
throw $e;
112-
}
102+
$response = $this->restClient->put($resourcePath, $arguments, $authHeader);
113103
break;
114104
case Request::HTTP_METHOD_DELETE:
115105
$response = $this->restClient->delete($resourcePath, $authHeader);

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest/RestClient.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,7 @@ public function put($resourcePath, $data, $headers = [])
103103
$data = '';
104104
}
105105
}
106-
try{
107-
$responseBody = $this->curlClient->put($url, $data, $headers);
108-
}catch (\Exception $e){
109-
var_dump([
110-
'message' => $e->getMessage(),
111-
'code' => $e->getCode(),
112-
'file' => $e->getFile(),
113-
'traceAsString' => $e->getTraceAsString(),
114-
]);
115-
throw $e;
116-
}
117-
106+
$responseBody = $this->curlClient->put($url, $data, $headers);
118107
return $this->jsonSerializer->jsonDecode($responseBody);
119108
}
120109

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -565,20 +565,7 @@ protected function _restoreAppConfig()
565565
*/
566566
public function processRestExceptionResult(\Exception $e)
567567
{
568-
echo 'pickachu';
569-
var_dump([
570-
'message' => $e->getMessage(),
571-
'code' => $e->getCode(),
572-
'file' => $e->getFile(),
573-
// 'trace' => $e->getTrace(),
574-
'traceAsString' => $e->getTraceAsString(),
575-
// 'previous' => $e->getPrevious(),
576-
]);
577568
$error = json_decode($e->getMessage(), true);
578-
if (empty($error) && json_last_error() !== JSON_ERROR_NONE) {
579-
$error['message'] = $e->getMessage();
580-
}
581-
582569
//Remove line breaks and replace with space
583570
$error['message'] = trim(preg_replace('/\s+/', ' ', $error['message']));
584571
// remove trace and type, will only be present if server is in dev mode

dev/tests/api-functional/testsuite/Magento/Webapi/Routing/CoreRoutingTest.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,7 @@ public function testRequestParamsUnexpectedValueException(): void
116116
$exceptionResult = $this->processRestExceptionResult($e);
117117
$actualMessage = $exceptionResult['message'];
118118
$this->assertStringNotContainsString($unexpectedMessage, $actualMessage);
119-
$this->assertStringContainsString('getMessage', $e->getMessage());
120-
$this->assertStringContainsString('getCode', $e->getCode());
121-
$this->assertStringContainsString('getTraceAsString', $e->getTraceAsString());
122-
$this->assertStringContainsString('getFile', $e->getFile());
123-
$this->assertStringContainsString('line', $e->getLine());
124-
$this->assertArrayHasKey('getTrace', $e->getTrace());
119+
$this->assertStringContainsString($expectedMessage, $actualMessage);
125120
}
126121
}
127122
}

lib/internal/Magento/Framework/App/Bootstrap.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,6 @@ public function isDeveloperMode()
429429
*/
430430
protected function terminate(\Throwable $e)
431431
{
432-
echo "ramamba";
433-
var_dump($e);
434432
/** @var Response $response */
435433
$response = $this->objectManager->get(Response::class);
436434
$response->clearHeaders();

lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ public function process($serviceClassName, $serviceMethodName, array $inputArray
195195
{
196196
$inputData = [];
197197
$inputError = [];
198+
$this->inputArraySizeLimitValue->set($inputArraySizeLimit);
198199

199200
foreach ($this->methodsMap->getMethodParams($serviceClassName, $serviceMethodName) as $param) {
200201
$paramName = $param[MethodsMap::METHOD_META_NAME];
@@ -217,7 +218,6 @@ public function process($serviceClassName, $serviceMethodName, array $inputArray
217218
}
218219

219220
$this->processInputError($inputError);
220-
$this->inputArraySizeLimitValue->set($inputArraySizeLimit);
221221

222222
return $inputData;
223223
}

0 commit comments

Comments
 (0)