assemblyline-service-client 4.6.1.dev120__py3-none-any.whl → 4.6.1.dev236__py3-none-any.whl

assemblyline_service_client/VERSION

@@ -1 +1 @@
-4.6.1.dev120
+4.6.1.dev236

assemblyline_service_client/task_handler.py

@@ -1,7 +1,7 @@
 import copy
 import json
-import logging
 import os
+import re
 import select
 import shutil
 import signal
@@ -12,11 +12,13 @@ from typing import Any, Optional
 
 import requests
 import yaml
+from assemblyline_core.server_base import ServerBase
+
 from assemblyline.common.digests import get_sha256_for_file
 from assemblyline.common.str_utils import StringTable
+from assemblyline.odm import SHA256_REGEX as SHA256_REGEX_PATTERN
 from assemblyline.odm.messages.task import Task as ServiceTask
 from assemblyline.odm.models.service import Service
-from assemblyline_core.server_base import ServerBase
 
 STATUSES = StringTable('STATUSES', [
     ('INITIALIZING', 0),
@@ -36,7 +38,7 @@ SUPPORTED_API = 'v1'
 DEFAULT_REQUEST_TIMEOUT = int(os.environ.get("SERVICE_CLIENT_DEFAULT_REQUEST_TIMEOUT", 180))
 TASK_REQUEST_TIMEOUT = int(os.environ.get('TASK_REQUEST_TIMEOUT', 30))
 FILE_REQUEST_TIMEOUT = int(os.environ.get('FILE_REQUEST_TIMEOUT', 180))
-
+SHA256_REGEX = re.compile(SHA256_REGEX_PATTERN)
 
 # The number of tasks a service will complete before stopping, letting the environment start a new container.
 # By default there is no limit, but this lets the orchestration environment set one
@@ -365,6 +367,12 @@ class TaskHandler(ServerBase):
         return task
 
     def download_file(self, sha256, sid) -> Optional[str]:
+        if not SHA256_REGEX.match(sha256):
+            # If the SHA256 is not valid, we cannot download the file
+            self.log.error(f"[{sid}] Invalid SHA256 provided: {sha256}")
+            self.status = STATUSES.ERROR_FOUND
+            return None
+
         self.status = STATUSES.DOWNLOADING_FILE
         received_file_sha256 = ''
         file_path = None

{assemblyline_service_client-4.6.1.dev120.dist-info → assemblyline_service_client-4.6.1.dev236.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-service-client
-Version: 4.6.1.dev120
+Version: 4.6.1.dev236
 Summary: Assemblyline 4 - Service client
 Home-page: https://github.com/CybercentreCanada/assemblyline-service-client/
 Author: CCCS Assemblyline development team

assemblyline_service_client-4.6.1.dev236.dist-info/RECORD

@@ -0,0 +1,8 @@
+assemblyline_service_client/VERSION,sha256=sxfL1RVB0eREtA0ANqB7bBr3JRdbLOhg2iPaqVnV_ys,13
+assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+assemblyline_service_client/task_handler.py,sha256=sOtpuo0jlnDRQBex50ZesXgNwaVfK1pigV208Bo0jKU,23914
+assemblyline_service_client-4.6.1.dev236.dist-info/licenses/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_service_client-4.6.1.dev236.dist-info/METADATA,sha256=_Dywcm0bc1SqYlGOhaDzdU39k60ttnS9sRITJyguX6E,1677
+assemblyline_service_client-4.6.1.dev236.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+assemblyline_service_client-4.6.1.dev236.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
+assemblyline_service_client-4.6.1.dev236.dist-info/RECORD,,

assemblyline_service_client-4.6.1.dev120.dist-info/RECORD

@@ -1,8 +0,0 @@
-assemblyline_service_client/VERSION,sha256=AqCHZgZTkS8o8NeSJADCV-yamCUfON65KWCSQxfTdC8,13
-assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-assemblyline_service_client/task_handler.py,sha256=XB2vSF-Zmff0veX6JOFqVPex7pNkxsZCNuhtY3LvRcM,23547
-assemblyline_service_client-4.6.1.dev120.dist-info/licenses/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_service_client-4.6.1.dev120.dist-info/METADATA,sha256=ztO61pOfdhC9eXfKaFyKQV0TMT_pSoIoSiUo52RAUws,1677
-assemblyline_service_client-4.6.1.dev120.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-assemblyline_service_client-4.6.1.dev120.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
-assemblyline_service_client-4.6.1.dev120.dist-info/RECORD,,