assemblyline-v4-service 4.4.1.dev149__py3-none-any.whl → 4.4.1.dev151__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.1.dev149
+4.4.1.dev151

assemblyline_v4_service/updater/updater.py

@@ -243,6 +243,9 @@ class ServiceUpdater(ThreadedCoreBase):
             self.source_update_flag.set()
 
     def _handle_signature_change_event(self, data: Optional[SignatureChange]):
+        if data and data.signature_id == "*":
+            # A classification change to the source was made, sync settings
+            self._pull_settings()
         self.local_update_flag.set()
 
     def _handle_service_change_event(self, data: Optional[ServiceChange]):
@@ -320,16 +323,16 @@ class ServiceUpdater(ThreadedCoreBase):
         if not os.path.exists(UPDATER_DIR):
             os.makedirs(UPDATER_DIR)
 
-        _, time_keeper = tempfile.mkstemp(prefix="time_keeper_", dir=UPDATER_DIR)
-        if self._service.update_config.generates_signatures:
-            output_directory = tempfile.mkdtemp(prefix="update_dir_", dir=UPDATER_DIR)
+        self.log.info("Setup service account.")
+        username = self.ensure_service_account()
+        self.log.info("Create temporary API key.")
+        with temporary_api_key(self.datastore, username) as api_key:
+            self.log.info(f"Connecting to Assemblyline API: {UI_SERVER}")
+            al_client = get_client(UI_SERVER, apikey=(username, api_key), verify=self.verify)
 
-            self.log.info("Setup service account.")
-            username = self.ensure_service_account()
-            self.log.info("Create temporary API key.")
-            with temporary_api_key(self.datastore, username) as api_key:
-                self.log.info(f"Connecting to Assemblyline API: {UI_SERVER}")
-                al_client = get_client(UI_SERVER, apikey=(username, api_key), verify=self.verify)
+            _, time_keeper = tempfile.mkstemp(prefix="time_keeper_", dir=UPDATER_DIR)
+            if self._service.update_config.generates_signatures:
+                output_directory = tempfile.mkdtemp(prefix="update_dir_", dir=UPDATER_DIR)
 
                 # Check if new signatures have been added
                 self.log.info("Check for new signatures.")
@@ -379,9 +382,9 @@ class ServiceUpdater(ThreadedCoreBase):
                     shutil.rmtree(output_directory, ignore_errors=True)
                     if os.path.exists(time_keeper):
                         os.unlink(time_keeper)
-        else:
-            output_directory = self.prepare_output_directory()
-            self.serve_directory(output_directory, time_keeper, al_client)
+            else:
+                output_directory = self.prepare_output_directory()
+                self.serve_directory(output_directory, time_keeper, al_client)
 
     def do_source_update(self, service: Service, specific_sources: list[str] = []) -> None:
         self.log.info(f"Connecting to Assemblyline API: {UI_SERVER}...")
@@ -555,7 +558,7 @@ class ServiceUpdater(ThreadedCoreBase):
         else:
             # Pull source metadata from synced service configuration
             signature_map = {
-                source.name: {'classification': source['default_classfication']}
+                source.name: {'classification': source['default_classification'].value}
                 for source in self._service.update_config.sources
              }
         open(os.path.join(new_directory, SIGNATURES_META_FILENAME), 'w').write(json.dumps(signature_map, indent=2))

{assemblyline_v4_service-4.4.1.dev149.dist-info → assemblyline_v4_service-4.4.1.dev151.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=RJ1pG5eQK7GXyN4GDPtaqcwxFre8_drtukWHPxAmGLs,13
+assemblyline_v4_service/VERSION,sha256=h63d9xP2Y2p_SIFY7WupJGvwwLnPoIGTTBIALmKdf3g,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
@@ -20,9 +20,9 @@ assemblyline_v4_service/updater/__main__.py,sha256=9Os-u8Tf7MD73JSrUSPmOaErTgfve
 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=lUGEz-z6iL5xav8m-F1czKVp8_3Fo3FpSJxJZJ-q24U,9100
-assemblyline_v4_service/updater/updater.py,sha256=IXdJjGMXONhmj0D9GcRK7BmrFQdjO736kyAMju4IZ_c,31126
-assemblyline_v4_service-4.4.1.dev149.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.1.dev149.dist-info/METADATA,sha256=kzQnBwN27i9TCoiPlt5PoWmcVfQ3dQ0GxxP7fu4tbkI,9360
-assemblyline_v4_service-4.4.1.dev149.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-assemblyline_v4_service-4.4.1.dev149.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
-assemblyline_v4_service-4.4.1.dev149.dist-info/RECORD,,
+assemblyline_v4_service/updater/updater.py,sha256=rjSTrg0m40nv8KoFJg1Z3aRoRszQBjSrkI78BT0TBBI,31289
+assemblyline_v4_service-4.4.1.dev151.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.1.dev151.dist-info/METADATA,sha256=33vUfqMZMVBDXbc4PgyC_WkfC4BDWp8GiZnlI3rfZo0,9360
+assemblyline_v4_service-4.4.1.dev151.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+assemblyline_v4_service-4.4.1.dev151.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
+assemblyline_v4_service-4.4.1.dev151.dist-info/RECORD,,