assemblyline-v4-service 4.4.2.dev4__py3-none-any.whl → 4.4.2.dev5__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.2.dev4
+4.4.2.dev5

assemblyline_v4_service/updater/updater.py

@@ -14,13 +14,13 @@ import threading
 import subprocess
 import hashlib
 from contextlib import contextmanager
-from passlib.hash import bcrypt
 from queue import Queue
 from zipfile import ZipFile, BadZipFile
 
 from assemblyline.common import forge, log as al_log
 from assemblyline.common.isotime import epoch_to_iso, now_as_iso
 from assemblyline.common.identify import zip_ident
+from assemblyline.common.security import get_password_hash
 from assemblyline.odm.messages.changes import Operation, ServiceChange, SignatureChange
 from assemblyline.remote.datatypes.events import EventSender, EventWatcher
 
@@ -71,7 +71,7 @@ def temporary_api_key(ds: AssemblylineDatastore, user_name: str, permissions=('R
         random_pass = get_random_password(length=48)
         user = ds.user.get(user_name)
         user.apikeys[name] = {
-            "password": bcrypt.hash(random_pass),
+            "password": get_password_hash(random_pass),
             "acl": permissions,
             "roles": UPDATER_API_ROLES
         }
@@ -493,7 +493,9 @@ class ServiceUpdater(ThreadedCoreBase):
                             validated_files = list()
                             for file, sha256 in files:
                                 files_sha256.setdefault(source_name, {})
-                                if previous_hashes.get(source_name, {}).get(file, None) != sha256 and self.is_valid(file):
+                                if previous_hashes.get(
+                                        source_name, {}).get(
+                                        file, None) != sha256 and self.is_valid(file):
                                     files_sha256[source_name][file] = sha256
                                     validated_files.append((file, sha256))
 

{assemblyline_v4_service-4.4.2.dev4.dist-info → assemblyline_v4_service-4.4.2.dev5.dist-info}/METADATA

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

{assemblyline_v4_service-4.4.2.dev4.dist-info → assemblyline_v4_service-4.4.2.dev5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=hAXWahtd-yL4uNz_Zc3MH6RY1ByTVizh4BdsZczlfG0,11
+assemblyline_v4_service/VERSION,sha256=skaIBVIi_VYHIp2ZGb80fexrlfYQDXbQceIonmMaaz0,11
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=sS1cFkDLw8hUPMpj7tbHXFv8ZmHcazrwZ0l6oQDwwkQ,1575
 assemblyline_v4_service/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,7 +22,7 @@ assemblyline_v4_service/updater/app.py,sha256=Mtmx4bkXfP4nFqqa5q15jW8QIXr4JK84lC
 assemblyline_v4_service/updater/client.py,sha256=VKmkiDz3klvMzXiGSQTH7QN-MfHuJnwaIR7BaXy9aZM,5156
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=HbH5p6UTdHyIgoctF1c1pQkoqTtzaxfHOi9KXGwn0eM,9435
-assemblyline_v4_service/updater/updater.py,sha256=9F4Uz8P_VRGQDkzdHJr-bdEEWGrmy4VXKNmvQfnf-Ck,34586
+assemblyline_v4_service/updater/updater.py,sha256=V0pFwevPYf2ZMfhLajIRP2S-DanHx-ZDK89SmUNR_Fc,34701
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/test_healthz.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 test/test_run_privileged_service.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
@@ -37,8 +37,8 @@ test/test_common/test_request.py,sha256=wxSwnOj-_YOv2SuZjOJsw09q8A7p8GJmJuK4vozq
 test/test_common/test_result.py,sha256=Wm0Cs5kZRzlZr0jL-l8OTsYAvkoN2eaB3NkeXzvyssI,42208
 test/test_common/test_task.py,sha256=jnfF68EgJIu30Pz_4jiJHkncfI-3XpGaut5r79KIXOA,18718
 test/test_common/test_utils.py,sha256=TbnBxqpS_ZC5ptXR9XJX3xtbItD0mTbtiBxxdyP8J5k,5904
-assemblyline_v4_service-4.4.2.dev4.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.2.dev4.dist-info/METADATA,sha256=lZ5mQ-jeXt80S3cbGnzTZVPen0jpm4hopwLD_qcQr5k,9794
-assemblyline_v4_service-4.4.2.dev4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-assemblyline_v4_service-4.4.2.dev4.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.4.2.dev4.dist-info/RECORD,,
+assemblyline_v4_service-4.4.2.dev5.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.2.dev5.dist-info/METADATA,sha256=GrrWQ1xyn0v4OpKwGRHqop_Xgr8wYnpQhutJphXsukQ,9794
+assemblyline_v4_service-4.4.2.dev5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+assemblyline_v4_service-4.4.2.dev5.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.4.2.dev5.dist-info/RECORD,,