From dc641e7920474cf9597b1cb815dfcd1b5ee26bab Mon Sep 17 00:00:00 2001 From: cccs-rs <62077998+cccs-rs@users.noreply.github.com> Date: Tue, 25 Feb 2025 11:41:28 -0500 Subject: [PATCH 1/2] Update helper.py --- assemblyline_v4_service/updater/helper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assemblyline_v4_service/updater/helper.py b/assemblyline_v4_service/updater/helper.py index b99e511b..1022008d 100644 --- a/assemblyline_v4_service/updater/helper.py +++ b/assemblyline_v4_service/updater/helper.py @@ -138,8 +138,8 @@ def url_download(source: Dict[str, Any], previous_update: int, logger: Logger, o if fetch_method == 'get': response = session.get(uri, auth=auth, headers=headers, proxies=proxies, stream=True) elif fetch_method == 'post': - json = source.get('post_data') or None - response = session.post(uri, auth=auth, headers=headers, proxies=proxies, json=json, stream=True) + data = source.get('post_data') or None + response = session.post(uri, auth=auth, headers=headers, proxies=proxies, data=data, stream=True) else: raise ValueError(f"Unknown fetch method: {fetch_method}") From 94dbe96ac2a1a0a32d24e038ddd5661c3b04eac4 Mon Sep 17 00:00:00 2001 From: cccs-rs <62077998+cccs-rs@users.noreply.github.com> Date: Sat, 8 Mar 2025 01:38:26 +0000 Subject: [PATCH 2/2] Update to new field name --- assemblyline_v4_service/updater/helper.py | 5 ++--- test/test_updater/test_helper.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/assemblyline_v4_service/updater/helper.py b/assemblyline_v4_service/updater/helper.py index 1022008d..74376294 100644 --- a/assemblyline_v4_service/updater/helper.py +++ b/assemblyline_v4_service/updater/helper.py @@ -11,12 +11,12 @@ import psutil import regex as re import requests -from assemblyline_v4_service.common.utils import DEVELOPMENT_MODE from git import Repo from assemblyline.common.digests import get_sha256_for_file from assemblyline.common.identify import Identify from assemblyline.common.isotime import iso_to_epoch +from assemblyline_v4_service.common.utils import DEVELOPMENT_MODE BLOCK_SIZE = 64 * 1024 GIT_ALLOW_UNSAFE_PROTOCOLS = os.environ.get('GIT_ALLOW_UNSAFE_PROTOCOLS', 'false').lower() == 'true' @@ -138,8 +138,7 @@ def url_download(source: Dict[str, Any], previous_update: int, logger: Logger, o if fetch_method == 'get': response = session.get(uri, auth=auth, headers=headers, proxies=proxies, stream=True) elif fetch_method == 'post': - data = source.get('post_data') or None - response = session.post(uri, auth=auth, headers=headers, proxies=proxies, data=data, stream=True) + response = session.post(uri, auth=auth, headers=headers, proxies=proxies, data=source.get('data'),stream=True) else: raise ValueError(f"Unknown fetch method: {fetch_method}") diff --git a/test/test_updater/test_helper.py b/test/test_updater/test_helper.py index 3261fb73..a3bb18e5 100644 --- a/test/test_updater/test_helper.py +++ b/test/test_updater/test_helper.py @@ -1,6 +1,6 @@ import os from logging import getLogger -from unittest import mock + import pytest import requests_mock from assemblyline_v4_service.updater.helper import * @@ -90,7 +90,7 @@ def test_url_download(): assert url_download({"name": "blah", "uri": HTML_FILE_REQUEST}, 0, log, DIRECTORY) == INDEX assert url_download({"name": "blah", "uri": HTML_FILE_REQUEST, "fetch_method": "get"}, 0, log, DIRECTORY) == INDEX assert url_download({"name": "blah", "uri": HTML_FILE_REQUEST, "fetch_method": "post", - "post_data": {"api-key": "123456"}}, 0, log, DIRECTORY) == INDEX + "data": {"api-key": "123456"}}, 0, log, DIRECTORY) == INDEX os.remove(INDEX)