python-terminusgps 1.7.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

{python_terminusgps-1.7.0.dist-info → python_terminusgps-1.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-terminusgps
-Version: 1.7.0
+Version: 1.7.1
 Summary: Provides abstractions/utilities for working with Wialon API, Authorize.NET API, AWS API, and more.
 Project-URL: Documentation, https://app.terminusgps.com/docs/apps/python-terminusgps/index.html
 Project-URL: Repository, https://github.com/terminusgps/python-terminusgps

{python_terminusgps-1.7.0.dist-info → python_terminusgps-1.7.1.dist-info}/RECORD

@@ -10,7 +10,7 @@ terminusgps/wialon/constants.py,sha256=aybYcNcHyar2lz_6BlQbMWpbcHW6eyJeq05QwuiqZ
 terminusgps/wialon/errors.py,sha256=SV9pVwU6FZ_zGlGP6zJN6aLE2auF4TfHFISQLiPMKrI,1758
 terminusgps/wialon/flags.py,sha256=-OoH-eZM54yjRqxsAXL8VImdQu_7C0OAxCrFqaCEuko,13510
 terminusgps/wialon/session.py,sha256=segEjyt-K9AAlMq_OYLVtxFBp_jE5c3KL-AJQhOVa9U,9936
-terminusgps/wialon/utils.py,sha256=yBB3clo_wGPoLyhll7hJ_2vChMdeJV_KffeGq2PhxUY,3151
+terminusgps/wialon/utils.py,sha256=9xJq5eAWm-vu0nJVJ7eUcwhJhMCrGjS1p__4CIBXYm4,3407
 terminusgps/wialon/items/__init__.py,sha256=3BVthghekMvhMQSzQgBMlD_phxmKSmp3Zvmo-z0O8Bs,211
 terminusgps/wialon/items/base.py,sha256=Z6aGEC2_m5CPHYCa1rgAvkGtSegbrvZ68mifCqo-07A,6617
 terminusgps/wialon/items/resource.py,sha256=xElMYSMyKA5y8rIP0EeF429MBV2hbLZcS6SokftvrOs,5641
@@ -19,7 +19,7 @@ terminusgps/wialon/items/route.py,sha256=qOHPN_rejwiGqvwWzlwmUIAIyc3lKavCalf8ki6
 terminusgps/wialon/items/unit.py,sha256=wzcLa0adMTKX6rtO4Vz6ntaxgY50rLk2KK_VBXlW_lQ,4680
 terminusgps/wialon/items/unit_group.py,sha256=1yc7ldPIgGbtiTj0djRDWmt6Q9K_VT9sxOaioasbbLY,5212
 terminusgps/wialon/items/user.py,sha256=bkcMw_YiocaMuhP_pBfB7apjAZwnsOzGScnGkn8Ybbw,6107
-python_terminusgps-1.7.0.dist-info/METADATA,sha256=D5bRJDHDFZTiXDsHWU8QOn6_Zk4TaExZ2afP7MTsN2A,882
-python_terminusgps-1.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-1.7.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-1.7.0.dist-info/RECORD,,
+python_terminusgps-1.7.1.dist-info/METADATA,sha256=-KAv1c71Uia0KYMDRSjEdmoINaVnCQM64WI-bdebMCA,882
+python_terminusgps-1.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-1.7.1.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-1.7.1.dist-info/RECORD,,

terminusgps/wialon/utils.py

@@ -50,23 +50,33 @@ def is_unique(value: str, session: WialonSession, items_type: str = "avl_unit")
     return not bool(result)
 
 
-def gen_wialon_password(length: int = 16) -> str:
+def gen_wialon_password(length: int = 32) -> str:
     """Generates a Wialon compliant password."""
-    if length > 64:
-        raise ValueError(f"Passwords cannot be greater than 64 chars. Got '{length}'.")
-    if length < 4:
-        raise ValueError(f"Password cannot be less than 4 chars. Got '{length}'.")
-
-    symbols: str = "!@#$%^*()[]-_+"
-    alphabet: str = string.ascii_letters + string.digits + symbols
-    password: str = "".join(secrets.choice(alphabet) for _ in range(length - 4))
-    return (
-        password
-        + secrets.choice(string.ascii_lowercase)
-        + secrets.choice(string.ascii_uppercase)
-        + secrets.choice(string.digits)
-        + secrets.choice(symbols)
-    )
+    min_length, max_length = 4, 64
+    if length > max_length:
+        raise ValueError(
+            f"Password cannot be greater than {max_length} characters in length. Got {length}."
+        )
+    elif length < min_length:
+        raise ValueError(
+            f"Password cannot be less than {min_length} characters in length. Got {length}."
+        )
+
+    s0 = list(string.ascii_uppercase)
+    s1 = list(string.ascii_lowercase)
+    s2 = list(string.digits)
+    s3 = list("!@#$%^*()[]-_+")
+
+    while True:
+        password = "".join([secrets.choice(s0 + s1 + s2 + s3) for _ in range(length)])
+        if (
+            any(c.islower() for c in password)
+            and any(c.isupper() for c in password)
+            and sum(c.isdigit() for c in password) >= 3
+            and any(c in s3 for c in password)
+        ):
+            break
+    return password
 
 
 def get_id_from_iccid(iccid: str, session: WialonSession) -> str | None: