assemblyline-ui 4.6.1.2__py3-none-any.whl → 4.7.0.dev45__py3-none-any.whl

assemblyline_ui/VERSION

@@ -1 +1 @@
-4.6.1.2
+4.7.0.dev45

assemblyline_ui/api/v4/user.py

@@ -223,10 +223,6 @@ def who_am_i(**kwargs):
                 if src.auto_select:
                     file_sources[hash_type]["auto_selected"].append(src.name)
 
-    # Backwards-compat: Merge sha256_sources with file_sources
-    [file_sources["sha256"]["sources"].append(x.name) for x in config.submission.sha256_sources
-     if CLASSIFICATION.is_accessible(kwargs['user']['classification'], x.classification)]
-
     # Prepare submission profile configurations for UI
     submission_profiles = {}
     for name, profile in SUBMISSION_PROFILES.items():

assemblyline_ui/helper/result.py

@@ -6,8 +6,19 @@ from assemblyline.common.classification import InvalidClassification
 from assemblyline.common.tagging import tag_dict_to_list
 
 
-JSON_SECTIONS = ["GRAPH_DATA", "URL", "JSON", "KEY_VALUE", "PROCESS_TREE",
-                 "TABLE", "IMAGE", "MULTI", "ORDERED_KEY_VALUE", "TIMELINE"]
+JSON_SECTIONS = [
+    "GRAPH_DATA",
+    "IMAGE",
+    "JSON",
+    "KEY_VALUE",
+    "MULTI",
+    "ORDERED_KEY_VALUE",
+    "PROCESS_TREE",
+    "SANDBOX",
+    "TABLE",
+    "TIMELINE"
+    "URL",
+]
 
 
 class InvalidSectionList(Exception):

assemblyline_ui/helper/submission.py

@@ -70,8 +70,8 @@ except socket.gaierror:
 # download functions
 class FileTooBigException(Exception):
     def __init__(self, file_size, *args):
-        super().__init__(msg=f"File too big to be scanned ({file_size} > {config.submission.max_file_size}).", *args)
-    pass
+        super().__init__(f"File too big to be scanned ({file_size} > {config.submission.max_file_size}).", *args)
+
 
 class InvalidUrlException(Exception):
     pass
@@ -80,6 +80,7 @@ class InvalidUrlException(Exception):
 class ForbiddenLocation(Exception):
     pass
 
+
 def apply_changes_to_profile(profile: SubmissionProfile, updates: dict, user: dict) -> dict:
     validated_profile = profile.params.as_primitives(strip_null=True)
     # Preserve the original updates for later comparison
@@ -378,21 +379,11 @@ def fetch_file(method: str, input: str, user: dict, s_params: dict, metadata: di
             # No external sources specified and the file being asked for doesn't exist in the system
             raise FileNotFoundError(f"{method.upper()} does not exist in Assemblyline")
         else:
-            if method == "sha256":
-                # Legacy support: Merge the sources from `sha256_sources` + `file_sources` that support SHA256 fetching
-                available_sources = [x for x in config.submission.sha256_sources
-                                    if CLASSIFICATION.is_accessible(user['classification'], x.classification) and
-                                    x.name in default_external_sources] + \
-                                    [x for x in config.submission.file_sources
-                                    if "sha256" in x.hash_types and
-                                    CLASSIFICATION.is_accessible(user['classification'], x.classification)
-                                    and x.name in default_external_sources]
-            else:
-                # Otherwise go based on the `file_sources` configuration
-                available_sources = [x for x in config.submission.file_sources
-                                    if method in x.hash_types and
-                                    CLASSIFICATION.is_accessible(user['classification'], x.classification)
-                                    and x.name in default_external_sources]
+            # Gather the list of available sources for this fetch method
+            available_sources = [x for x in config.submission.file_sources
+                                if method in x.hash_types and
+                                CLASSIFICATION.is_accessible(user['classification'], x.classification)
+                                and x.name in default_external_sources]
 
             for source in available_sources:
                 # Building final URL and data block

assemblyline_ui/security/ldap_auth.py

@@ -40,11 +40,6 @@ class BasicLDAPWrapper(object):
         self.group_lookup_with_uid = ldap_config.group_lookup_with_uid
         self.bind_user = ldap_config.bind_user
         self.bind_pass = ldap_config.bind_pass
-        self.admin_dn = ldap_config.admin_dn
-        self.sm_dn = ldap_config.signature_manager_dn
-        self.si_dn = ldap_config.signature_importer_dn
-
-        self.classification_mappings = ldap_config.classification_mappings
 
         self.cache = {}
         self.get_obj_cache = {}
@@ -65,38 +60,6 @@ class BasicLDAPWrapper(object):
         group_list.append(dn)
         return group_list
 
-    def get_user_types(self, group_dn_list):
-        user_type = []
-
-        if self.admin_dn in group_dn_list:
-            user_type.append('admin')
-        elif self.sm_dn in group_dn_list:
-            user_type.append('signature_manager')
-        else:
-            user_type.append('user')
-
-        if self.si_dn in group_dn_list:
-            user_type.append('signature_importer')
-
-        return user_type
-
-    def get_user_classification(self, group_dn_list):
-        """
-        Extend the users classification information with the configured group information
-
-        NB: This is not fully implemented at this point
-
-        :param group_dn_list: list of DNs the user is member of
-        :return:
-        """
-
-        ret = CLASSIFICATION.UNRESTRICTED
-        for group_dn in group_dn_list:
-            if group_dn in self.classification_mappings:
-                ret = CLASSIFICATION.build_user_classification(ret, self.classification_mappings[group_dn])
-
-        return ret
-
     def get_object(self, ldap_object, ldap_server=None):
         cur_time = int(time.time())
         cache_entry = self.get_obj_cache.get(ldap_object, None)
@@ -150,14 +113,14 @@ class BasicLDAPWrapper(object):
                 details['groups'] = self.get_group_list(user, dn, ldap_server=ldap_server)
 
                 # Generate user details based off auto-properties configuration
-                access, user_type, roles, organization, groups, remove_roles, quotas, classification, default_metadata = process_autoproperties(config.auth.ldap.auto_properties, details, self.get_user_classification(details['groups']))
+                access, user_type, roles, organization, groups, remove_roles, quotas, classification, default_metadata = process_autoproperties(config.auth.ldap.auto_properties, details, CLASSIFICATION.UNRESTRICTED)
 
                 # if not user type was assigned
                 if not user_type:
                     # if also no roles were assigned
                     if not roles:
                         # Set the default user type
-                        user_type = self.get_user_types(details['groups'])
+                        user_type = ['user']
                     else:
                         # Because roles were assigned set user type to custom
                         user_type = ['custom']

{assemblyline_ui-4.6.1.2.dist-info → assemblyline_ui-4.7.0.dev45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-ui
-Version: 4.6.1.2
+Version: 4.7.0.dev45
 Summary: Assemblyline 4 - API and Socket IO server
 Home-page: https://github.com/CybercentreCanada/assemblyline-ui/
 Author: CCCS Assemblyline development team

{assemblyline_ui-4.6.1.2.dist-info → assemblyline_ui-4.7.0.dev45.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_ui/VERSION,sha256=IDqnLl2xWfWns_eN0jAQigvXBZ_1LLKIElB9U1x3NQQ,8
+assemblyline_ui/VERSION,sha256=Z2ta08db4ev7E3qRUvrl-AOVvY9BtYJt3-5Ci2Z82sE,12
 assemblyline_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_ui/app.py,sha256=ok96rpL0-Hb5amqa7ojhuB0boQceZG7E32NX6LZm-f4,7849
 assemblyline_ui/config.py,sha256=4M5wpG_OwJPjZAjRWIUMMyF4KG30oJidNDnFM-IVJCw,8927
@@ -41,17 +41,17 @@ assemblyline_ui/api/v4/submission.py,sha256=WxMY00ePNdOMFXyu9j38sxpe0vT26u-Z_biM
 assemblyline_ui/api/v4/submit.py,sha256=5nfuX6Ud3FMdDGIOgBAdcb6kpMbINk750Ph5yp90O8c,18372
 assemblyline_ui/api/v4/system.py,sha256=4JhLhpmPfKzbXiHsBoJxSZP-ibu-lnmk4FrtaLExaRM,24861
 assemblyline_ui/api/v4/ui.py,sha256=J3OoLEETlFgeq7DbSlubTPebMQJOUx6UwRIt8mCBYbQ,11508
-assemblyline_ui/api/v4/user.py,sha256=L98TCUEXeqzy3y4ER6UeK9hb2_vZR2qefr-kfUWunIs,48140
+assemblyline_ui/api/v4/user.py,sha256=94yE9rq2XnWgf1N8AEHPbMWiP23yCgzFvZ1nm0Ka7f0,47890
 assemblyline_ui/api/v4/webauthn.py,sha256=ouVWMMd0aMnNV5iaKbWY1AnsUE5_BKAtaUg9j77Rvow,4875
 assemblyline_ui/api/v4/workflow.py,sha256=Uz50960KyvFDm39NKYNSq5OXT0CA0u_FO5xPP61aYiQ,10579
 assemblyline_ui/helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_ui/helper/discover.py,sha256=oJBML1dQl0H2Ic-lm5jI4YWIpm9RRW-mGT5sP-2tb9c,1686
 assemblyline_ui/helper/oauth.py,sha256=0xd2H2L1r2vrkBOn9Q77TqNB1T11cXxAQLbya_EDtLs,5168
-assemblyline_ui/helper/result.py,sha256=u79F3IKN1EcVOkfk1CvQNEwbIWyiq9Wj8OHp3zuwmBc,4926
+assemblyline_ui/helper/result.py,sha256=SBVttN4kXLjTI_0YKAlsCnLYnfAcoKU_76gT9c6ErBI,4966
 assemblyline_ui/helper/search.py,sha256=ri3IpUEnNyzrYYIx0Eb-2lQG-42QhG1YFUDAtpMB5-g,1762
 assemblyline_ui/helper/service.py,sha256=NSNK25rVUpsF7ElfzWZl4Ro7VQItmEB_JbBfnhSxmwo,5176
 assemblyline_ui/helper/signature.py,sha256=PUiQk56QoY5Ye2Pg3jRNgOT2i2ZqTWkk_0dv-Bfy9vI,899
-assemblyline_ui/helper/submission.py,sha256=Xltl6ogioTNswUmyjpVXacXvuOSfrFZIJMuwwipZQpA,33433
+assemblyline_ui/helper/submission.py,sha256=fZ-XuH1TkiyzPOJMUAYmcIHHXbGWANDknbeWsHQc-Ms,32632
 assemblyline_ui/helper/user.py,sha256=d5umOq5GcvsIUuxjeW4_2xbzjEwoAdcSyHswpE5rCO4,17462
 assemblyline_ui/helper/ai/__init__.py,sha256=m2Nb3UgSiXNz3l6rUX17BlKwT1YLjAHn7W87SWP8e9o,1052
 assemblyline_ui/helper/ai/base.py,sha256=0aAecNUh6jxuqlNoZzZDbnPMuqZUzh5hCKt1hpdFvLg,8801
@@ -60,7 +60,7 @@ assemblyline_ui/helper/ai/openai.py,sha256=37MNSMiJha9SVCDGIqYGF2Y-pYjhulhvzHPuA
 assemblyline_ui/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_ui/security/apikey_auth.py,sha256=-KX7Ps1XYTP7Bgv6Dn290IEMJ7UBxHFJihILMpdf9zs,2214
 assemblyline_ui/security/authenticator.py,sha256=Lra3F9HJ2PU-A9lRY5_purqkUXZ3QRbKf8mDc6Zdq4o,7911
-assemblyline_ui/security/ldap_auth.py,sha256=NOQgaBRRUF4bO4Y8WnaCWUgGneAUgWeZn7lLMJ63NYU,11364
+assemblyline_ui/security/ldap_auth.py,sha256=xEDPA3wD_HKNqdMYenBijM_ZvP8G-CUHyGoWYiBSeP4,10097
 assemblyline_ui/security/oauth_auth.py,sha256=SrPHUX6A_J9rrQsZaZDdkHQ1nn9WvbYmsjEp4gPcIaU,4701
 assemblyline_ui/security/saml_auth.py,sha256=w5GAhGDJzW2VzjPhBLM6v2dfprcqSoG8TTG06msEfa8,2241
 assemblyline_ui/security/second_factor_auth.py,sha256=l3SjJ5vn3bYxkPTtKWLewbZUSWtm1REqllzZvvsh9BU,2953
@@ -74,8 +74,8 @@ assemblyline_ui/sio/live_submission.py,sha256=mS0oGO5rEA8PLa8kjBcodOG-Q0CG4SpYAo
 assemblyline_ui/sio/retrohunt.py,sha256=vlH_x6Rb4pm3GM1sNLH1C42-NVR3VoAsEfkAu3L30fY,2146
 assemblyline_ui/sio/status.py,sha256=_Bxf1KLPOJEUIk4J9_j9fzvQWUXqSIT9xnJKhT1hhuc,1980
 assemblyline_ui/sio/submission.py,sha256=IYJuGz73HK9HtYfqc-gWW8tc1lt5VZ62Qn64AaGGtm8,2222
-assemblyline_ui-4.6.1.2.dist-info/licenses/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_ui-4.6.1.2.dist-info/METADATA,sha256=eIXaEb7owUjI86YMr7DV0Nc_DjtNfJHH3JLaYBa_PmI,8170
-assemblyline_ui-4.6.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-assemblyline_ui-4.6.1.2.dist-info/top_level.txt,sha256=WLa7-PKLJTbMUbKKU3q3kg5_uAV67hss5kC71PAbIeg,16
-assemblyline_ui-4.6.1.2.dist-info/RECORD,,
+assemblyline_ui-4.7.0.dev45.dist-info/licenses/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_ui-4.7.0.dev45.dist-info/METADATA,sha256=aBDpRp-qLOlAoaBOta_MYAHWfFn933YYd6D21YEdQ84,8174
+assemblyline_ui-4.7.0.dev45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+assemblyline_ui-4.7.0.dev45.dist-info/top_level.txt,sha256=WLa7-PKLJTbMUbKKU3q3kg5_uAV67hss5kC71PAbIeg,16
+assemblyline_ui-4.7.0.dev45.dist-info/RECORD,,