Merge pull request #1393 from PrestaShopCorp/fix/PAYSHIP-3576-v4-PS8

Release v8.4.4.1

Author: Matt75

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>ps_checkout</name>
 	<displayName><![CDATA[PrestaShop Checkout]]></displayName>
-	<version><![CDATA[8.4.4.0]]></version>
+	<version><![CDATA[8.4.4.1]]></version>
 	<description><![CDATA[Provide the most commonly used payment methods to your customers in this all-in-one module, and manage all your sales in a centralized interface.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[payments_gateways]]></tab>

config/admin/services.yml

@@ -12,3 +12,7 @@ services:
   PrestaShop\Module\PrestashopCheckout\Logger\LoggerFileReader:
     class: 'PrestaShop\Module\PrestashopCheckout\Logger\LoggerFileReader'
     public: true
+    arguments:
+      - '@PrestaShop\Module\PrestashopCheckout\Logger\LoggerDirectory'
+      - '@PrestaShop\Module\PrestashopCheckout\Logger\LoggerFileFinder'
+      - '@PrestaShop\Module\PrestashopCheckout\Adapter\ValidateAdapter'

config/common.yml

@@ -500,3 +500,7 @@ services:
     arguments:
       - '@PrestaShop\Module\PrestashopCheckout\System\SystemConfiguration'
       - '@PrestaShop\Module\PrestashopCheckout\PayPal\PayPalConfiguration'
+
+  PrestaShop\Module\PrestashopCheckout\Adapter\ValidateAdapter:
+    class: 'PrestaShop\Module\PrestashopCheckout\Adapter\ValidateAdapter'
+    public: true

controllers/admin/AdminAjaxPrestashopCheckoutController.php

@@ -708,53 +708,47 @@ public function ajaxProcessGetLogFiles()
      */
     public function ajaxProcessGetLogs()
     {
-        header('Content-type: application/json');
-
         $filename = Tools::getValue('file');
         $offset = (int) Tools::getValue('offset');
         $limit = (int) Tools::getValue('limit');
 
-        if (empty($filename) || false === Validate::isFileName($filename)) {
-            http_response_code(400);
-            $this->ajaxDie(json_encode([
-                'status' => false,
-                'errors' => [
-                    'Filename is invalid.',
-                ],
-            ]));
-        }
-
-        /** @var LoggerDirectory $loggerDirectory */
-        $loggerDirectory = $this->module->getService(LoggerDirectory::class);
         /** @var LoggerFileReader $loggerFileReader */
         $loggerFileReader = $this->module->getService(LoggerFileReader::class);
         $fileData = [];
 
         try {
             $fileData = $loggerFileReader->read(
-                new SplFileObject($loggerDirectory->getPath() . $filename),
+                $filename,
                 $offset,
                 $limit
             );
+        } catch (InvalidArgumentException $exception) {
+            $this->exitWithResponse([
+                'status' => false,
+                'httpCode' => 400,
+                'errors' => [
+                    $exception->getMessage(),
+                ],
+            ]);
         } catch (Exception $exception) {
-            http_response_code(500);
-            $this->ajaxDie(json_encode([
+            $this->exitWithResponse([
                 'status' => false,
+                'httpCode' => 500,
                 'errors' => [
                     $exception->getMessage(),
                 ],
-            ]));
+            ]);
         }
 
-        $this->ajaxDie(json_encode([
+        $this->exitWithResponse([
             'status' => true,
             'file' => $fileData['filename'],
             'offset' => $fileData['offset'],
             'limit' => $fileData['limit'],
             'currentOffset' => $fileData['currentOffset'],
             'eof' => (int) $fileData['eof'],
             'lines' => $fileData['lines'],
-        ]));
+        ]);
     }
 
     /**
@@ -1038,12 +1032,16 @@ public function ajaxProcessDownloadLogs()
     {
         $filename = Tools::getValue('file');
 
-        if (empty($filename) || false === Validate::isFileName($filename)) {
+        try {
+            /** @var LoggerFileReader $loggerFileReader */
+            $loggerFileReader = $this->module->getService(LoggerFileReader::class);
+            $loggerFileReader->validateFilename($filename);
+        } catch (InvalidArgumentException $exception) {
             $this->exitWithResponse([
                 'status' => false,
                 'httpCode' => 400,
                 'errors' => [
-                    'Filename is invalid.',
+                    $exception->getMessage(),
                 ],
             ]);
         }