assemblyline-v4-service 4.4.1.dev79__py3-none-any.whl → 4.4.1.dev81__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.1.dev79
+4.4.1.dev81

assemblyline_v4_service/common/dynamic_service_helper.py

@@ -19,11 +19,17 @@ from assemblyline.odm.models.ontology.results import NetworkConnection as Networ
 from assemblyline.odm.models.ontology.results import Process as ProcessModel
 from assemblyline.odm.models.ontology.results import Sandbox as SandboxModel
 from assemblyline.odm.models.ontology.results import Signature as SignatureModel
+
 # from assemblyline_v4_service.common.balbuzard.patterns import PatternMatch
 from assemblyline_v4_service.common.base import ServiceBase
 from assemblyline_v4_service.common.request import ServiceRequest
-from assemblyline_v4_service.common.result import (ProcessItem, ResultProcessTreeSection, ResultSection,
-                                                   ResultTableSection, TableRow)
+from assemblyline_v4_service.common.result import (
+    ProcessItem,
+    ResultProcessTreeSection,
+    ResultSection,
+    ResultTableSection,
+    TableRow,
+)
 from assemblyline_v4_service.common.safelist_helper import URL_REGEX, is_tag_safelisted
 from assemblyline_v4_service.common.tag_helper import add_tag
 from assemblyline_v4_service.common.task import MaxExtractedExceeded
@@ -3526,7 +3532,7 @@ def extract_iocs_from_text_blob(
     # TODO: Are we missing IOCs to the point where we need a different regex?
     # uris = {uri.decode() for uri in set(findall(PatternMatch.PAT_URI_NO_PROTOCOL, blob.encode()))} - domains - ips
     uris = set(findall(URL_REGEX, blob)) - domains - ips
-    for ip in ips:
+    for ip in sorted(ips):
         if add_tag(result_section, f"network.{network_tag_type}.ip", ip, safelist):
             if not result_section.section_body.body:
                 result_section.add_row(TableRow(ioc_type="ip", ioc=ip))
@@ -3535,7 +3541,7 @@ def extract_iocs_from_text_blob(
                 not in result_section.section_body.body
             ):
                 result_section.add_row(TableRow(ioc_type="ip", ioc=ip))
-    for domain in domains:
+    for domain in sorted(domains):
         if enforce_char_min and len(domain) < MIN_DOMAIN_CHARS:
             continue
         if enforce_domain_char_max and len(domain) > MAX_DOMAIN_CHARS:
@@ -3567,7 +3573,7 @@ def extract_iocs_from_text_blob(
             ):
                 result_section.add_row(TableRow(ioc_type="domain", ioc=domain))
 
-    for uri in uris:
+    for uri in sorted(uris):
         if enforce_char_min and len(uri) < MIN_URI_CHARS:
             continue
         if any(invalid_uri_char in uri for invalid_uri_char in ['"', "'", '<', '>', "(", ")"]):

{assemblyline_v4_service-4.4.1.dev79.dist-info → assemblyline_v4_service-4.4.1.dev81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-v4-service
-Version: 4.4.1.dev79
+Version: 4.4.1.dev81
 Summary: Assemblyline 4 - Service base
 Home-page: https://github.com/CybercentreCanada/assemblyline-v4-service/
 Author: CCCS Assemblyline development team

{assemblyline_v4_service-4.4.1.dev79.dist-info → assemblyline_v4_service-4.4.1.dev81.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=gOAGIcjdDCcgrl5mxRmip9PlUodjfvRrrY1Fe3iouZk,12
+assemblyline_v4_service/VERSION,sha256=lsRUmk04w_NFGdJDzfEXMuhZB97v5NQLX_WVLgezaS8,12
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=3QGBg0EZuXC6UN411HFwpLNEop9UvS9feFhvBUTP-k4,1576
 assemblyline_v4_service/run_privileged_service.py,sha256=9uTfHetXR5G-EDKMDrgfWUOw34yr64-cj6Cm9eZaCbQ,14547
@@ -6,7 +6,7 @@ assemblyline_v4_service/run_service.py,sha256=RCqxdm-OAwJhl15BnKFkuavpQ5k6eTX3ZG
 assemblyline_v4_service/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/common/api.py,sha256=U908p3wlW9fEydx77GgI2E-6wW6T8Nc3R91nNOKU0H0,4453
 assemblyline_v4_service/common/base.py,sha256=STzfZ9dwqvbgbKiFs-aLk05pdhyK6Psz4hZ3_fOmQYM,13039
-assemblyline_v4_service/common/dynamic_service_helper.py,sha256=vgIAY9z4zCBJA2riG0nGKyLZ1bWhXSSoM01riDEu_cI,147464
+assemblyline_v4_service/common/dynamic_service_helper.py,sha256=OhxSnSOjUB_iSkMahHbPQEll9sl5wLuCFwwykvV-Kno,147461
 assemblyline_v4_service/common/helper.py,sha256=Fgimk8DhnS23aijTGewA1HwvPoAM61UUbHlrGBnSzL0,3290
 assemblyline_v4_service/common/icap.py,sha256=phT3CT5uII3Qm90Nzi4O-eDkQ2jmr3zHcVVra4sqYSc,5376
 assemblyline_v4_service/common/keytool_parse.py,sha256=e829hrNNG5LFw1kjLsYVZsafCm2S3NpgM6jBc6JKawY,2219
@@ -47,8 +47,8 @@ assemblyline_v4_service/updater/app.py,sha256=Ass5DZtOCr0tdoRbLo7Qn8Ujlw8T8mUDro
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=JD0gX3KHY-wvsFjTbWkT83F0d5Up3OfubMPinuNzbTQ,9069
 assemblyline_v4_service/updater/updater.py,sha256=AQ3aTm5nhb-RXWjm5w1RIZM3j3UQJ4Vr4bVJ6Z2rX8A,29322
-assemblyline_v4_service-4.4.1.dev79.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.1.dev79.dist-info/METADATA,sha256=nB-fk4Yx04uOOnkWIgy3GBcgCWJDAWo6hocpwKTNGS8,9359
-assemblyline_v4_service-4.4.1.dev79.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-assemblyline_v4_service-4.4.1.dev79.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
-assemblyline_v4_service-4.4.1.dev79.dist-info/RECORD,,
+assemblyline_v4_service-4.4.1.dev81.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.1.dev81.dist-info/METADATA,sha256=_8o69m85obCPoDfZCPK8A_4K6e8LpBGujqwnmd_zJXk,9359
+assemblyline_v4_service-4.4.1.dev81.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+assemblyline_v4_service-4.4.1.dev81.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
+assemblyline_v4_service-4.4.1.dev81.dist-info/RECORD,,