assemblyline-v4-service 4.4.1.dev110__py3-none-any.whl → 4.4.1.dev112__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.1.dev110
+4.4.1.dev112

assemblyline_v4_service/common/base.py

@@ -77,6 +77,7 @@ class ServiceBase:
         self.rules_directory: str = None
         self.rules_list: list = []
         self.update_time: int = None
+        self.update_hash: str = None
         self.update_check_time: float = 0.0
         self.rules_hash: str = None
 
@@ -257,7 +258,7 @@ class ServiceBase:
             resp = requests.get(url_base + 'status', verify=verify)
             resp.raise_for_status()
             status = resp.json()
-            if self.update_time is not None and self.update_time >= status['local_update_time']:
+            if self.update_time is not None and self.update_time >= status['local_update_time'] and self.update_hash == status['local_update_hash']:
                 self.log.info(f"There are no new signatures. ({self.update_time} >= {status['local_update_time']})")
                 return
             if status['download_available']:
@@ -286,6 +287,7 @@ class ServiceBase:
             tar_handle = tarfile.open(buffer_name)
             tar_handle.extractall(temp_directory)
             self.update_time = status['local_update_time']
+            self.update_hash = status['local_update_hash']
             self.rules_directory, temp_directory = temp_directory, self.rules_directory
             # Try to load the rules into the service before declaring we're using these rules moving forward
             temp_hash = self._gen_rules_hash()

assemblyline_v4_service/updater/app.py

@@ -27,6 +27,7 @@ if os.path.exists(AL_ROOT_CA):
 status_last_read_time = 0
 NO_STATUS = {
     'local_update_time': 0,
+    'local_update_hash': None,
     'download_available': False,
     '_directory': None,
     '_tar': None,

assemblyline_v4_service/updater/updater.py

@@ -13,6 +13,7 @@ import tarfile
 import threading
 import subprocess
 from contextlib import contextmanager
+from hashlib import sha256
 from passlib.hash import bcrypt
 from zipfile import ZipFile, BadZipFile
 
@@ -179,9 +180,13 @@ class ServiceUpdater(ThreadedCoreBase):
             return os.path.getctime(self._time_keeper)
         return 0
 
+    def get_local_update_hash(self) -> str:
+        return sha256(open(self._update_tar, "rb").read()).hexdigest()
+
     def status(self):
         return {
             'local_update_time': self.get_local_update_time(),
+            'local_update_hash': self.get_local_update_hash(),
             'download_available': self._update_dir is not None,
             '_directory': self._update_dir,
             '_tar': self._update_tar,

{assemblyline_v4_service-4.4.1.dev110.dist-info → assemblyline_v4_service-4.4.1.dev112.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-v4-service
-Version: 4.4.1.dev110
+Version: 4.4.1.dev112
 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.dev110.dist-info → assemblyline_v4_service-4.4.1.dev112.dist-info}/RECORD

@@ -1,11 +1,11 @@
-assemblyline_v4_service/VERSION,sha256=bLX5zY3FJUYEgITHchmPeRBbfWoC-OQ-hVlCjIF1J-8,13
+assemblyline_v4_service/VERSION,sha256=_cQ3j-rgfTwPOKVf3K3pzwhUhpykYwpAk02o-lfSp3w,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
 assemblyline_v4_service/run_service.py,sha256=RCqxdm-OAwJhl15BnKFkuavpQ5k6eTX3ZGeSna5JJBw,5557
 assemblyline_v4_service/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/common/api.py,sha256=QWh6qZcbtNRtSHQaWA5Q7oVFS0Kg7PIe6R9MKcoPr6M,4454
-assemblyline_v4_service/common/base.py,sha256=YIjKnp8ErMLt6l9j5cW-6S6HSa1_rckNdoiVKxON34w,13038
+assemblyline_v4_service/common/base.py,sha256=Q2VdhuklXEWJgcAPl7CWGYcbtufatrVXqupti8WAtP4,13186
 assemblyline_v4_service/common/decode_wrapper.py,sha256=eZSM2zBSzbGotuM04tKtV-R7oY5xuUTZ-rTfL6ktmns,3617
 assemblyline_v4_service/common/helper.py,sha256=xs9quuf-M1JOdKieBqOmWaOece0CtzXFhhe85xQYmuY,3289
 assemblyline_v4_service/common/ocr.py,sha256=gFPVAGVsmVk4SKL7hCMCT7NEyG-lFLniEFQup6WtCsc,4384
@@ -18,12 +18,12 @@ assemblyline_v4_service/dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 assemblyline_v4_service/dev/run_service_once.py,sha256=D-QpwRox1dy9H6EPoR6nY1o3XiD3JRjC7xrEkPn952I,10593
 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=Ass5DZtOCr0tdoRbLo7Qn8Ujlw8T8mUDroAaHxx2oMo,3198
+assemblyline_v4_service/updater/app.py,sha256=OF-G7J8IYwTjdGw_BI9numBicZBN5lspm8Eqb3qbIl8,3229
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=JD0gX3KHY-wvsFjTbWkT83F0d5Up3OfubMPinuNzbTQ,9069
-assemblyline_v4_service/updater/updater.py,sha256=AQ3aTm5nhb-RXWjm5w1RIZM3j3UQJ4Vr4bVJ6Z2rX8A,29322
-assemblyline_v4_service-4.4.1.dev110.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.1.dev110.dist-info/METADATA,sha256=qZaSW1cO7BmHYJTSYKkpzsj5NMvmy4zOib4l-f57aRQ,9360
-assemblyline_v4_service-4.4.1.dev110.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-assemblyline_v4_service-4.4.1.dev110.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
-assemblyline_v4_service-4.4.1.dev110.dist-info/RECORD,,
+assemblyline_v4_service/updater/updater.py,sha256=gTFNN8Xow1HnlUcftWG30-ULXK5_FfJynZBnf7i4aIQ,29528
+assemblyline_v4_service-4.4.1.dev112.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.1.dev112.dist-info/METADATA,sha256=zn0HfbthBoBY5DK8YJ25LIsRPtWvd9NCLqC7QfAGHvc,9360
+assemblyline_v4_service-4.4.1.dev112.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+assemblyline_v4_service-4.4.1.dev112.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
+assemblyline_v4_service-4.4.1.dev112.dist-info/RECORD,,