assemblyline-v4-service 4.5.1.dev174__py3-none-any.whl → 4.5.1.dev177__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.5.1.dev174
+4.5.1.dev177

assemblyline_v4_service/updater/client.py

@@ -136,13 +136,19 @@ class SyncableSignatureClient(SignatureClient):
             if isinstance(d, SignatureModel):
                 d = d.as_primitives()
 
+            # Compute the expected signature ID
+            sig_id = f"{sig_type}_{source}_{d['signature_id']}"
+            sig_exists = self.datastore.signature.get_if_exists(sig_id, as_obj=False)
+            if sig_exists and sig_exists['state_change_user'] not in ['update_service_account', None]:
+                # Preserve status set by an actual user
+                d['status'] = sig_exists['status']
+                d['state_change_user'] = sig_exists['state_change_user']
+
             if self.sync:
-                # Compute the expected signature ID and add it to the list
-                sig_id = f"{sig_type}_{source}_{d['signature_id']}"
+                # Add signature ID to the list
                 current_signature_ids.add(sig_id)
 
                 # Check to see if there's any important changes made
-                sig_exists: SignatureModel = self.datastore.signature.get_if_exists(sig_id, as_obj=False)
                 if sig_exists and all(sig_exists[attr] == d[attr] for attr in ['status', 'data', 'classification']):
                     # If no changes, then use the old `last_modified` value
                     d['last_modified'] = sig_exists['last_modified']

assemblyline_v4_service/updater/updater.py

@@ -249,6 +249,10 @@ class ServiceUpdater(ThreadedCoreBase):
         # Download the service object from datastore
         self._service = self.datastore.get_service_with_delta(SERVICE_NAME)
 
+        # Update signature client with any changes to classification rewrites
+        self.client.signature.classification_replace_map = \
+            self._service.config.get('updater', {}).get('classification_replace', {})
+
         # If the update configuration for the service has changed, trigger an update
         if self.config_hash(self._service) != self.get_active_config_hash():
             self.source_update_flag.set()

{assemblyline_v4_service-4.5.1.dev174.dist-info → assemblyline_v4_service-4.5.1.dev177.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=Y0s4bc5iWvVlJE-JsyWv2maXm3sf3eCETq52ZheJvK8,13
+assemblyline_v4_service/VERSION,sha256=jH7afe7HrzGYi-ZsGX7-BkacMRA7kIt_VGyh556gtvk,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
@@ -19,10 +19,10 @@ assemblyline_v4_service/dev/run_service_once.py,sha256=4K3ljw0MnfPGw0-6lzc_vtUYg
 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
-assemblyline_v4_service/updater/client.py,sha256=oOOIzh-Q-b5uOTo3C4rVSfQxqUO5Y_ogDmUhvWfm5uo,9518
+assemblyline_v4_service/updater/client.py,sha256=7_56Ie-2073FlrVWscS-3lIIkg8F-81u97FVNqEJLyQ,9798
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=-B35wdjpeY4t1R9SPDrTFHFKHwE3uzy9N69mV6mHy-g,9532
-assemblyline_v4_service/updater/updater.py,sha256=6LFvqBkNu6mDaBKZGEaFGtE8g3DtDNBYWt8jXx6fnOw,29507
+assemblyline_v4_service/updater/updater.py,sha256=XxISsgQGzMjI8G55SEQbWo0xgY7PpExFBDVMIwHjD_Q,29733
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/conftest.py,sha256=W3SieQpZsZpGEmtLqY4aIlxREDSsHceyCrFcFsWUM0U,1851
 test/test_healthz.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
@@ -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.dev174.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.5.1.dev174.dist-info/METADATA,sha256=Lp5XW8YfqSjY5UVwLTT2ljkBMabA_NUUiEGqI1bxYkM,9499
-assemblyline_v4_service-4.5.1.dev174.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-assemblyline_v4_service-4.5.1.dev174.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.5.1.dev174.dist-info/RECORD,,
+assemblyline_v4_service-4.5.1.dev177.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.5.1.dev177.dist-info/METADATA,sha256=_m_pmeVxn9ysNP2tB8Nx22H4E3FUh5F5vOdUqLVXrP4,9499
+assemblyline_v4_service-4.5.1.dev177.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+assemblyline_v4_service-4.5.1.dev177.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.5.1.dev177.dist-info/RECORD,,