assemblyline-core 4.5.0.32__tar.gz → 4.5.0.33__tar.gz

{assemblyline-core-4.5.0.32 → assemblyline-core-4.5.0.33}/PKG-INFO

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

assemblyline-core-4.5.0.33/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.5.0.33

{assemblyline-core-4.5.0.32 → assemblyline-core-4.5.0.33}/assemblyline_core/updater/helper.py

@@ -63,6 +63,39 @@ class DockerRegistry(ContainerRegistry):
             return resp_data['tags'] or []
         return []
 
+class AzureContainerRegistry(ContainerRegistry):
+    def _get_proprietary_registry_tags(self, server, image_name, auth, verify, proxies=None, token_server=None):
+        # Find latest tag for each types
+        url = f"https://{server}/v2/{image_name}/tags/list"
+
+        # Get tag list
+        headers = {}
+        if auth:
+            headers["Authorization"] = auth
+
+        # Attempt request with provided credentials alone
+        resp = self._perform_request(url, headers, verify, proxies)
+
+        if not resp:
+            # Authentication with just credentials failed, moving over to generating a bearer token
+
+            # Retrieve token for authentication: https://azure.github.io/acr/Token-BasicAuth.html#using-the-token-api
+            token_url = f"https://{server}/oauth2/token?scope=repository:{image_name}:metadata_read,pull&service={server}"
+            resp = self._perform_request(token_url, headers, verify, proxies)
+            if resp and resp.ok:
+                # Request to obtain token was successful, set Authorization header for registry API
+                token = resp.json().get('access_token')
+                headers["Authorization"] = f"Bearer {token}"
+
+                resp = self._perform_request(url, headers, verify, proxies)
+
+        # At this point, we should have a response from the API
+        if resp and resp.ok:
+            # Test for positive list of tags
+            resp_data = resp.json()
+            return resp_data['tags'] or []
+
+        return []
 
 class HarborRegistry(ContainerRegistry):
     def _get_proprietary_registry_tags(self, server, image_name, auth, verify, proxies=None, token_server=None):
@@ -160,7 +193,11 @@ def get_latest_tag_for_service(
         # We're assuming that if only a password is given, then this is a token
         auth = f"Bearer {service_config.docker_config.registry_password}"
 
-    registry = REGISTRY_TYPE_MAPPING[service_config.docker_config.registry_type]
+    if server.endswith(".azurecr.io"):
+        # This is an Azure Container Registry based on the server name
+        registry = AzureContainerRegistry()
+    else:
+        registry = REGISTRY_TYPE_MAPPING[service_config.docker_config.registry_type]
     token_server = None
     proxies = None
     for reg_conf in system_config.core.updater.registry_configs:

{assemblyline-core-4.5.0.32 → assemblyline-core-4.5.0.33}/assemblyline_core/updater/run_updater.py

@@ -337,6 +337,7 @@ class KubernetesUpdateInterface:
             priority_class_name=self.priority_class,
             service_account_name=docker_config.service_account or self.default_service_account or PRIVILEGED_SERVICE_ACCOUNT_NAME,
             affinity=selector_to_node_affinity(self.linux_node_selector),
+            tolerations=self.default_service_tolerations
         )
 
         if use_pull_secret:

{assemblyline-core-4.5.0.32 → assemblyline-core-4.5.0.33}/assemblyline_core.egg-info/PKG-INFO

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

assemblyline-core-4.5.0.32/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.5.0.32