Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Check that data are not array before base64 decoding

Browse Source 
[MAILPOET-3699]
This commit is contained in:
Jan Lysý
2021-08-16 14:57:25 +02:00
committed by Veljko V
parent d2570001db
commit 79a2d1f934
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Router/Router.php
View File

@@ -63,7 +63,7 @@ class Router {
} }
public static function decodeRequestData($data) { public static function decodeRequestData($data) {
$data = json_decode(base64_decode($data), true); $data = !is_array($data) ? json_decode(base64_decode($data), true) : [];
if (!is_array($data)) { if (!is_array($data)) {
$data = []; $data = [];
} }

2
tests/integration/Router/RouterTest.php
View File

@@ -253,6 +253,8 @@ class RouterTest extends \MailPoetTest {
public function testItCanConvertInvalidRequestDataToArray() { public function testItCanConvertInvalidRequestDataToArray() {
$result = Router::decodeRequestData('some_invalid_data'); $result = Router::decodeRequestData('some_invalid_data');
expect($result)->equals([]); expect($result)->equals([]);
$result = Router::decodeRequestData(['key' => 'some_invalid_data']);
expect($result)->equals([]);
} }
public function testItCanBuildRequest() { public function testItCanBuildRequest() {