From 502682ee513380bd294dbb62d3ca7be33044621e Mon Sep 17 00:00:00 2001 From: Sami Mokaddem Date: Thu, 15 Feb 2024 15:21:00 +0100 Subject: [PATCH] fix: [analyst-data:pull] Return early if there is nothing to pull --- app/Model/AnalystData.php | 3 +++ tests/testlive_sync.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Model/AnalystData.php b/app/Model/AnalystData.php index 427151129..3102cdb59 100644 --- a/app/Model/AnalystData.php +++ b/app/Model/AnalystData.php @@ -907,6 +907,9 @@ class AnalystData extends AppModel } $allRemoteUUIDs = []; + if (empty($remoteData)) { + return 0; + } foreach (self::ANALYST_DATA_TYPES as $type) { $allRemoteUUIDs = array_merge($allRemoteUUIDs, array_keys($remoteData[$type])); } diff --git a/tests/testlive_sync.py b/tests/testlive_sync.py index 536e734c8..24fd4c5b2 100644 --- a/tests/testlive_sync.py +++ b/tests/testlive_sync.py @@ -87,7 +87,6 @@ assert event_preview["Event"]["uuid"] == event.uuid url = f'servers/pull/{remote_server["id"]}/disable_background_processing:1' pull_response = pymisp._check_response(pymisp._prepare_request('GET', url)) check_response(pull_response) -print(pull_response) assert "Pull completed. 0 events pulled, 0 events could not be pulled, 0 proposals pulled, 0 sightings pulled, 0 clusters pulled, 0 analyst data pulled." == pull_response["message"], pull_response["message"] # Test pull background