assemblyline-v4-service 4.4.0.83__py3-none-any.whl → 4.4.0.85__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.0.83
+4.4.0.85

assemblyline_v4_service/updater/updater.py

@@ -332,7 +332,11 @@ class ServiceUpdater(ThreadedCoreBase):
             self.log.info(f"Connecting to Assemblyline API: {UI_SERVER}")
             al_client = get_client(UI_SERVER, apikey=(username, api_key), verify=self.verify, datastore=self.datastore)
 
-            _, time_keeper = tempfile.mkstemp(prefix="time_keeper_", dir=UPDATER_DIR)
+            # Create a temporary file for the time keeper
+            time_keeper = tempfile.NamedTemporaryFile(prefix="time_keeper_", dir=UPDATER_DIR, delete=False)
+            time_keeper.close()
+            time_keeper = time_keeper.name
+
             if self._service.update_config.generates_signatures:
                 output_directory = tempfile.mkdtemp(prefix="update_dir_", dir=UPDATER_DIR)
 
@@ -573,7 +577,10 @@ class ServiceUpdater(ThreadedCoreBase):
 
         try:
             # Tar update directory
-            _, new_tar = tempfile.mkstemp(prefix="signatures_", dir=UPDATER_DIR, suffix='.tar.bz2')
+            new_tar = tempfile.NamedTemporaryFile(prefix="signatures_", dir=UPDATER_DIR, suffix='.tar.bz2',
+                                                  delete=False)
+            new_tar.close()
+            new_tar = new_tar.name
             tar_handle = tarfile.open(new_tar, 'w:bz2')
             tar_handle.add(new_directory, '/')
             tar_handle.close()

{assemblyline_v4_service-4.4.0.83.dist-info → assemblyline_v4_service-4.4.0.85.dist-info}/METADATA

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

{assemblyline_v4_service-4.4.0.83.dist-info → assemblyline_v4_service-4.4.0.85.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=L576K9Dd0W9W_CaQPkWWU3gFRtGAmohsYwR_R6MKlZE,9
+assemblyline_v4_service/VERSION,sha256=E62WJh-BgKQVL_CFYgZsacBT3n6mvzF9Sja0WNjS2ns,9
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=3QGBg0EZuXC6UN411HFwpLNEop9UvS9feFhvBUTP-k4,1576
 assemblyline_v4_service/run_privileged_service.py,sha256=qd4DmHo5G_Tpv8tb0A96qNfCGuXBu5MlIKB205z5e5w,14514
@@ -21,7 +21,7 @@ assemblyline_v4_service/updater/app.py,sha256=Mtmx4bkXfP4nFqqa5q15jW8QIXr4JK84lC
 assemblyline_v4_service/updater/client.py,sha256=VKmkiDz3klvMzXiGSQTH7QN-MfHuJnwaIR7BaXy9aZM,5156
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=HbH5p6UTdHyIgoctF1c1pQkoqTtzaxfHOi9KXGwn0eM,9435
-assemblyline_v4_service/updater/updater.py,sha256=UDqkKF4tQQbBF13fhCQzfJcmlNhYS5iI23odbpKpofE,32131
+assemblyline_v4_service/updater/updater.py,sha256=drpGkDFm_epjzwU8gUd43WuFSuRxgj1qWzAt6JkhIGQ,32422
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/test_healthz.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 test/test_run_privileged_service.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
@@ -31,13 +31,13 @@ test/test_common/test_api.py,sha256=rh0-0CwqLtpRfKlcUFT-T2xgmBe7nP9fCZ0jpzufKek,
 test/test_common/test_base.py,sha256=3B35CTxumj1jI-Yap17aWuoruWp0DYwUwnPl-hxrpkA,13143
 test/test_common/test_helper.py,sha256=4r5S4W7EXUx4ldq7LZny0j3oohpnskya9pjMhrWBHD4,2388
 test/test_common/test_ocr.py,sha256=s5kL0vKjLmbyXuCg-9v6V6wQwwFRu0w2hYpjG0_BXy4,1874
-test/test_common/test_ontology_helper.py,sha256=snkj61_iPzU0cE1dzJounZikkG2LY-GQrDgyqYqA5Hs,7784
+test/test_common/test_ontology_helper.py,sha256=TuvTeP9BTRqklOlsLu_yMdN9wdPWlVAENx2JqUe9a-A,7856
 test/test_common/test_request.py,sha256=K-gaHe20AUztfU3pLdWYv5bc6088GBBKP-eb833cis0,11729
 test/test_common/test_result.py,sha256=Wm0Cs5kZRzlZr0jL-l8OTsYAvkoN2eaB3NkeXzvyssI,42208
 test/test_common/test_task.py,sha256=RWsGEN0L-xKoRAsGv2x4JZcSAySS9aBF4dwL9t7tepo,18668
 test/test_common/test_utils.py,sha256=TbnBxqpS_ZC5ptXR9XJX3xtbItD0mTbtiBxxdyP8J5k,5904
-assemblyline_v4_service-4.4.0.83.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.0.83.dist-info/METADATA,sha256=ArE5nY8WFW5IhdYpaUFKWqCYvYYAwplca_5TebcfPSs,9659
-assemblyline_v4_service-4.4.0.83.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-assemblyline_v4_service-4.4.0.83.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.4.0.83.dist-info/RECORD,,
+assemblyline_v4_service-4.4.0.85.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.0.85.dist-info/METADATA,sha256=q9xUn6yMZJRlUFnX9ivnmaRDfZnlUuVaBYVHej8qH2w,9659
+assemblyline_v4_service-4.4.0.85.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+assemblyline_v4_service-4.4.0.85.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.4.0.85.dist-info/RECORD,,

test/test_common/test_ontology_helper.py

@@ -7,6 +7,7 @@ import pytest
 from assemblyline_v4_service.common.ontology_helper import *
 from assemblyline_v4_service.common.result import ResultSection
 
+from assemblyline.odm.models.ontology.ontology import ODM_VERSION
 from assemblyline.odm.models.ontology.filetypes import PE
 from assemblyline.odm.models.ontology.results import Antivirus
 
@@ -218,7 +219,7 @@ def test_attach_ontology(dummy_request_class):
                 'size': 123,
                 'type': None},
         'odm_type': 'Assemblyline Result Ontology',
-        'odm_version': '1.5',
+        'odm_version': ODM_VERSION,
         'results': {'heuristics': [],
                     'tags': {'network.static.domain': ['blah.com']}},
         'service': {'name': 'blah',