Merge pull request #9635 from JakubOnderka/error-handling-sighting

chg: [internal] Better error handling when fetching sightings
MISP · Mar 23, 2024 · 0a77e3c · 0a77e3c
2 parents fbaff5d + 646c580
commit 0a77e3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/Lib/Tools/HttpSocketExtended.php b/app/Lib/Tools/HttpSocketExtended.php
@@ -114,6 +114,10 @@ public function parseResponse($message)
      */
     public function json()
     {
+        if (strlen($this->body) === 0) {
+            throw new HttpSocketJsonException('Could not parse empty response as JSON.', $this);
+        }
+
         try {
             return JsonTool::decode($this->body);
         } catch (Exception $e) {

diff --git a/app/Model/Sighting.php b/app/Model/Sighting.php
@@ -1445,7 +1445,7 @@ private function pullSightingNewWay(array $user, array $eventUuids, ServerSyncTo
             try {
                 $sightings = $serverSync->fetchSightingsForEvents($chunk);
             } catch (Exception $e) {
-                $this->logException("Failed to download sightings from {$serverSync->server()['Server']['name']}.", $e);
+                $this->logException("Failed to download sightings from remote server {$serverSync->server()['Server']['name']}.", $e);
                 continue;
             }