assemblyline 4.6.0.dev5__tar.gz → 4.6.0.dev7__tar.gz

{assemblyline-4.6.0.dev5/assemblyline.egg-info → assemblyline-4.6.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline
-Version: 4.6.0.dev5
+Version: 4.6.0.dev7
 Summary: Assemblyline 4 - Automated malware analysis framework
 Home-page: https://github.com/CybercentreCanada/assemblyline-base
 Author: CCCS Assemblyline development team

assemblyline-4.6.0.dev7/assemblyline/VERSION

@@ -0,0 +1 @@
+4.6.0.dev7

{assemblyline-4.6.0.dev5 → assemblyline-4.6.0.dev7}/assemblyline/odm/base.py

@@ -1205,7 +1205,7 @@ class Model:
 
         # Determine the type of Field we're dealing with
         # if possible return the Model class if wrapped in Compound
-        def get_type(field_class: _Field) -> Tuple(str, Model):
+        def get_type(field_class: _Field) -> Tuple[str, Model]:
             if field_class.__class__ == Optional:
                 return get_type(field_class.child_type)
             elif field_class.__class__ == Compound:

{assemblyline-4.6.0.dev5 → assemblyline-4.6.0.dev7}/assemblyline/odm/messages/task.py

@@ -1,7 +1,8 @@
 from assemblyline import odm
-from assemblyline.common import forge, constants
+from assemblyline.common import constants, forge
 from assemblyline.odm.models.config import ServiceSafelist
 from assemblyline.odm.models.file import URIInfo
+
 Classification = forge.get_classification()
 
 MSG_TYPES = {"Task"}
@@ -61,11 +62,6 @@ class Task(odm.Model):
         default=False,
         description="Whether the service should ignore recursion prevention or not")
 
-    # TODO: The following three lines can be removed after assemblyline upgrade to version 4.6+
-    ignore_dynamic_recursion_prevention = odm.Boolean(
-        default=False,
-        description="Whether the service should ignore dynamic recursion prevention or not")
-
     ignore_filtering = odm.Boolean(default=False, description="Should the service filter it's output?")
 
     priority = odm.Integer(default=1, description="Priority for processing order",

{assemblyline-4.6.0.dev5 → assemblyline-4.6.0.dev7}/assemblyline/odm/models/config.py

@@ -511,14 +511,6 @@ DEFAULT_AUTH = {
 @odm.model(index=False, store=False, description="Alerter Configuration")
 class Alerter(odm.Model):
     alert_ttl: int = odm.integer(description="Time to live (days) for an alert in the system")
-    constant_alert_fields: List[str] = odm.sequence(
-        odm.keyword(), default=[],
-        description="List of fields that should not change during an alert update",
-        deprecation="This behavior is no longer configurable")
-    constant_ignore_keys: List[str] = odm.sequence(
-        odm.keyword(), default=[],
-        description="List of keys to ignore in the constant alert fields.",
-        deprecation="This behavior is no longer configurable")
     default_group_field: str = odm.keyword(description="Default field used for alert grouping view")
     delay: int = odm.integer(
         description="Time in seconds that we give extended scans and workflow to complete their work "
@@ -535,8 +527,6 @@ class Alerter(odm.Model):
 
 DEFAULT_ALERTER = {
     "alert_ttl": 90,
-    "constant_alert_fields": [],
-    "constant_ignore_keys": [],
     "default_group_field": "file.sha256",
     "delay": 300,
     "filtering_group_fields": [
@@ -773,19 +763,11 @@ DEFAULT_ARCHIVER_WEBHOOK = {
 class Archiver(odm.Model):
     alternate_dtl: int = odm.Integer(description="Alternate number of days to keep the data in the "
                                                  "malware archive. (0: Disabled, will keep data forever)")
-    metadata: Dict = odm.Mapping(
-        odm.Compound(ArchiverMetadata),
-        description="Proxy configuration that is passed to Python Requests",
-        deprecation="The configuration for the archive metadata validation and requirements has moved to"
-                    "`submission.metadata.archive`.")
     minimum_required_services: List[str] = odm.List(
         odm.keyword(),
         default=[],
         description="List of minimum required service before archiving takes place")
     webhook = odm.Optional(odm.Compound(Webhook), description="Webhook to call before triggering the archiving process")
-    use_metadata: bool = odm.Boolean(
-        default=False, description="Should the UI ask form metadata to be filed out when archiving",
-        deprecation="This field is no longer required...")
     use_webhook: bool = odm.Optional(odm.Boolean(
         default=False,
         description="Should the archiving go through the webhook prior to actually trigger the archiving function"))
@@ -793,10 +775,8 @@ class Archiver(odm.Model):
 
 DEFAULT_ARCHIVER = {
     'alternate_dtl': 0,
-    'metadata': {},
     'minimum_required_services': [],
     'use_webhook': False,
-    'use_metadata': False,
     'webhook': DEFAULT_ARCHIVER_WEBHOOK
 }
 
@@ -843,18 +823,6 @@ class Mount(odm.Model):
     resource_name: str = odm.Optional(odm.Keyword(), description="Name of resource (Kubernetes only)")
     resource_key: str = odm.Optional(odm.Keyword(), description="Key of ConfigMap/Secret (Kubernetes only)")
 
-    # TODO: Deprecate in next major change in favour of general configuration above for mounting Kubernetes resources
-    config_map: str = odm.Optional(
-        odm.Keyword(),
-        description="Name of ConfigMap (Kubernetes only)",
-        deprecation="Use `resource_type: configmap` and fill in the `resource_name` "
-        "& `resource_key` fields to mount ConfigMaps")
-    key: str = odm.Optional(
-        odm.Keyword(),
-        description="Key of ConfigMap (Kubernetes only)",
-        deprecation="Use `resource_type: configmap` and fill in the `resource_name` "
-        "& `resource_key` fields to mount ConfigMaps")
-
 
 KUBERNETES_TOLERATION_OPS = ['Exists', 'Equal']
 KUBERNETES_TOLERATION_EFFECTS = ['NoSchedule', 'PreferNoSchedule', 'NoExecute']
@@ -1246,12 +1214,6 @@ class Services(odm.Model):
     safelist = odm.Compound(ServiceSafelist)
     registries = odm.Optional(odm.List(odm.Compound(ServiceRegistry)),
                               description="Global set of registries for services")
-    service_account = odm.optional(odm.keyword(),
-                                   description="Service account to use for pods in kubernete"
-                                   "where the service does not have one configured.",
-                                   deprecation="Use helm values to specify service accounts settings for "
-                                   "(non-)privileged services: "
-                                   "`privilegedServiceAccountName`, `unprivilegedServiceAccountName`")
 
 
 DEFAULT_SERVICES = {
@@ -2068,7 +2030,7 @@ class SubmissionProfileParams(odm.Model):
 
 
 DEFAULT_RESTRICTED_PARAMS = {
-    # Default privilege params that are used in all profiles
+    # Default restricted params that are used in all profiles
     "submission": ["ignore_recursion_prevention"],
     "APKaye": ["resubmit_apk_as_jar"],
     "AVClass": ["include_malpedia_dataset"],

{assemblyline-4.6.0.dev5 → assemblyline-4.6.0.dev7}/assemblyline/odm/models/submission.py

@@ -1,7 +1,10 @@
 from __future__ import annotations
+
 import hashlib
+
 from assemblyline import odm
-from assemblyline.common import forge, constants
+from assemblyline.common import constants, forge
+
 Classification = forge.get_classification()
 
 SUBMISSION_STATES = ['failed', 'submitted', 'completed']
@@ -33,8 +36,6 @@ _KEY_HASHED_FIELDS = {
     'deep_scan',
     'ignore_cache',
     'ignore_recursion_prevention',
-    # TODO: This one line can be removed after assemblyline upgrade to version 4.6+
-    'ignore_dynamic_recursion_prevention',
     'ignore_filtering',
     'ignore_size',
     'max_extracted',
@@ -51,13 +52,7 @@ class SubmissionParams(odm.Model):
     generate_alert = odm.Boolean(default=False, description="Should this submission generate an alert?")
     groups = odm.List(odm.Keyword(), default=[], description="List of groups related to this scan")
     ignore_cache = odm.Boolean(default=False, description="Ignore the cached service results?")
-    ignore_recursion_prevention = odm.Boolean(
-        default=False, description="Should we ignore recursion prevention?")
-
-    # TODO: The following three lines can be removed after assemblyline upgrade to 4.6+
-    ignore_dynamic_recursion_prevention = odm.Boolean(
-        default=False, description="Should we ignore dynamic recursion prevention?")
-
+    ignore_recursion_prevention = odm.Boolean(default=False, description="Should we ignore recursion prevention?")
     ignore_filtering = odm.Boolean(default=False, description="Should we ignore filtering services?")
     ignore_size = odm.Boolean(default=False, description="Ignore the file size limits?")
     never_drop = odm.Boolean(default=False, description="Exempt from being dropped by ingester?")

{assemblyline-4.6.0.dev5 → assemblyline-4.6.0.dev7}/assemblyline/odm/models/user_settings.py

@@ -1,5 +1,5 @@
 from assemblyline import odm
-from assemblyline.common import forge, constants
+from assemblyline.common import constants, forge
 from assemblyline.odm.models.config import SubmissionProfileParams
 from assemblyline.odm.models.submission import ServiceSelection
 
@@ -30,10 +30,6 @@ class UserSettings(odm.Model):
                               deprecation="This will be moved to the \"default\" submission profile")
     ignore_cache = odm.Boolean(default=False, description="Ignore service caching?",
                               deprecation="This will be moved to the \"default\" submission profile")
-
-    # the following 1 line can be removed after assemblyline 4.6+
-    ignore_dynamic_recursion_prevention = odm.Boolean(default=False, description="Ignore dynamic recursion prevention?",
-                              deprecation="This is replaced by `ignore_recursion_prevention`")
     ignore_recursion_prevention = odm.Boolean(default=False, description="Ignore all service recursion prevention?",
                               deprecation="This will be moved to the \"default\" submission profile")
     ignore_filtering = odm.Boolean(default=False, description="Ignore filtering services?",
@@ -63,7 +59,6 @@ DEFAULT_USER_PROFILE_SETTINGS = {
     "expand_min_score": 500,
     "generate_alert": False,
     "ignore_cache": False,
-    "ignore_dynamic_recursion_prevention": False,
     "ignore_recursion_prevention": False,
     "ignore_filtering": False,
     "priority": 1000,

{assemblyline-4.6.0.dev5 → assemblyline-4.6.0.dev7/assemblyline.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline
-Version: 4.6.0.dev5
+Version: 4.6.0.dev7
 Summary: Assemblyline 4 - Automated malware analysis framework
 Home-page: https://github.com/CybercentreCanada/assemblyline-base
 Author: CCCS Assemblyline development team

assemblyline-4.6.0.dev5/assemblyline/VERSION

@@ -1 +0,0 @@
-4.6.0.dev5