assemblyline-core 4.7.3.dev22__tar.gz → 4.7.3.1__tar.gz

{assemblyline_core-4.7.3.dev22 → assemblyline_core-4.7.3.1}/PKG-INFO

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

assemblyline_core-4.7.3.1/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.7.3.1

{assemblyline_core-4.7.3.dev22 → assemblyline_core-4.7.3.1}/assemblyline_core/scaler/scaler_server.py

@@ -743,7 +743,7 @@ class ScalerServer(ThreadedCoreBase):
             return 1
         return self.config.core.scaler.memory_overallocation
 
-    def update_scaling(self) -> None:
+    def update_scaling(self):
         """Check if we need to scale any services up or down."""
         pool = Pool()
         while self.sleep(SCALE_INTERVAL):
@@ -811,7 +811,7 @@ class ScalerServer(ThreadedCoreBase):
                     drop = [_p for _p in prof if _p.cpu > free_cpu or _p.ram > free_memory]
                     if drop:
                         summary = {_p.name: (_p.cpu, _p.ram) for _p in drop}
-                        self.log.debug("Can't make more because not enough resources %s", summary)
+                        self.log.debug(f"Can't make more because not enough resources {summary}")
                     prof = [_p for _p in prof if _p.cpu <= free_cpu and _p.ram <= free_memory]
                     return prof
 

{assemblyline_core-4.7.3.dev22 → assemblyline_core-4.7.3.1}/assemblyline_core/updater/run_updater.py

@@ -12,7 +12,6 @@ from typing import Any, Dict, List, Optional
 
 import docker
 from assemblyline.common import isotime
-from assemblyline.common.constants import SERVICE_API_KEY_HASH
 from assemblyline.common.version import FRAMEWORK_VERSION, SYSTEM_VERSION
 from assemblyline.odm.messages.changes import Operation, ServiceChange
 from assemblyline.odm.models.config import Mount, Selector
@@ -58,13 +57,13 @@ CONTAINER_CHECK_INTERVAL = int(os.getenv("CONTAINER_CHECK_INTERVAL", "300"))
 API_TIMEOUT = 90
 NAMESPACE = os.getenv('NAMESPACE', None)
 INHERITED_VARIABLES: list[str] = ['HTTP_PROXY', 'HTTPS_PROXY', 'NO_PROXY', 'http_proxy',
-                                  'https_proxy', 'no_proxy', 'SERVICE_API_HOST']
+                                  'https_proxy', 'no_proxy', 'SERVICE_API_HOST', 'SERVICE_API_KEY']
 
 AL_REGISTRATION_NETWORK = os.environ.get("AL_REGISTRATION_NETWORK", 'al_registration')
 CONFIGURATION_HOST_PATH = os.getenv('CONFIGURATION_HOST_PATH', 'service_config')
 CONFIGURATION_CONFIGMAP = os.getenv('KUBERNETES_AL_CONFIG', None)
 SERVICE_API_HOST = os.environ.get('SERVICE_API_HOST', "http://service_server:5003")
-API_KEY_TIMEOUT = 60 * 60
+SERVICE_API_KEY = os.environ.get('SERVICE_API_KEY', 'ThisIsARandomAuthKey...ChangeMe!')
 
 RESTRICTED_POD_SECUTITY_CONTEXT = V1SecurityContext(
     run_as_user=1000,
@@ -441,7 +440,7 @@ class KubernetesUpdateInterface:
 
 
 class ServiceUpdater(ThreadedCoreBase):
-    def __init__(self, redis_persist=None, redis=None, logger=None, datastore=None) -> None:
+    def __init__(self, redis_persist=None, redis=None, logger=None, datastore=None):
         super().__init__('assemblyline.service.updater', logger=logger, datastore=datastore,
                          redis_persist=redis_persist, redis=redis)
 
@@ -449,7 +448,6 @@ class ServiceUpdater(ThreadedCoreBase):
         self.container_install: Hash[dict[str, Any]] = Hash('container-install', self.redis_persist)
         self.latest_service_tags: Hash[dict[str, str]] = Hash('service-tags', self.redis_persist)
         self.service_events = EventSender('changes.services', host=self.redis)
-        self.container_keys: Hash[dict[str, Any]] = Hash(SERVICE_API_KEY_HASH, self.redis_persist)
 
         self.incompatible_services = set()
         self.service_change_watcher = EventWatcher(self.redis, deserializer=ServiceChange.deserialize)
@@ -505,9 +503,6 @@ class ServiceUpdater(ThreadedCoreBase):
                     tag = f'{FRAMEWORK_VERSION}.{SYSTEM_VERSION}.stable'
                 else:
                     tag = f'{FRAMEWORK_VERSION}.{SYSTEM_VERSION}.latest'
-
-                api_key = uuid.uuid4().hex + uuid.uuid4().hex
-
                 try:
                     service = Service(
                         {'name': service_name,
@@ -525,13 +520,6 @@ class ServiceUpdater(ThreadedCoreBase):
                                          f"Defaulting to '{tag}' tag...")
                         tag_name = tag
 
-                    # Install the api key
-                    self.container_keys.add(api_key, {
-                        'key': api_key,
-                        'allow_registry_writing': True,
-                        'expiry': isotime.now_as_iso(API_KEY_TIMEOUT)
-                    })
-
                     docker_config = dict(image=f"{image_name}:{tag_name}")
                     if auth:
                         docker_config.update(dict(registry_username=auth['username'],
@@ -546,7 +534,6 @@ class ServiceUpdater(ThreadedCoreBase):
                     env = {
                         "SERVICE_TAG": tag_name,
                         "REGISTER_ONLY": 'true',
-                        "SERVICE_API_KEY": api_key,
                     }
 
                     # Update environment with service defaults
@@ -563,9 +550,6 @@ class ServiceUpdater(ThreadedCoreBase):
                 except Exception as e:
                     self.log.error(
                         f"[CI] Service {service_name} has failed to install. Install procedure cancelled... [{str(e)}]")
-                finally:
-                    self.container_keys.pop(api_key)
-
                 return f"{service_name}_{str(tag_name).replace('stable', '')}"
 
             # Start up installs for services in parallel
@@ -628,18 +612,8 @@ class ServiceUpdater(ThreadedCoreBase):
 
             # Update function for services
             def update_service(service_name: str, update_data: dict) -> str:
-                self.log.info("[CU] Service %s is being updated to version %s...",
-                              service_name, update_data['latest_tag'])
-
-                # Create an api key
-                api_key = uuid.uuid4().hex + uuid.uuid4().hex
-                self.container_keys.add(api_key, {
-                    'key': api_key,
-                    'allow_registry_writing': True,
-                    'expiry': isotime.now_as_iso(API_KEY_TIMEOUT)
-                })
-
-                # Initailize the conatiner configuration
+                self.log.info(f"[CU] Service {service_name} is being updated to version {update_data['latest_tag']}...")
+
                 docker_config = dict(image=update_data['image'])
 
                 # Load authentication params
@@ -658,7 +632,6 @@ class ServiceUpdater(ThreadedCoreBase):
                 env = {
                     "SERVICE_TAG": update_data['latest_tag'],
                     "REGISTER_ONLY": 'true',
-                    "SERVICE_API_KEY": api_key,
                 }
 
                 # Update environment with service defaults
@@ -675,8 +648,6 @@ class ServiceUpdater(ThreadedCoreBase):
                 except Exception as e:
                     self.log.error(
                         f"[CU] Service {service_name} has failed to update. Update procedure cancelled... [{str(e)}]")
-                finally:
-                    self.container_keys.pop(api_key)
                 return service_key
 
             # Start up updates for services in parallel

{assemblyline_core-4.7.3.dev22 → assemblyline_core-4.7.3.1}/assemblyline_core.egg-info/PKG-INFO

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

assemblyline_core-4.7.3.dev22/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.7.3.dev22