assemblyline-core 4.5.0.70__tar.gz → 4.5.0.72__tar.gz

{assemblyline_core-4.5.0.70 → assemblyline_core-4.5.0.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: assemblyline-core
-Version: 4.5.0.70
+Version: 4.5.0.72
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.5.0.72/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.5.0.72

{assemblyline_core-4.5.0.70 → assemblyline_core-4.5.0.72}/assemblyline_core/updater/helper.py

@@ -171,7 +171,7 @@ def get_latest_tag_for_service(service_config: ServiceConfig, system_config: Sys
         logger (Logger): Logger object for logging messages.
         prefix (str, optional): A prefix string to prepend to log messages for clarity in logs.
     Returns:
-        tuple: Returns a tuple of the final image name, the latest tag, and authentication config used for the Docker registry.
+        tuple: Returns a tuple of the final image name, the latest tag, authentication and auto_update config used for the Docker registry.
     """
     def process_image(image):
         # Find which server to search in
@@ -198,6 +198,9 @@ def get_latest_tag_for_service(service_config: ServiceConfig, system_config: Sys
     service_name = service_config.name
     image = service_config.docker_config.image
     update_channel = service_config.update_channel
+    auto_update = service_config.auto_update
+    if auto_update is None:
+        auto_update = system_config.services.default_auto_update
 
     # Fix service image for calling Docker API
     image_variables = defaultdict(str)
@@ -290,7 +293,7 @@ def get_latest_tag_for_service(service_config: ServiceConfig, system_config: Sys
     if server != DEFAULT_DOCKER_REGISTRY:
         image_name = "/".join([server, image_name])
 
-    return image_name, tag_name, auth_config
+    return image_name, tag_name, auth_config, auto_update
 
 def _get_dockerhub_tags(image_name, update_channel, prefix, proxies=None, docker_registry=DEFAULT_DOCKER_REGISTRY,
                         logger: Logger=None):

{assemblyline_core-4.5.0.70 → assemblyline_core-4.5.0.72}/assemblyline_core/updater/run_updater.py

@@ -508,7 +508,7 @@ class ServiceUpdater(ThreadedCoreBase):
                          'version': tag,
                          'docker_config': {'image': install_data.get('image')}})
 
-                    image_name, tag_name, auth = get_latest_tag_for_service(
+                    image_name, tag_name, auth, _ = get_latest_tag_for_service(
                         service,  self.config, self.log, prefix="[CI] ")
 
                     if not tag_name:
@@ -712,10 +712,31 @@ class ServiceUpdater(ThreadedCoreBase):
 
             for service in self.datastore.list_all_services(full=True):
                 discovered_services.append(service.name)
-                image_name, tag_name, auth = get_latest_tag_for_service(service, self.config, self.log, prefix="[CV] ")
+                image_name, tag_name, auth, auto_update = get_latest_tag_for_service(
+                    service, self.config, self.log, prefix="[CV] ")
                 self.latest_service_tags.set(service.name,
                                              {'auth': auth, 'image': image_name, service.update_channel: tag_name})
 
+                # Check if the service is marked for auto-update and we found a version for it
+                if auto_update and tag_name:
+                    self.log.info(f"[CV] {service.name} auto-update is enabled...")
+                    srv_update_available = tag_name is not None and tag_name.replace('stable', '') != service.version
+                    updating = self.container_update.exists(service.name)
+
+                    # If the service is not already updating, and there is an update available, mark it for update
+                    if srv_update_available and not updating:
+                        self.log.info(f"[CV] Requesting update for service {service.name}...")
+                        self.container_update.set(service.name, {
+                            "auth": auth,
+                            "image": f"{image_name}:{tag_name}",
+                            "latest_tag": tag_name,
+                            "update_available": srv_update_available,
+                            "updating": updating
+                        })
+                    else:
+                        self.log.info(f"[CV] {service.name} already marked for update...")
+
+
             # Remove services we have locally or in redis that have been deleted from the database
             for stray_service in existing_services - set(discovered_services):
                 self.log.info(f"[CV] Service updates disabled for {stray_service}")

{assemblyline_core-4.5.0.70 → assemblyline_core-4.5.0.72}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: assemblyline-core
-Version: 4.5.0.70
+Version: 4.5.0.72
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.5.0.70/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.5.0.70