assemblyline-core 4.5.0.36__tar.gz → 4.5.0.38__tar.gz

{assemblyline-core-4.5.0.36 → assemblyline-core-4.5.0.38}/PKG-INFO

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

assemblyline-core-4.5.0.38/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.5.0.38

{assemblyline-core-4.5.0.36 → assemblyline-core-4.5.0.38}/assemblyline_core/scaler/scaler_server.py

@@ -6,7 +6,7 @@ import functools
 import threading
 from collections import defaultdict
 from string import Template
-from typing import Optional, Any
+from typing import Dict, Optional, Any
 import os
 import re
 import math
@@ -30,7 +30,7 @@ from assemblyline.odm.models.config import Mount
 from assemblyline.odm.messages.scaler_heartbeat import Metrics
 from assemblyline.odm.messages.scaler_status_heartbeat import Status
 from assemblyline.odm.messages.changes import ServiceChange, Operation
-from assemblyline.common.dict_utils import get_recursive_sorted_tuples
+from assemblyline.common.dict_utils import get_recursive_sorted_tuples, flatten
 from assemblyline.common.uid import get_id_from_data
 from assemblyline.common.forge import get_classification, get_service_queue, get_apm_client
 from assemblyline.common.constants import SCALER_TIMEOUT_QUEUE, SERVICE_STATE_HASH, ServiceStatus
@@ -269,17 +269,24 @@ class ScalerServer(ThreadedCoreBase):
         self.service_change_watcher.register('changes.services.*', self._handle_service_change_event)
 
         core_env: dict[str, str] = {}
+
         # If we have privileged services, we must be able to pass the necessary environment variables for them to
         # function properly.
-        for secret in re.findall(r'\${\w+}', open('/etc/assemblyline/config.yml', 'r').read()):
-            env_name = secret.strip("${}")
-            try:
-                core_env[env_name] = os.environ[env_name]
-            except KeyError:
-                # Don't pass through variables that scaler doesn't have
-                # they are likely specific to other components and shouldn't
-                # be shared with privileged services.
-                pass
+        with open('/etc/assemblyline/config.yml') as fh:
+            flattened_config: Dict[str, Any] = flatten(yaml.safe_load(fh.read()))
+
+        # Limit secrets to be shared to very specific configurations
+        for cfg in ["datastore.hosts", "filestore.archive", "filestore.cache", "filestore.storage"]:
+            for conn_str in flattened_config.get(cfg, []):
+                # Look for any secrets that need to passed onto services via env
+                for secret in Template(conn_str).get_identifiers():
+                    try:
+                        core_env[secret] = os.environ[secret]
+                    except KeyError:
+                        # Don't pass through variables that scaler doesn't have
+                        # they are likely specific to other components and shouldn't
+                        # be shared with privileged services.
+                        pass
 
         labels = {
             'app': 'assemblyline',

{assemblyline-core-4.5.0.36 → assemblyline-core-4.5.0.38}/assemblyline_core/tasking_client.py

@@ -8,7 +8,7 @@ from assemblyline.common import forge
 from assemblyline.common.constants import SERVICE_STATE_HASH, ServiceStatus
 from assemblyline.common.dict_utils import flatten, unflatten
 from assemblyline.common.heuristics import HeuristicHandler, InvalidHeuristicException
-from assemblyline.common.isotime import now_as_iso
+from assemblyline.common.isotime import now_as_iso, now_as_utc_datetime
 from assemblyline.common.threading import APMAwareThreadPoolExecutor
 from assemblyline.datastore.helper import AssemblylineDatastore
 from assemblyline.filestore import FileStore
@@ -264,7 +264,7 @@ class TaskingClient:
                 result.archive_ts = None
 
                 if task.ttl and result.expiry_ts:
-                    result.expiry_ts = max(result.expiry_ts, now_as_iso(task.ttl * 24 * 60 * 60))
+                    result.expiry_ts = max(result.expiry_ts, now_as_utc_datetime(task.ttl * 24 * 60 * 60))
 
                 # Create a list of files to freshen
                 freshen_hashes = [task.fileinfo.sha256]

{assemblyline-core-4.5.0.36 → assemblyline-core-4.5.0.38}/assemblyline_core.egg-info/PKG-INFO

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

assemblyline-core-4.5.0.36/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.5.0.36