assemblyline 4.7.0.dev0__tar.gz → 4.7.0.dev3__tar.gz

{assemblyline-4.7.0.dev0/assemblyline.egg-info → assemblyline-4.7.0.dev3}/PKG-INFO

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

assemblyline-4.7.0.dev3/assemblyline/VERSION

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

assemblyline-4.7.0.dev3/assemblyline/common/version.py

@@ -0,0 +1,20 @@
+"""
+Try to find the version of the code base that is running or assume an arbitrary one for testing.
+"""
+import os
+import re
+
+
+ASSEMBLYLINE_VERSION = os.environ.get('ASSEMBLYLINE_VERSION', "4.0.0.dev0")
+
+PATTERN = r'v?(?P<framework>[0-9]+)\.(?P<system>[0-9]+)\.(?P<minor>[0-9]+)\.(?P<channel>dev|stable)?(?P<build>[0-9]+)'
+
+matching = re.match(PATTERN, ASSEMBLYLINE_VERSION, re.IGNORECASE)
+if matching:
+    groups = matching.groupdict()
+else:
+    raise EnvironmentError("Could not process the ASSEMBLYLINE_VERSION variable to extract a release version.")
+
+FRAMEWORK_VERSION = int(groups['framework'])
+SYSTEM_VERSION = int(groups['system'])
+BUILD_MINOR = int(groups['minor'])

{assemblyline-4.7.0.dev0 → assemblyline-4.7.0.dev3}/assemblyline/odm/models/config.py

@@ -38,6 +38,7 @@ DEFAULT_PASSWORD_REQUIREMENTS = {
     "min_length": 12
 }
 
+CIDR_REGEX = r"^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(?:3[0-2]|[12]?[0-9])$"
 
 @odm.model(index=False, store=False,
            description="Configuration block for [GC Notify](https://notification.canada.ca/) signup and password reset")
@@ -109,6 +110,8 @@ class AutoProperty(odm.Model):
 @odm.model(index=False, store=False, description="LDAP Configuration")
 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")
@@ -158,7 +161,6 @@ DEFAULT_LDAP = {
     "signature_manager_dn": None,
 }
 
-
 @odm.model(index=False, store=False, description="Internal Authentication Configuration")
 class Internal(odm.Model):
     enabled: bool = odm.Boolean(description="Internal authentication allowed?")
@@ -168,6 +170,8 @@ class Internal(odm.Model):
                                                               default=DEFAULT_PASSWORD_REQUIREMENTS,
                                                               description="Password requirements")
     signup: Signup = odm.Compound(Signup, default=DEFAULT_SIGNUP, description="Signup method")
+    ip_filter: List[str] = odm.Optional(odm.List(odm.ValidatedKeyword(CIDR_REGEX)),
+                                        description="List of CIDRs allowed to access internal authentication")
 
 
 DEFAULT_INTERNAL = {
@@ -196,6 +200,8 @@ class OAuthProvider(odm.Model):
     auto_properties: List[AutoProperty] = odm.List(odm.Compound(AutoProperty), default=[],
                                                    description="Automatic role and classification assignments")
     app_provider: AppProvider = odm.Optional(odm.Compound(AppProvider))
+    ip_filter: List[str] = odm.Optional(odm.List(odm.ValidatedKeyword(CIDR_REGEX)),
+                                        description="List of CIDRs allowed to access internal authentication")
     uid_randomize: bool = odm.Boolean(default=False,
                                       description="Should we generate a random username for the authenticated user?")
     uid_randomize_digits: int = odm.Integer(default=0,
@@ -472,6 +478,8 @@ class SAMLAttributes(odm.Model):
 @odm.model(index=False, store=False, description="SAML Configuration")
 class SAML(odm.Model):
     enabled: bool = odm.Boolean(description="Enable use of SAML?")
+    ip_filter: List[str] = odm.Optional(odm.List(odm.ValidatedKeyword(CIDR_REGEX)),
+                                        description="List of CIDRs allowed to access internal authentication")
     auto_create: bool = odm.Boolean(description="Auto-create users if they are missing", default=True)
     auto_sync: bool = odm.Boolean(
         description="Should we automatically sync with SAML server on each login?", default=True)
@@ -1252,7 +1260,8 @@ class System(odm.Model):
     constants: str = odm.Keyword(description="Module path to the assemblyline constants")
     organisation: str = odm.Text(description="Organisation acronym used for signatures")
     type: str = odm.Enum(values=['production', 'staging', 'development'], description="Type of system")
-
+    support_link: str = odm.URI(default="https://cybercentrecanada.github.io/assemblyline4_docs/",
+                                description="Support link for the system")
 
 DEFAULT_SYSTEM = {
     "constants": "assemblyline.common.constants",

{assemblyline-4.7.0.dev0 → assemblyline-4.7.0.dev3/assemblyline.egg-info}/PKG-INFO

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

assemblyline-4.7.0.dev0/assemblyline/VERSION

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

assemblyline-4.7.0.dev0/assemblyline/common/version.py

@@ -1,3 +0,0 @@
-FRAMEWORK_VERSION = 4
-SYSTEM_VERSION = 6
-BUILD_MINOR = 0