assemblyline 4.7.0.dev5__tar.gz → 4.7.0.dev6__tar.gz

{assemblyline-4.7.0.dev5/assemblyline.egg-info → assemblyline-4.7.0.dev6}/PKG-INFO

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

assemblyline-4.7.0.dev6/assemblyline/VERSION

@@ -0,0 +1 @@
+4.7.0.dev6

{assemblyline-4.7.0.dev5 → assemblyline-4.7.0.dev6}/assemblyline/odm/models/config.py

@@ -112,7 +112,6 @@ class LDAP(odm.Model):
     enabled: bool = odm.Boolean(description="Should LDAP be enabled or not?")
     ip_filter: List[str] = odm.Optional(odm.List(odm.ValidatedKeyword(CIDR_REGEX)),
                                         description="List of CIDRs allowed to access internal authentication")
-    admin_dn: str = odm.Optional(odm.Keyword(), description="DN of the group or the user who will get admin privileges")
     bind_user: str = odm.Optional(odm.Keyword(), description="User use to query the LDAP server")
     bind_pass: str = odm.Optional(odm.Keyword(), description="Password used to query the LDAP server")
     auto_create: bool = odm.Boolean(description="Auto-create users if they are missing")
@@ -120,19 +119,12 @@ class LDAP(odm.Model):
     auto_properties: List[AutoProperty] = odm.List(odm.Compound(AutoProperty), default=[],
                                                    description="Automatic role and classification assignments")
     base: str = odm.Keyword(description="Base DN for the users")
-    classification_mappings: Dict[str, str] = odm.Any(description="Classification mapping")
     email_field: str = odm.Keyword(description="Name of the field containing the email address")
     group_lookup_query: str = odm.Keyword(description="How the group lookup is queried")
     group_lookup_with_uid: bool = odm.Boolean(description="Use username/uid instead of dn for group lookup")
     image_field: str = odm.Keyword(description="Name of the field containing the user's avatar")
     image_format: str = odm.Keyword(description="Type of image used to store the avatar")
     name_field: str = odm.Keyword(description="Name of the field containing the user's name")
-    signature_importer_dn: str = odm.Optional(
-        odm.Keyword(),
-        description="DN of the group or the user who will get signature_importer role")
-    signature_manager_dn: str = odm.Optional(
-        odm.Keyword(),
-        description="DN of the group or the user who will get signature_manager role")
     uid_field: str = odm.Keyword(description="Field name for the UID")
     uri: str = odm.Keyword(description="URI to the LDAP server")
 
@@ -153,12 +145,6 @@ DEFAULT_LDAP = {
     "name_field": "cn",
     "uid_field": "uid",
     "uri": "ldap://localhost:389",
-
-    # Deprecated
-    "admin_dn": None,
-    "classification_mappings": {},
-    "signature_importer_dn": None,
-    "signature_manager_dn": None,
 }
 
 @odm.model(index=False, store=False, description="Internal Authentication Configuration")
@@ -2187,11 +2173,6 @@ class Submission(odm.Model):
     max_temp_data_length: int = odm.Integer(description="Maximum length for each temporary data values")
     metadata: MetadataConfig = odm.Compound(MetadataConfig, default=DEFAULT_METADATA_CONFIGURATION,
                                             description="Metadata compliance rules")
-    sha256_sources: List[Sha256Source] = odm.List(
-        odm.Compound(Sha256Source),
-        default=[],
-        description="List of external source to fetch file via their SHA256 hashes",
-        deprecation="Use submission.file_sources which is an extension of this configuration")
     file_sources: List[FileSource] = odm.List(
         odm.Compound(FileSource),
         default=[],
@@ -2225,7 +2206,6 @@ DEFAULT_SUBMISSION = {
     'max_metadata_length': 4096,
     'max_temp_data_length': 4096,
     'metadata': DEFAULT_METADATA_CONFIGURATION,
-    'sha256_sources': [],
     'file_sources': [],
     'tag_types': DEFAULT_TAG_TYPES,
     'verdicts': DEFAULT_VERDICTS,

{assemblyline-4.7.0.dev5 → assemblyline-4.7.0.dev6}/assemblyline/odm/models/user.py

@@ -223,14 +223,6 @@ def load_roles(types, curRoles):
     return list(roles)
 
 
-# This APIKey model can be removed after Assemblyline v4.6
-@odm.model(index=False, store=False, description="Model for API keys")
-class ApiKey(odm.Model):
-    acl = odm.List(odm.Enum(values=ACL_MAP.keys()), description="Access Control List for the API key")
-    password = odm.Keyword(description="BCrypt hash of the password for the apikey")
-    roles = odm.List(odm.Enum(values=USER_ROLES), default=[], description="List of roles tied to the API key")
-
-
 @odm.model(index=False, store=False, description="Model of Apps used of OBO (On Behalf Of)")
 class Apps(odm.Model):
     client_id = odm.Keyword(description="Username allowed to impersonate the current user")
@@ -249,7 +241,6 @@ class User(odm.Model):
         store=False, description="Maximum number of concurrent API requests (0: No Quota)"))
     api_daily_quota = odm.Optional(odm.Integer(
         store=False, description="Maximum number of API calls a user can do daily (0: No Quota)"))
-    apikeys = odm.Mapping(odm.Compound(ApiKey), default={}, index=False, store=False, description="Mapping of API keys")
     apps = odm.Mapping(odm.Compound(Apps), default={}, index=False, store=False,
                        description="Applications with access to the account")
     can_impersonate = odm.Boolean(default=False, index=False, store=False,
@@ -283,6 +274,3 @@ class User(odm.Model):
     security_tokens = odm.Mapping(odm.Keyword(), index=False, store=False, default={},
                                   description="Map of security tokens")
     uname = odm.Keyword(copyto="__text__", description="Username")
-    # can be removed after Assemblyline v4.6
-    apikeys = odm.Mapping(odm.Compound(ApiKey), default={},
-                        index=False, store=False)

{assemblyline-4.7.0.dev5 → assemblyline-4.7.0.dev6/assemblyline.egg-info}/PKG-INFO

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

assemblyline-4.7.0.dev5/assemblyline/VERSION

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