assemblyline-v4-service 4.4.0.32__py3-none-any.whl → 4.4.0.33__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.0.32
+4.4.0.33

assemblyline_v4_service/common/utils.py

@@ -30,6 +30,13 @@ PASSWORD_STRIP = [
     "이에요",
 ]
 
+BRACKET_PAIRS = {
+    "<": ">",
+    "(": ")",
+    "[": "]",
+    "{": "}",
+}
+
 
 def set_death_signal(sig=signal.SIGTERM):
     if 'linux' not in sys.platform:
@@ -66,18 +73,31 @@ class alarm_clock:
         signal.signal(signal.SIGALRM, self.alarm_default)
 
 
+def __extract_passwords_from_lines(texts, password_word, password_regex):
+    all_passwords = set()
+    password_keyword = f"{password_word}:"
+    for line in texts:
+        if password_keyword in line.lower():
+            new_passwords = re.split(password_regex, line)
+            index = line.lower().rindex(password_keyword)
+            if index > 0 and line[index - 1] != " ":
+                special_char = line[index - 1]
+                if special_char in BRACKET_PAIRS:
+                    special_char = BRACKET_PAIRS[special_char]
+                for password in list(new_passwords):
+                    new_passwords.extend([password[:i] for i, ltr in enumerate(password) if ltr == special_char])
+            all_passwords.update(new_passwords)
+    return all_passwords
+
+
 def extract_passwords(text: str) -> set[str]:
     passwords: set[str] = set()
     text_split, text_split_n = set(text.split()), set(text.split("\n"))
     passwords.update(text_split)
     passwords.update(re.split(r"\W+", text))
     for i, r in enumerate(PASSWORD_REGEXES):
-        for line in text_split:
-            if PASSWORD_WORDS[i] in line.lower():
-                passwords.update(re.split(r, line))
-        for line in text_split_n:
-            if PASSWORD_WORDS[i] in line.lower():
-                passwords.update(re.split(r, line))
+        passwords.update(__extract_passwords_from_lines(text_split, PASSWORD_WORDS[i], r))
+        passwords.update(__extract_passwords_from_lines(text_split_n, PASSWORD_WORDS[i], r))
     for p in list(passwords):
         p = p.strip()
         # We can assume that at least one of the strip_char won't be there, to have the simple space stripping option

{assemblyline_v4_service-4.4.0.32.dist-info → assemblyline_v4_service-4.4.0.33.dist-info}/METADATA

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

{assemblyline_v4_service-4.4.0.32.dist-info → assemblyline_v4_service-4.4.0.33.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=eKNNYTJB4J79BWDGzdbvTskAiF3a2yYPrtGC7zulyaE,9
+assemblyline_v4_service/VERSION,sha256=lgrp1SniI-XfDnj1uOpVGXWCRKA4s-mEict_48tnJu4,9
 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
@@ -12,7 +12,7 @@ assemblyline_v4_service/common/ontology_helper.py,sha256=Wao4VZ_YrlmLd3-CXwqsK6c
 assemblyline_v4_service/common/request.py,sha256=oe1Z7Y1UVER9PAsL6QmR-Ol-4hx3FqBypoxYrrI0kg4,9700
 assemblyline_v4_service/common/result.py,sha256=qOwyFP4zJMpngZWDIuc0bFN-tNjLuPP2RDOgkPNwEXI,30349
 assemblyline_v4_service/common/task.py,sha256=kZyjttJGXebynJ5JMgEOgsHhDZUzMTuqUk-eTnyw87U,12480
-assemblyline_v4_service/common/utils.py,sha256=8lkq-BLV2w-tv6hCGlCxUY-6khZKej4MiLxdpeRlXhM,2338
+assemblyline_v4_service/common/utils.py,sha256=71ndFdbdfCeRCM-eYs1htKqJ-1miiWbsF_UgHnKKNZ4,3112
 assemblyline_v4_service/dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/dev/run_service_once.py,sha256=4gnb09WeKXlyWQKCQdH4SoL4xtfIRWq_9nyIiECrJ7g,10592
 assemblyline_v4_service/updater/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,8 +21,8 @@ assemblyline_v4_service/updater/app.py,sha256=OF-G7J8IYwTjdGw_BI9numBicZBN5lspm8
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=odcgbEe9MtfqKZ6hAPRQGVkn8OEALyn2d7b29oxZ0Mw,9141
 assemblyline_v4_service/updater/updater.py,sha256=gTFNN8Xow1HnlUcftWG30-ULXK5_FfJynZBnf7i4aIQ,29528
-assemblyline_v4_service-4.4.0.32.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.0.32.dist-info/METADATA,sha256=DOFlJH2RUCCWY-gDwXj6MGu8Qzm3yFpMTcecQXhLVKs,9328
-assemblyline_v4_service-4.4.0.32.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-assemblyline_v4_service-4.4.0.32.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
-assemblyline_v4_service-4.4.0.32.dist-info/RECORD,,
+assemblyline_v4_service-4.4.0.33.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.0.33.dist-info/METADATA,sha256=Is5cL_GRzkvYr3AyZ8IoCb9qt2U7GmMkTUeDnkZ8xX8,9328
+assemblyline_v4_service-4.4.0.33.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+assemblyline_v4_service-4.4.0.33.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
+assemblyline_v4_service-4.4.0.33.dist-info/RECORD,,