assemblyline-v4-service 4.5.1.dev197__py3-none-any.whl → 4.5.1.dev200__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.5.1.dev197
+4.5.1.dev200

assemblyline_v4_service/common/task.py

@@ -9,6 +9,7 @@ from assemblyline_v4_service.common.helper import get_service_manifest
 from assemblyline_v4_service.common.result import Result
 
 from assemblyline.common import forge
+from assemblyline.common.constants import MAX_INT
 from assemblyline.common import log as al_log
 from assemblyline.common.classification import Classification
 from assemblyline.common.digests import get_digests_for_file, get_sha256_for_file
@@ -97,10 +98,17 @@ class Task:
             self.log.info(f"Adding empty extracted or supplementary files is not allowed. "
                           f"Empty file ({name}) was ignored.")
             return
+        elif os.path.getsize(path) > MAX_INT:
+            self.log.error(f"Adding file of size {os.path.getsize(path)} is impossible due to ElasticSearch "
+                           f"limitations. File ({name}) was ignored.")
+            return
 
         if parent_relation not in PARENT_RELATION.keys():
             raise ValueError(
-                f"An invalid 'parent_relation' was provided: '{parent_relation}'. Possible values are: '{PARENT_RELATION.keys()}'"
+                (
+                    f"An invalid 'parent_relation' was provided: '{parent_relation}'. "
+                    f"Possible values are: '{PARENT_RELATION.keys()}'"
+                )
             )
 
         # If file classification not provided, then use the default result classification
@@ -130,7 +138,7 @@ class Task:
         # Allows the administrator to be selective about the types of hashes to lookup in the safelist
         if safelist_interface and self.safelist_config.enabled and not (self.deep_scan or self.ignore_filtering):
             # Ignore adding files that are known to the system to be safe
-            digests = get_digests_for_file(path, skip_fuzzy_hashes=True)
+            digests = get_digests_for_file(path, calculate_entropy=False, skip_fuzzy_hashes=True)
             for hash_type in self.safelist_config.hash_types:
                 qhash = digests[hash_type]
                 resp = safelist_interface.lookup_safelist(qhash)

assemblyline_v4_service/dev/run_service_once.py

@@ -55,7 +55,7 @@ class RunService:
         self.service.start_service()
 
         # Identify the file
-        file_info = self.identify.fileinfo(FILE_PATH, skip_fuzzy_hashes=True)
+        file_info = self.identify.fileinfo(FILE_PATH, skip_fuzzy_hashes=True, calculate_entropy=False)
         if file_info['type'] == "archive/cart" or file_info['magic'] == "custom: archive/cart":
             original_file_name = get_metadata_only(FILE_PATH).get("name")
             if original_file_name:
@@ -66,7 +66,7 @@ class RunService:
             with open(FILE_PATH, 'rb') as ifile, open(original_temp, 'wb') as ofile:
                 unpack_stream(ifile, ofile)
 
-            file_info = self.identify.fileinfo(original_temp, skip_fuzzy_hashes=True)
+            file_info = self.identify.fileinfo(original_temp, skip_fuzzy_hashes=True, calculate_entropy=False)
             target_file = os.path.join(tempfile.gettempdir(), file_info['sha256'])
             shutil.move(original_temp, target_file)
             LOG.info(f"File was a CaRT archive, it was un-CaRTed to {target_file} for processing")

{assemblyline_v4_service-4.5.1.dev197.dist-info → assemblyline_v4_service-4.5.1.dev200.dist-info}/METADATA

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

{assemblyline_v4_service-4.5.1.dev197.dist-info → assemblyline_v4_service-4.5.1.dev200.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=XEL-E_x3Nyc6iq9g1cFvvY7AbT5gJP5KNLEc3HJImkM,13
+assemblyline_v4_service/VERSION,sha256=lp_sJZFLCyVtwCxS-07bW_XrOZIReLh64tfzgNLGIuc,13
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=sS1cFkDLw8hUPMpj7tbHXFv8ZmHcazrwZ0l6oQDwwkQ,1575
 assemblyline_v4_service/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,10 +12,10 @@ assemblyline_v4_service/common/ocr.py,sha256=3fV0PyY3oui_ucAM9dkolP0VRYKACKJuGY4
 assemblyline_v4_service/common/ontology_helper.py,sha256=QpwerYoS5hXjWzpx3Pmwv6j2330PQVYqxYGamjcpW3I,7890
 assemblyline_v4_service/common/request.py,sha256=W7fqC2xQE3i5i2jlCDyUDp3ZqJQQqSshNW0mQfJMkFg,11792
 assemblyline_v4_service/common/result.py,sha256=9AqM6qCYiia_Bpyn_fBFhzNQMcqJbtFSiGjp57fXW2E,32713
-assemblyline_v4_service/common/task.py,sha256=OIE_V-xyGq9vvuT-U_3DIoGdlY3F4oWV9WIc_jhWXsA,13848
+assemblyline_v4_service/common/task.py,sha256=dJsvRpW0x88CCF_LW6w87jQ_UKTVaOs2Gb117IDNiU8,14233
 assemblyline_v4_service/common/utils.py,sha256=k2__d-V5LjB6o2IKbjVe7tJWKcKuUHto5TyT5oKhIa0,3890
 assemblyline_v4_service/dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-assemblyline_v4_service/dev/run_service_once.py,sha256=4K3ljw0MnfPGw0-6lzc_vtUYg1EbntJbbsWvNU-ZM_A,10456
+assemblyline_v4_service/dev/run_service_once.py,sha256=iEWkLnF4cWN0V3Mc6GhMKjDAPYfY0YjESmtReTAJg88,10506
 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=Mtmx4bkXfP4nFqqa5q15jW8QIXr4JK84lCovxAVyvPs,3317
@@ -38,8 +38,8 @@ test/test_common/test_request.py,sha256=Ceyds8BNO1O0f1kH1VEb84faJcaupvSjVKIrGdHe
 test/test_common/test_result.py,sha256=6BiOKxEPrKBjOY44jv3TY-yiXm0qI1ok_CZBnjP9TM4,45447
 test/test_common/test_task.py,sha256=P44mNcSe-3tJgDk9ppN3KbM7oN4LBVIuhONG-Gveh74,19007
 test/test_common/test_utils.py,sha256=TbnBxqpS_ZC5ptXR9XJX3xtbItD0mTbtiBxxdyP8J5k,5904
-assemblyline_v4_service-4.5.1.dev197.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.5.1.dev197.dist-info/METADATA,sha256=EkfUQsaDPQ7TOtXh3gbheq3k4pWjsUFODykyqunqLSo,9499
-assemblyline_v4_service-4.5.1.dev197.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-assemblyline_v4_service-4.5.1.dev197.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.5.1.dev197.dist-info/RECORD,,
+assemblyline_v4_service-4.5.1.dev200.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.5.1.dev200.dist-info/METADATA,sha256=Jt2HMvuXExX3bqvSsHuDDDP9L_gD_BdqxUZH0OM7cb4,9499
+assemblyline_v4_service-4.5.1.dev200.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+assemblyline_v4_service-4.5.1.dev200.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.5.1.dev200.dist-info/RECORD,,