Merge branch 'refs/heads/1.9' into 1.x

pimcore · Aug 27, 2024 · aa4b735 · aa4b735
2 parents 651bfff + a9d3d48
commit aa4b735
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/src/Controller/ConfigDataObjectController.php b/src/Controller/ConfigDataObjectController.php
@@ -122,8 +122,14 @@ protected function loadAvailableColumnHeaders(
             try {
                 $interpreter = $interpreterFactory->loadInterpreter($configName, $config['interpreterConfig'], $config['processingConfig']);
                 $dataPreview = $interpreter->previewData($previewFilePath);
+                $columnHeaders = $dataPreview->getDataColumnHeaders();
 
-                return $dataPreview->getDataColumnHeaders();
+                // Validate if the column headers are valid JSON. Otherwise take care of the preview file to be deleted.
+                if (!$this->isValidJson($columnHeaders)) {
+                    throw new \Exception('Invalid column headers.');
+                }
+
+                return $columnHeaders;
             } catch (Exception $e) {
                 Logger::warning($e);
             }
@@ -132,6 +138,13 @@ protected function loadAvailableColumnHeaders(
         return [];
     }
 
+    protected function isValidJson(array $array): bool
+    {
+        json_encode($array);
+
+        return json_last_error() === \JSON_ERROR_NONE;
+    }
+
     /**
      * @Route("/get")
      *
@@ -287,6 +300,7 @@ public function loadDataPreviewAction(
         $hasData = false;
         $errorMessage = '';
         $previewFilePath = $this->previewService->getLocalPreviewFile($configName, $this->getPimcoreUser());
+        $dataPreviewData = [];
         if (is_file($previewFilePath)) {
             $config = $configurationPreparationService->prepareConfiguration($configName, $currentConfig);
 
@@ -304,6 +318,13 @@ public function loadDataPreviewAction(
                 if ($interpreter->fileValid($previewFilePath)) {
                     $dataPreview = $interpreter->previewData($previewFilePath, $recordNumber, $mappedColumns);
                     $hasData = true;
+
+                    $preview = $dataPreview->getDataPreview();
+                    if (!$this->isValidJson($preview)) {
+                        unlink($previewFilePath);
+                        throw new \Exception('Invalid data preview. Deleted preview data.');
+                    }
+                    $dataPreviewData = $preview;
                 } else {
                     $errorMessage = $translator->trans('plugin_pimcore_datahub_data_importer_configpanel_preview_error_invalid_file', [], 'admin');
                 }
@@ -314,7 +335,7 @@ public function loadDataPreviewAction(
         }
 
         return new JsonResponse([
-            'dataPreview' => $dataPreview ? $dataPreview->getDataPreview() : [],
+            'dataPreview' => $dataPreviewData,
             'previewRecordIndex' => $dataPreview ? $dataPreview->getRecordNumber() : 0,
             'hasData' => $hasData,
             'errorMessage' => $errorMessage