assemblyline-v4-service 4.6.1.dev13__py3-none-any.whl → 4.6.1.dev16__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.6.1.dev13
+4.6.1.dev16

assemblyline_v4_service/common/utils.py

@@ -80,14 +80,14 @@ def __extract_passwords_from_lines(texts, password_word, password_regex):
     password_keyword = f"{password_word}:"
     for line in texts:
         if password_keyword in line.lower():
-            new_passwords = re.split(password_regex, line)
+            new_passwords = set(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 new_passwords:
-                    new_passwords.extend([password[:i] for i, ltr in enumerate(password) if ltr == special_char])
+                for password in list(new_passwords):
+                    new_passwords.update(set([password[:i] for i, ltr in enumerate(password) if ltr == special_char]))
 
                 new_passwords = set(new_passwords)
                 new_passwords.discard("")
@@ -121,7 +121,8 @@ def _is_dev_mode() -> bool:
         stack_trace.seek(0)
         read_stack_trace = stack_trace.read()
 
-        if any(msg in read_stack_trace for msg in ['run_service_once', 'pytest', 'assemblyline_v4_service.testing.helper']):
+        if any(msg in read_stack_trace
+               for msg in ['run_service_once', 'pytest', 'assemblyline_v4_service.testing.helper']):
             return True
 
     return False

{assemblyline_v4_service-4.6.1.dev13.dist-info → assemblyline_v4_service-4.6.1.dev16.dist-info}/METADATA

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

{assemblyline_v4_service-4.6.1.dev13.dist-info → assemblyline_v4_service-4.6.1.dev16.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=iCVdOoH4pcrLmJC5_kq9zbRc7AAs7a2DGbBwtKL22p4,12
+assemblyline_v4_service/VERSION,sha256=YW7dQLQWBMufAPDn_hJcYIbA5DbXzSLu6Zi8cX7RhWQ,12
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=3QGBg0EZuXC6UN411HFwpLNEop9UvS9feFhvBUTP-k4,1576
 assemblyline_v4_service/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,7 +13,7 @@ assemblyline_v4_service/common/ontology_helper.py,sha256=9Ad81qbddg_pRMupT8o_Kzx
 assemblyline_v4_service/common/request.py,sha256=W7fqC2xQE3i5i2jlCDyUDp3ZqJQQqSshNW0mQfJMkFg,11792
 assemblyline_v4_service/common/result.py,sha256=9AqM6qCYiia_Bpyn_fBFhzNQMcqJbtFSiGjp57fXW2E,32713
 assemblyline_v4_service/common/task.py,sha256=dJsvRpW0x88CCF_LW6w87jQ_UKTVaOs2Gb117IDNiU8,14233
-assemblyline_v4_service/common/utils.py,sha256=k2__d-V5LjB6o2IKbjVe7tJWKcKuUHto5TyT5oKhIa0,3890
+assemblyline_v4_service/common/utils.py,sha256=XninwdVUJZSfD8fXv6wzie-IZWDl1rpjpGboham-xHg,3921
 assemblyline_v4_service/dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/dev/run_service_once.py,sha256=W9kR49IUbkt8tNXjCT40ZMh-8p5W_odxlkDx6nhTAYM,10656
 assemblyline_v4_service/dev/updater.py,sha256=b-FK6XPRZbETbl-SIYEhnYGT-W7EcQhnxwD6x2NMC7g,6411
@@ -24,7 +24,7 @@ assemblyline_v4_service/updater/client.py,sha256=tLY84gaGdFBVIDaMgRHIEa7x2S8jBl7
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=Zy6OBmbTh0YurW0MnM0wM92vaKYMbo_MKnafe_5ONUI,10034
 assemblyline_v4_service/updater/updater.py,sha256=kli-5v1uVmk2FARAI9DsZ9YM4EhgirkmWJaMJWdm9GI,31795
-assemblyline_v4_service-4.6.1.dev13.dist-info/licenses/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.6.1.dev16.dist-info/licenses/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/conftest.py,sha256=W3SieQpZsZpGEmtLqY4aIlxREDSsHceyCrFcFsWUM0U,1851
 test/test_healthz.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
@@ -40,7 +40,7 @@ test/test_common/test_request.py,sha256=Ceyds8BNO1O0f1kH1VEb84faJcaupvSjVKIrGdHe
 test/test_common/test_result.py,sha256=6BiOKxEPrKBjOY44jv3TY-yiXm0qI1ok_CZBnjP9TM4,45447
 test/test_common/test_task.py,sha256=P44mNcSe-3tJgDk9ppN3KbM7oN4LBVIuhONG-Gveh74,19007
 test/test_common/test_utils.py,sha256=TbnBxqpS_ZC5ptXR9XJX3xtbItD0mTbtiBxxdyP8J5k,5904
-assemblyline_v4_service-4.6.1.dev13.dist-info/METADATA,sha256=lHen9-8jpMpOAPOP-vFDvi_acOzOv5yNJjxKvi7YgxA,5624
-assemblyline_v4_service-4.6.1.dev13.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-assemblyline_v4_service-4.6.1.dev13.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.6.1.dev13.dist-info/RECORD,,
+assemblyline_v4_service-4.6.1.dev16.dist-info/METADATA,sha256=OY27EljplCteNTkvZN5gAWpM_J87Ezr8p66PSdmNJh0,5624
+assemblyline_v4_service-4.6.1.dev16.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+assemblyline_v4_service-4.6.1.dev16.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.6.1.dev16.dist-info/RECORD,,