- [x] Fix download failed caused by control characters

younginnovations · Nov 6, 2024 · fbafcdf · fbafcdf
1 parent 626b77b
commit fbafcdf
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 201,850 deletions.
diff --git a/app/Exports/ActivityExport.php b/app/Exports/ActivityExport.php
@@ -170,6 +170,8 @@ public function sheets(): array
 
         $sheets[] = new OptionExport('activity_instructions', 'Instructions');
 
+        sanitizeControlCharacters($data);
+
         foreach ($data as $key => $datum) {
             $sheets[] = new XlsExport(Arr::collapse($datum), $key, $xlsHeaders[$this->sheets[$key]], 'activity');
         }

diff --git a/app/Helpers/general.php b/app/Helpers/general.php
@@ -1380,3 +1380,23 @@ function trimStringValueInArray($array): array
         }, $array);
     }
 }
+
+if (!function_exists('sanitizeControlCharacters')) {
+    /**
+     * Remove all control characters (ASCII 0x00-0x1F and 0x7F).
+     *
+     * @param $data
+     *
+     * @return void
+     */
+    function sanitizeControlCharacters(&$data): void
+    {
+        if (is_string($data)) {
+            $data = preg_replace('/[\x00-\x1F\x7F]/u', '', $data);
+        } elseif (is_array($data)) {
+            foreach ($data as &$value) {
+                sanitizeControlCharacters($value);
+            }
+        }
+    }
+}
diff --git a/app/IATI/Elements/Xml/XmlGenerator.php b/app/IATI/Elements/Xml/XmlGenerator.php
@@ -473,6 +473,8 @@ public function getXml($activity, $transaction, $result, $settings, $organizatio
         $xmlData['iati-activity'] = $this->getXmlData($activity, $transaction, $result, $organization);
         $xmlData['iati-activity']['@attributes'] = $this->getXmlAttributes($defaultValues, $timestamp);
 
+        sanitizeControlCharacters($xmlData);
+
         return $this->arrayToXml->createXml('iati-activities', $xmlData);
     }
 

diff --git a/app/IATI/Services/Audit/AuditService.php b/app/IATI/Services/Audit/AuditService.php
@@ -182,6 +182,10 @@ public function getAuditableType(object|array|string|null $auditables): string|n
      */
     public function getNewValues($auditables, $auditableType, $event): bool | string
     {
+        if (!$auditables) {
+            return false;
+        }
+
         $auditables = $auditables->toArray();
 
         if ($auditableType === 'App\\IATI\\Models\\User\\User' && $event !== 'signin') {