assemblyline-v4-service 4.4.1.dev251__py3-none-any.whl → 4.4.1.dev252__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.1.dev251
+4.4.1.dev252

assemblyline_v4_service/common/request.py

@@ -1,6 +1,6 @@
 import logging
 import tempfile
-from typing import Any, Dict, Optional, TextIO, Union
+from typing import Any, Dict, List, Optional, TextIO, Union
 
 from assemblyline.common import forge
 from assemblyline.common import log as al_log
@@ -24,17 +24,7 @@ class ServiceRequest:
         self.log = logging.getLogger(f'assemblyline.service.{task.service_name.lower()}')
 
         self._working_directory = task.working_directory
-        self.deep_scan = task.deep_scan
-        self.extracted = task.extracted
-        self.file_name = task.file_name
-        self.file_type = task.file_type
-        self.file_size = task.file_size
         self._file_path = None
-        self.max_extracted = task.max_extracted
-        self.md5 = task.md5
-        self.sha1 = task.sha1
-        self.sha256 = task.sha256
-        self.sid = task.sid
         self.task = task
 
     def add_extracted(self, path: str, name: str, description: str,
@@ -238,3 +228,43 @@ class ServiceRequest:
         :param data: Temporary submission data
         """
         self.task.temp_submission_data = data
+
+    @property
+    def deep_scan(self) -> bool:
+        return self.task.deep_scan
+
+    @property
+    def extracted(self) -> List[Dict[str, str]]:
+        return self.task.extracted
+
+    @property
+    def file_name(self) -> str:
+        return self.task.file_name
+
+    @property
+    def file_type(self) -> str:
+        return self.task.fileinfo.type
+
+    @property
+    def file_size(self) -> int:
+        return self.task.fileinfo.size
+
+    @property
+    def max_extracted(self) -> int:
+        return self.task.max_extracted
+
+    @property
+    def md5(self) -> str:
+        return self.task.fileinfo.md5
+
+    @property
+    def sha1(self) -> str:
+        return self.task.fileinfo.sha1
+
+    @property
+    def sha256(self) -> str:
+        return self.task.fileinfo.sha256
+
+    @property
+    def sid(self) -> str:
+        return self.task.sid

assemblyline_v4_service/common/task.py

@@ -49,14 +49,11 @@ class Task:
         self.error_type: str = 'EXCEPTION'
         self.extracted: List[Dict[str, str]] = []
         self.file_name = task.filename
-        self.file_type = task.fileinfo.type
-        self.file_size = task.fileinfo.size
+        self.fileinfo = task.fileinfo
         self.ignore_filtering = task.ignore_filtering
         self.min_classification = task.min_classification.value
         self.max_extracted = task.max_files
         self.metadata = task.metadata
-        self.md5: str = task.fileinfo.md5
-        self.mime: str = task.fileinfo.mime or None
         self.result: Optional[Result] = None
         self.safelist_config: Dict[str, Any] = task.safelist_config
         self.service_config: Dict[str, Any] = dict(task.service_config)
@@ -66,15 +63,12 @@ class Task:
         self.service_name: str = task.service_name
         self.service_tool_version: Optional[str] = None
         self.service_version: Optional[str] = None
-        self.sha1: str = task.fileinfo.sha1
-        self.sha256: str = task.fileinfo.sha256
         self.sid: str = task.sid
         self.supplementary: List[Dict[str, str]] = []
         self.tags = tags
         self.temp_submission_data: Dict[str, Any] = {
             row.name: row.value for row in task.temporary_submission_data
         }
-        self.type: str = task.fileinfo.type
 
     def _add_file(self, path: str, name: str, description: str,
                   classification: Optional[Classification] = None,
@@ -303,3 +297,32 @@ class Task:
         if self._working_directory is None:
             self._working_directory = tempfile.mkdtemp(dir=temp_dir)
         return self._working_directory
+
+    @property
+    def file_type(self) -> str:
+        return self.fileinfo.type
+
+    @property
+    def file_size(self) -> int:
+        return self.fileinfo.size
+
+    @property
+    def md5(self) -> str:
+        return self.fileinfo.md5
+
+    @property
+    def mime(self) -> str:
+        return self.fileinfo.mime or None
+
+    @property
+    def sha1(self) -> str:
+        return self.fileinfo.sha1
+
+    @property
+    def sha256(self) -> str:
+        return self.fileinfo.sha256
+
+    # Duplicate of file_type for backward compatibility
+    @property
+    def type(self) -> str:
+        return self.fileinfo.type

assemblyline_v4_service/dev/run_service_once.py

@@ -83,21 +83,16 @@ class RunService:
                 k, v = kv.split("=", 1)
                 self.submission_params[k] = v
 
+        file_info.pop("ascii", None)
+        file_info.pop("hex", None)
+        file_info.pop("entropy", None)
         # Create service processing task
         service_task = ServiceTask(dict(
             sid=get_random_id(),
             metadata={},
             service_name=SERVICE_NAME,
             service_config=self.submission_params,
-            fileinfo=dict(
-                magic=file_info['magic'],
-                md5=file_info['md5'],
-                mime=file_info['mime'],
-                sha1=file_info['sha1'],
-                sha256=file_info['sha256'],
-                size=file_info['size'],
-                type=file_info['type'],
-            ),
+            fileinfo=file_info,
             filename=file_name,
             min_classification=forge.get_classification().UNRESTRICTED,
             max_files=501,  # TODO: get the actual value

{assemblyline_v4_service-4.4.1.dev251.dist-info → assemblyline_v4_service-4.4.1.dev252.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-v4-service
-Version: 4.4.1.dev251
+Version: 4.4.1.dev252
 Summary: Assemblyline 4 - Service base
 Home-page: https://github.com/CybercentreCanada/assemblyline-v4-service/
 Author: CCCS Assemblyline development team

{assemblyline_v4_service-4.4.1.dev251.dist-info → assemblyline_v4_service-4.4.1.dev252.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=PiKFo_FsP4QuIdG359eTxdI1IQx5hhrtjjyDGw9OIvk,13
+assemblyline_v4_service/VERSION,sha256=mElaI4Kcy6QY1CHLGTrBwJ48omBL7-pn1l6FRhm5uLw,13
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=sS1cFkDLw8hUPMpj7tbHXFv8ZmHcazrwZ0l6oQDwwkQ,1575
 assemblyline_v4_service/run_privileged_service.py,sha256=9uTfHetXR5G-EDKMDrgfWUOw34yr64-cj6Cm9eZaCbQ,14547
@@ -9,12 +9,12 @@ assemblyline_v4_service/common/base.py,sha256=f0ocyMh59RwAoMbXlFMDgXChQMrFiO78j6
 assemblyline_v4_service/common/helper.py,sha256=xs9quuf-M1JOdKieBqOmWaOece0CtzXFhhe85xQYmuY,3289
 assemblyline_v4_service/common/ocr.py,sha256=gFPVAGVsmVk4SKL7hCMCT7NEyG-lFLniEFQup6WtCsc,4384
 assemblyline_v4_service/common/ontology_helper.py,sha256=Wao4VZ_YrlmLd3-CXwqsK6c5VTiVZ89CKEhZOgZrm0Q,7792
-assemblyline_v4_service/common/request.py,sha256=zgmKvYnK1KcBWsQQUZmeBXGIi-P5m3ltxqGY2Xo696c,9764
+assemblyline_v4_service/common/request.py,sha256=dXPLLuuToUtPaC6ZL5MPnJLImgKQiX583dMb6WC9TEU,10243
 assemblyline_v4_service/common/result.py,sha256=TMcjv4HXWlOvQTj5l50KT2PYE5oXGkDZM5ZWQRJU8ts,30768
-assemblyline_v4_service/common/task.py,sha256=22dl6FiQwqeL0CxkSzmHn9mKSL5xf9zE5QjxT-nDLs4,12504
+assemblyline_v4_service/common/task.py,sha256=br51tBE_ksWJVvoKtCBmvmdydIFp0zgxVBvdq_aRU68,12832
 assemblyline_v4_service/common/utils.py,sha256=71ndFdbdfCeRCM-eYs1htKqJ-1miiWbsF_UgHnKKNZ4,3112
 assemblyline_v4_service/dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-assemblyline_v4_service/dev/run_service_once.py,sha256=sGzdPSKbBcrabUlSwmMaWktixydaLZqrT3vRqsH3yjg,10641
+assemblyline_v4_service/dev/run_service_once.py,sha256=zNof2-rZQDPUAVbtUndfRTE1sVcoL9QMyJW4wzF34W8,10458
 assemblyline_v4_service/updater/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/updater/__main__.py,sha256=9Os-u8Tf7MD73JSrUSPmOaErTgfvesNLiEeszU4ujXA,133
 assemblyline_v4_service/updater/app.py,sha256=OF-G7J8IYwTjdGw_BI9numBicZBN5lspm8Eqb3qbIl8,3229
@@ -22,8 +22,8 @@ assemblyline_v4_service/updater/client.py,sha256=VKmkiDz3klvMzXiGSQTH7QN-MfHuJnw
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=CO0zY6R0gx36iOCSfZyCYCvUAUP76qQMqZ1z_HkZMME,9123
 assemblyline_v4_service/updater/updater.py,sha256=VB8jt5qg604HZyG6epHqGqG-7yPUCE5-i6uHOO2n72s,32045
-assemblyline_v4_service-4.4.1.dev251.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.1.dev251.dist-info/METADATA,sha256=GmvEttfrSKRz2uVsw6WJK2ISqSH2W3jMNHinrr2-RhA,9369
-assemblyline_v4_service-4.4.1.dev251.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-assemblyline_v4_service-4.4.1.dev251.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
-assemblyline_v4_service-4.4.1.dev251.dist-info/RECORD,,
+assemblyline_v4_service-4.4.1.dev252.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.1.dev252.dist-info/METADATA,sha256=e7OFFb5Nwh2czjCWYpvVTVf9ADCTmeeOAiuQBcbuQJg,9369
+assemblyline_v4_service-4.4.1.dev252.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+assemblyline_v4_service-4.4.1.dev252.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
+assemblyline_v4_service-4.4.1.dev252.dist-info/RECORD,,