sanic-security 1.15.0__py3-none-any.whl → 1.15.1__py3-none-any.whl

sanic_security/models.py

@@ -2,6 +2,7 @@ import base64
 import datetime
 import logging
 import re
+import uuid
 from typing import Union
 
 import jwt
@@ -20,7 +21,6 @@ from sanic_security.utils import (
     get_expiration_date,
     image_generator,
     audio_generator,
-    get_id,
     is_expired,
 )
 
@@ -58,7 +58,9 @@ class BaseModel(Model):
         deleted (bool): Renders the model filterable without removing from the database.
     """
 
-    id: str = fields.CharField(pk=True, max_length=36, default=get_id)
+    id: str = fields.CharField(
+        pk=True, max_length=36, default=lambda: str(uuid.uuid4())
+    )
     date_created: datetime.datetime = fields.DatetimeField(auto_now_add=True)
     date_updated: datetime.datetime = fields.DatetimeField(auto_now=True)
     deleted: bool = fields.BooleanField(default=False)
@@ -540,9 +542,13 @@ class VerificationSession(Session):
 class TwoStepSession(VerificationSession):
     """Validates a client using a code sent via email or text."""
 
+    code: str = fields.CharField(
+        max_length=6, default=lambda: get_code(True), null=True
+    )
+
     @classmethod
     async def new(cls, request: Request, account: Account, **kwargs):
-        return await TwoStepSession.create(
+        return await cls.create(
             **kwargs,
             ip=get_ip(request),
             bearer=account,
@@ -560,7 +566,7 @@ class CaptchaSession(VerificationSession):
 
     @classmethod
     async def new(cls, request: Request, **kwargs):
-        return await CaptchaSession.create(
+        return await cls.create(
             **kwargs,
             ip=get_ip(request),
             expiration_date=get_expiration_date(
@@ -639,7 +645,7 @@ class AuthenticationSession(Session):
         if not is_expired(self.refresh_expiration_date):
             self.active = False
             await self.save(update_fields=["active"])
-            logging.warning(
+            logging.info(
                 f"Client {get_ip(request)} has refreshed authentication session {self.id}."
             )
             return await self.new(request, self.bearer, True)
@@ -650,7 +656,7 @@ class AuthenticationSession(Session):
     async def new(
         cls, request: Request, account: Account = None, is_refresh=False, **kwargs
     ):
-        authentication_session = await AuthenticationSession.create(
+        authentication_session = await cls.create(
             **kwargs,
             bearer=account,
             ip=get_ip(request),

sanic_security/utils.py

@@ -1,7 +1,6 @@
 import datetime
 import random
-import string
-import uuid
+from string import ascii_uppercase, digits
 
 from argon2 import PasswordHasher
 from captcha.audio import AudioCaptcha
@@ -53,28 +52,22 @@ def get_ip(request: Request) -> str:
     return request.remote_addr or request.ip
 
 
-def get_code() -> str:
+def get_code(digits_only: bool = False) -> str:
     """
     Generates random code to be used for verification.
 
+    Args:
+        digits_only: Determines if code should only contain digits.
+
     Returns:
         code
     """
     return "".join(
-        random.choice(string.ascii_uppercase + string.digits) for _ in range(6)
+        random.choice(("" if digits_only else ascii_uppercase) + digits)
+        for _ in range(6)
     )
 
 
-def get_id() -> str:
-    """
-    Generates uuid to be used for primary key.
-
-    Returns:
-        id
-    """
-    return str(uuid.uuid4())
-
-
 def is_expired(date):
     """
     Checks if current date has surpassed the date passed into the function.

{sanic_security-1.15.0.dist-info → sanic_security-1.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sanic-security
-Version: 1.15.0
+Version: 1.15.1
 Summary: An async security library for the Sanic framework.
 Author-email: Aidan Stewart <me@na-stewart.com>
 Project-URL: Documentation, https://security.na-stewart.com/

{sanic_security-1.15.0.dist-info → sanic_security-1.15.1.dist-info}/RECORD

@@ -3,14 +3,14 @@ sanic_security/authentication.py,sha256=3Pit1B4PN_MRvwAlhYPHl_6DGD9JVpdPjgjiyKQJ
 sanic_security/authorization.py,sha256=jAxfDT9cHN_zpMKcA3oYFZ5Eu2KItnMJZ7oPcqmMwrw,7537
 sanic_security/configuration.py,sha256=_E66ts5g9t_XHW9ZAnr48rWVcZmGNu_DWGDxm_AVVWE,5681
 sanic_security/exceptions.py,sha256=9zISLyAvP6qN8sNR8e5qxKP__FA4NLIXCun_fEKndOw,5297
-sanic_security/models.py,sha256=v4ZnvZonwrgxnXKPHLQYNtEDJAE2Ri0TGEAbLX0VWTo,22429
-sanic_security/utils.py,sha256=Y_qs3UVuOXHnDWelAxNC6VLeB5lMeSv3xRty9xYlHOw,3538
+sanic_security/models.py,sha256=TytuQTjfKslPr893-mCYSzsRK7gfJtXmDz656iCCM0k,22530
+sanic_security/utils.py,sha256=Il5MjFzVe975yx_CV2HV_LVQYl2W3XYDRGtCG5CQA8Q,3531
 sanic_security/verification.py,sha256=9bi8-NZ8GE3rcuELZ63yh18zDg8RxvxGPkhAu5SzLn0,8692
 sanic_security/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sanic_security/test/server.py,sha256=RjL9Kfvkfqpm5TXWwFQKKa0J4hfTKgwI6U0s_TAKO8w,11984
 sanic_security/test/tests.py,sha256=bW5fHJfsCrg8eBmcSqVMLm0R5XRL1ou-XJJRgz09GOE,21993
-sanic_security-1.15.0.dist-info/LICENSE,sha256=sXlJs9_mG-dCkPfWsDnuzydJWagS82E2gYtkVH9enHA,1100
-sanic_security-1.15.0.dist-info/METADATA,sha256=7bxyaqAFp0hm6ldrbuux1Dwth8OtXVcffKelbV8zkl8,23247
-sanic_security-1.15.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-sanic_security-1.15.0.dist-info/top_level.txt,sha256=ZybkhHXSjfzhmv8XeqLvnNmLmv21Z0oPX6Ep4DJN8b0,15
-sanic_security-1.15.0.dist-info/RECORD,,
+sanic_security-1.15.1.dist-info/LICENSE,sha256=sXlJs9_mG-dCkPfWsDnuzydJWagS82E2gYtkVH9enHA,1100
+sanic_security-1.15.1.dist-info/METADATA,sha256=EINxdSgG_LLkPu3QqXo1CMe_-GTQk5QDhO3b3909quI,23247
+sanic_security-1.15.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+sanic_security-1.15.1.dist-info/top_level.txt,sha256=ZybkhHXSjfzhmv8XeqLvnNmLmv21Z0oPX6Ep4DJN8b0,15
+sanic_security-1.15.1.dist-info/RECORD,,