assemblyline-v4-service 4.4.0.20__py3-none-any.whl → 4.4.0.22__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.0.20
+4.4.0.22

assemblyline_v4_service/common/base.py

@@ -78,6 +78,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
 
@@ -258,7 +259,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']:
@@ -287,6 +288,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/common/result.py

@@ -208,6 +208,7 @@ class SectionBody:
     def __init__(self, body_format, body=None):
         self._format = body_format
         self._data = body
+        self._config = {}
 
     @property
     def format(self):
@@ -222,6 +223,10 @@ class SectionBody:
         else:
             return self._data
 
+    @property
+    def config(self) -> dict:
+        return self._config
+
     def set_body(self, body):
         self._data = body
 
@@ -396,6 +401,11 @@ class TableSectionBody(SectionBody):
 
     def add_row(self, row: TableRow) -> None:
         self._data.append(row)
+        self.set_column_order(list(row.keys()))
+
+    def set_column_order(self, order: List[str]):
+        self._config = {'column_order': order}
+
 
 
 class ImageSectionBody(SectionBody):
@@ -418,7 +428,7 @@ class MultiSectionBody(SectionBody):
         super().__init__(BODY_FORMAT.MULTI, body=[])
 
     def add_section_body(self, section_body: SectionBody) -> None:
-        self._data.append((section_body.format, section_body._data))
+        self._data.append((section_body.format, section_body._data, section_body._config))
 
 
 class DividerSectionBody(SectionBody):
@@ -461,10 +471,12 @@ class ResultSection:
         self._subsections: List[ResultSection] = []
         if isinstance(body, SectionBody):
             self._body_format = body.format
+            self._body_config = body.config
             self._body = body.body
         else:
             self._body_format = body_format
             self._body = body
+            self._body_config = {}
         self.classification: Classification = classification or SERVICE_ATTRIBUTES.default_result_classification
         self.depth: int = 0
         self._tags = tags or {}
@@ -497,6 +509,10 @@ class ResultSection:
     def body_format(self):
         return self._body_format
 
+    @property
+    def body_config(self):
+        return self._body_config
+
     @property
     def heuristic(self):
         return self._heuristic
@@ -629,6 +645,10 @@ class TypeSpecificResultSection(ResultSection):
     def body(self):
         return self.section_body.body
 
+    @property
+    def body_config(self):
+        return self.section_body.config
+
     def add_line(self, text: Union[str, List]) -> None:
         raise InvalidFunctionException("Do not use default add_line method in a type specific section.")
 
@@ -720,6 +740,10 @@ class ResultTableSection(TypeSpecificResultSection):
 
     def add_row(self, row: TableRow) -> None:
         self.section_body.add_row(row)
+        self.set_column_order(list(row.keys()))
+
+    def set_column_order(self, order: List[str]):
+        self.section_body.set_column_order(order)
 
 
 class ResultImageSection(TypeSpecificResultSection):
@@ -772,6 +796,7 @@ class Result:
             body=section.body,
             classification=section.classification,
             body_format=section.body_format,
+            body_config=section.body_config,
             depth=section.depth,
             heuristic=get_heuristic_primitives(section.heuristic),
             tags=unflatten(section.tags),

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.0.20.dist-info → assemblyline_v4_service-4.4.0.22.dist-info}/METADATA

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

@@ -1,18 +1,18 @@
-assemblyline_v4_service/VERSION,sha256=giHEQa3NiiRW28QBvDs-2fjN8cmLET_ZL4sLibZtgfU,9
+assemblyline_v4_service/VERSION,sha256=P6RL_rWI59Yat6kK-jNcLoDZGq_Fd53Vo7ZZYlfA95w,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=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=U908p3wlW9fEydx77GgI2E-6wW6T8Nc3R91nNOKU0H0,4453
-assemblyline_v4_service/common/base.py,sha256=STzfZ9dwqvbgbKiFs-aLk05pdhyK6Psz4hZ3_fOmQYM,13039
+assemblyline_v4_service/common/base.py,sha256=qKhNpcD-FwV0R-5EWDWWXgr2Y-2dciVY6IIQsprenQ0,13187
 assemblyline_v4_service/common/dynamic_service_helper.py,sha256=OhxSnSOjUB_iSkMahHbPQEll9sl5wLuCFwwykvV-Kno,147461
 assemblyline_v4_service/common/helper.py,sha256=Fgimk8DhnS23aijTGewA1HwvPoAM61UUbHlrGBnSzL0,3290
 assemblyline_v4_service/common/icap.py,sha256=phT3CT5uII3Qm90Nzi4O-eDkQ2jmr3zHcVVra4sqYSc,5376
 assemblyline_v4_service/common/keytool_parse.py,sha256=e829hrNNG5LFw1kjLsYVZsafCm2S3NpgM6jBc6JKawY,2219
 assemblyline_v4_service/common/ontology_helper.py,sha256=uiwc5cfPDAesEDYKk7etzCMTGQNVwhNrO3mWLdB2520,7793
 assemblyline_v4_service/common/request.py,sha256=p8A9boDZ6KuVxl3EdhvaU1D_5K6_gAVoIbJYDz8TzjA,9711
-assemblyline_v4_service/common/result.py,sha256=0_ybxAQ_0W0pYo35Kr2EUgBMujQeGsgHbbbdfiLud88,29651
+assemblyline_v4_service/common/result.py,sha256=9OGfWTCnBtow31Ft03us9Ew_2pXyDydUTP4iio9Qg8Q,30349
 assemblyline_v4_service/common/safelist_helper.py,sha256=QHTuG8q52o3U307AADPgrIgug7aYFK2uQE4-EtWG3yQ,3037
 assemblyline_v4_service/common/section_reducer.py,sha256=JJOT7eFfBn4hFJKHY9UeVEbHS-E8FpmQ_dPZC-dWla0,1513
 assemblyline_v4_service/common/tag_helper.py,sha256=om3TVPY_XDeFDqVW2iUA349xbljSAy5tv667jCiA7JI,4186
@@ -42,12 +42,12 @@ assemblyline_v4_service/testing/helper.py,sha256=f0-qBtgR0vWZBpEV9sPfcworLtdh4h_
 assemblyline_v4_service/testing/regenerate_results.py,sha256=Cbp2CMAxbF3kz5vxEPPCxrgUp1Vl3Tz6e46aUhg_I4U,1101
 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.0.20.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.0.20.dist-info/METADATA,sha256=HFxr9HMIKSHdHzCCiXDVbJnjWsllina0A4rbSv4oW3Y,9328
-assemblyline_v4_service-4.4.0.20.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-assemblyline_v4_service-4.4.0.20.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
-assemblyline_v4_service-4.4.0.20.dist-info/RECORD,,
+assemblyline_v4_service/updater/updater.py,sha256=gTFNN8Xow1HnlUcftWG30-ULXK5_FfJynZBnf7i4aIQ,29528
+assemblyline_v4_service-4.4.0.22.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.0.22.dist-info/METADATA,sha256=Pf_pRHiAVBk1lxIbhkHvBAYSociMGcZStBE82DIUERc,9328
+assemblyline_v4_service-4.4.0.22.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+assemblyline_v4_service-4.4.0.22.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
+assemblyline_v4_service-4.4.0.22.dist-info/RECORD,,