assemblyline 4.3.2.dev44__tar.gz → 4.3.2.dev45__tar.gz

{assemblyline-4.3.2.dev44/assemblyline.egg-info → assemblyline-4.3.2.dev45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline
-Version: 4.3.2.dev44
+Version: 4.3.2.dev45
 Summary: Assemblyline 4 - Automated malware analysis framework
 Home-page: https://github.com/CybercentreCanada/assemblyline-base
 Author: CCCS Assemblyline development team

assemblyline-4.3.2.dev45/assemblyline/VERSION

@@ -0,0 +1 @@
+4.3.2.dev45

{assemblyline-4.3.2.dev44 → assemblyline-4.3.2.dev45}/assemblyline/odm/base.py

@@ -1093,7 +1093,7 @@ class Model:
             elif isinstance(defaults, dict):
                 val = defaults.get(field, {})
                 default = f"`{val if not isinstance(val, dict) else info.default}`"
-            elif isinstance(defaults, list):
+            elif isinstance(defaults, list) and field_type == 'List':
                 default = f'`{defaults}`'
             row = f"| {field} | {field_type} | {description} | {required} | {default} |\n"
             table += row

{assemblyline-4.3.2.dev44 → assemblyline-4.3.2.dev45}/assemblyline/odm/models/config.py

@@ -1,8 +1,9 @@
-from os import environ
 from typing import Dict, List
 
 from assemblyline import odm
 from assemblyline.odm.models.service import EnvironmentVariable
+from assemblyline.odm.models.service_delta import DockerConfigDelta
+
 
 AUTO_PROPERTY_TYPE = ['access', 'classification', 'type', 'role', 'remove_role']
 
@@ -589,6 +590,25 @@ DEFAULT_SCALER = {
 }
 
 
+@odm.model(index=False, store=False)
+class Updater(odm.Model):
+    job_dockerconfig: DockerConfigDelta = odm.Compound(
+        DockerConfigDelta, description="Container configuration used for service registration/updates")
+    registry_proxies: Dict = odm.Mapping(odm.Mapping(odm.Text()),
+                                         default={},
+                                         description="Proxy configuration to use with container registries.")
+
+
+DEFAULT_UPDATER = {
+    'job_dockerconfig': {
+        'cpu_cores': 1,
+        'ram_mb': 1024,
+        'ram_mb_min': 128,
+    },
+    'registry_proxies': {}
+}
+
+
 @odm.model(index=False, store=False)
 class VacuumSafelistItem(odm.Model):
     name = odm.Keyword()
@@ -644,6 +664,7 @@ class Core(odm.Model):
                                     description="Configuration for Metrics Collection")
     redis: Redis = odm.Compound(Redis, default=DEFAULT_REDIS, description="Configuration for Redis instances")
     scaler: Scaler = odm.Compound(Scaler, default=DEFAULT_SCALER, description="Configuration for Scaler")
+    updater: Updater = odm.Compound(Updater, default=DEFAULT_UPDATER, description="Configuration for Updater")
     vacuum: Vacuum = odm.Compound(Vacuum, default=DEFAULT_VACUUM, description="Configuration for Vacuum")
 
 
@@ -656,6 +677,7 @@ DEFAULT_CORE = {
     "metrics": DEFAULT_METRICS,
     "redis": DEFAULT_REDIS,
     "scaler": DEFAULT_SCALER,
+    "updater": DEFAULT_UPDATER,
 }
 
 

{assemblyline-4.3.2.dev44 → assemblyline-4.3.2.dev45}/assemblyline/odm/models/result.py

@@ -1,5 +1,5 @@
-import typing
 from collections import defaultdict
+from typing import Any, Dict
 
 from assemblyline import odm
 from assemblyline.common import forge
@@ -137,7 +137,7 @@ class Result(odm.Model):
 
         return '.'.join(key_list)
 
-    def scored_tag_dict(self) -> dict[str, dict[str, typing.Any]]:
+    def scored_tag_dict(self) -> Dict[str, Dict[str, Any]]:
         tags = defaultdict(lambda: {'score': 0})
         # Save the tags and their score
         for section in self.result.sections:

{assemblyline-4.3.2.dev44 → assemblyline-4.3.2.dev45/assemblyline.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline
-Version: 4.3.2.dev44
+Version: 4.3.2.dev45
 Summary: Assemblyline 4 - Automated malware analysis framework
 Home-page: https://github.com/CybercentreCanada/assemblyline-base
 Author: CCCS Assemblyline development team

assemblyline-4.3.2.dev44/assemblyline/VERSION

@@ -1 +0,0 @@
-4.3.2.dev44