PyPI - assemblyline-core - Versions diffs - 4.5.1.dev181__tar.gz → 4.5.1.dev183__tar.gz - Mend

@@ -62,6 +62,40 @@ 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):
         # Determine project/repo IDs from image name
@@ -158,7 +192,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:
@@ -177,7 +215,7 @@ def get_latest_tag_for_service(
     # Pre-filter tags to only consider 'compatible' tags relative to the running system
     tags = [t for t in tags
-            if re.match(f"({FRAMEWORK_VERSION})[.]({SYSTEM_VERSION})[.]\\d+[.]({update_channel})\\d+", t)]
+            if re.match(f"({FRAMEWORK_VERSION})\.({SYSTEM_VERSION})\.\\d+\.({update_channel})\\d+", t)]
     if not tags:
         logger.warning(f"{prefix}Cannot fetch latest tag for service {service_name} - {image_name}"
@@ -212,14 +250,28 @@ def _get_dockerhub_tags(image_name, update_channel, proxies=None):
     # Find latest tag for each types
     rv = []
     namespace, repository = image_name.split('/', 1)
-    url = f"https://{DEFAULT_DOCKER_REGISTRY}/v2/namespaces/{namespace}/repositories/{repository}/tags"
-    f"?page_size=50&page=1&name={update_channel}"
+    url = f"https://{DEFAULT_DOCKER_REGISTRY}/v2/namespaces/{namespace}/repositories/{repository}/tags" \
+        f"?page_size=50&page=1&name={update_channel}&ordering=last_updated"
     while True:
         resp = requests.get(url, proxies=proxies)
         if resp.ok:
             resp_data = resp.json()
-            rv.extend([x['name'] for x in resp_data['results']])
+            if namespace == "cccs":
+                # The tags are coming from a repository managed by the Assemblyline team
+                for x in resp_data['results']:
+                    tag_name = x['name']
+                    if tag_name == f"{FRAMEWORK_VERSION}.{SYSTEM_VERSION}.{update_channel}":
+                        # Ignore tag aliases containing the update_channel
+                        continue
+                    if tag_name.startswith(f"{FRAMEWORK_VERSION}.{SYSTEM_VERSION}"):
+                        # Because the order of paging is based on `last_updated`,
+                        # we can return the first valid candidate
+                        return [tag_name]
+            else:
+                # The tags are coming from another repository, so we're don't know the ordering of tags
+                rv.extend([x['name'] for x in resp_data['results']])
             # Page until there are no results left
             url = resp_data.get('next', None)
             if url is None:

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

@@ -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:

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

assemblyline-core 4.5.1.dev181tar.gz → 4.5.1.dev183tar.gz

Potentially problematic release.

	@@ -0,0 +1 @@
1	+ 4.5.1.dev183

	@@ -1 +0,0 @@
1	- 4.5.1.dev181

assemblyline-core 4.5.1.dev181__tar.gz → 4.5.1.dev183__tar.gz

Potentially problematic release.

assemblyline-core 4.5.1.dev181tar.gz → 4.5.1.dev183tar.gz