django-restit 4.1.82__py3-none-any.whl → 4.1.83__py3-none-any.whl

account/models/member.py

@@ -250,9 +250,10 @@ class Member(User, RestModel, MetaDataModel):
         if c >= settings.LOCK_PASSWORD_ATTEMPTS:
             self.block("multiple incorrect password attempts", request=request)
         else:
+            self.log("login_failed", "incorrect password", request, method="login", level=31)
             self.reportIncident(
                 "account", f"incorrect password for {self.username}", level=8,
-                error_code=401,
+                error_code=498,
                 request=request)
         c = RemoteEvents.hincrby("users:failed:ip", request.ip, 1)
 
@@ -707,6 +708,7 @@ class Member(User, RestModel, MetaDataModel):
         self.reportIncident(
             "account", f"account '{self.username}' blocked: {reason}", level=2,
             request=request,
+            error_code=499,
             details=reason)
 
     def unblock(self, request=None):

account/rpc/auth.py

@@ -23,7 +23,7 @@ def member_login(request):
     password = request.DATA.get('password', None)
     if username and password:
         return member_login_uname_pword(request, username, password)
-    return rv.restPermissionDenied(request, "Invalid credentials", 401)
+    return rv.restPermissionDenied(request, f"Invalid credentials {username}/{auth_code}", 401)
 
 
 @rd.urlPOST(r'^jwt/login$')
@@ -44,8 +44,8 @@ def jwt_login(request):
         if resp is not None:
             return resp
     if not member.login(request=request, password=password, use_jwt=True):
-        member.log("login_failed", "incorrect password", request, method="login", level=31)
-        return rv.restPermissionDenied(request, error="Invalid Credentials", error_code=401)
+        # we do not want permission denied catcher invoked as it is already handled in login method
+        return rv.restStatus(request, False, error=f"Invalid Credentials {username}", error_code=401)
     return on_complete_jwt(request, member)
 
 
@@ -137,14 +137,17 @@ def checkForTOTP(request, member):
     if not member.has_totp:
         # we have a phone number so tell them to login with code
         # they will need to request a code
+        request.member = member
         return rv.restPermissionDenied(
             request, error=member.phone_number[-4:],
             error_code=454)
     totp_code = request.DATA.get("totp_code", None)
     if totp_code is None:
         # member.log("login_blocked", "requires MFA (TOTP)", request, method="login", level=31)
+        request.member = member
         return rv.restPermissionDenied(request, error="Requires MFA (TOTP)", error_code=455)
     if not member.totp_verify(totp_code):
+        request.member = member
         member.log("login_blocked", "Invalid MFA code", request, method="login", level=31)
         return rv.restPermissionDenied(request, error="Invalid Credentials", error_code=456)
     return None
@@ -160,6 +163,7 @@ def member_login_uname_pword(request, username, password):
         if resp is not None:
             return resp
     if not member.login(request=request, password=password, use_jwt=False):
+        request.member = member
         member.log("login_failed", "incorrect password", request, method="login", level=31)
         return rv.restPermissionDenied(request, error="Password or Username is incorrect", error_code=401)
 
@@ -258,9 +262,11 @@ def member_check_can_login(request, member):
     if not member:
         return rv.restPermissionDenied(request, error="Password or Username is incorrect", error_code=422)
     if not member.is_active:
+        request.member = member
         member.log("login_blocked", "account is not active", request, method="login", level=31)
         return rv.restPermissionDenied(request, error="Account disabled", error_code=410)
     if member.is_blocked:
+        request.member = member
         member.log("login_blocked", "account is locked out", request, method="login", level=31)
         return rv.restPermissionDenied(request, error="Account locked out", error_code=411)
     return None  
@@ -320,6 +326,7 @@ def member_forgot_password_code(request, member):
             sms_msg="Your login code is:\n{}".format(code)):
         member.log("requested", "user requested password reset code", request, method="login_token", level=8)
         return rv.restStatus(request, True)
+    request.member = member
     member.log("error", "No valid email/phone, check users profile!", request, method="login_token", level=6)
     return rv.restPermissionDenied(request, error="No valid email/phone, check users profile!")
 

{django_restit-4.1.82.dist-info → django_restit-4.1.83.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.1.82
+Version: 4.1.83
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.1.82.dist-info → django_restit-4.1.83.dist-info}/RECORD

@@ -23,7 +23,7 @@ account/models/device.py,sha256=XipNpByreGubB5-d4ZBOoIV5Xw14b2Btcgn6fXz8HAc,4105
 account/models/feeds.py,sha256=4n4Mv8HjcXpUmMPWafHlsGbVQ1fDKdtblL1hp30sDrg,1437
 account/models/group.py,sha256=04T5Oy9fU7QadBBC1aD1Vy0Pb26hANqxicWWx003A-4,20047
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
-account/models/member.py,sha256=iW0ciEsX-bM2EzVLOu4-Gl3pqmcSYpwD8AS3MOhbuXA,48768
+account/models/member.py,sha256=1PyHrOadU2Kzl-GR-m5OzHD8ZROhubZ7fr2e8LfFgYE,48890
 account/models/membership.py,sha256=Qmp0xQa_3ObB581L83gce69t9eSfyH-mZZuGqW3ueI8,7763
 account/models/notify.py,sha256=YnZujSHJHY7B09e6FIyZIEJRWLPYk1Sk1e92tFzB1IA,12078
 account/models/session.py,sha256=swhxcx_lWzOpGCmfifXoACgWYqmKmS7eZsD9s9jSToc,3509
@@ -32,7 +32,7 @@ account/oauth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/oauth/google.py,sha256=q5M6Qhpfp9QslKRVYFZBvtG6kgXV6vYMrR5fp6Xdb9I,2078
 account/periodic.py,sha256=-u0n-7QTJgDOkasGhBAPwHAwjpqWGA-MZLEFkVTqCGU,874
 account/rpc/__init__.py,sha256=L_AqHC0WbgUgLoqvNz6pY0E34eqh7sRaX77I6TxhRZ4,152
-account/rpc/auth.py,sha256=mKPcILyD4VGbHXXZ4FbE5tr83QMoY-uMFp5mKoa4ucI,14297
+account/rpc/auth.py,sha256=B1opyf8wLUehT-4cTtekMyAHRlZvwqAU6HL9VNu_Mr4,14558
 account/rpc/device.py,sha256=fbbZFp3cUdhVXvD7gVFOqFWj4hKS3bjZKD_aF5fQxd8,2852
 account/rpc/group.py,sha256=Y_Ii-vlDx09neMd95AmC7xBwDf3wdFgXjB-kIG2jMdE,3472
 account/rpc/member.py,sha256=oKdXSGhQ7AOPTwisZ5RvHhQ1SdZoXWlBQY0lIlDXJY0,1150
@@ -351,7 +351,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=XOgIgJdG91p71NagFE18aCiFtoifASsm05iJfwy3cKU,121
+rest/__init__.py,sha256=i41KA-r3ZBWJff5yXjNVo-lZd8vd7o871IvVtuQ9JIs,121
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -483,7 +483,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.1.82.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.82.dist-info/METADATA,sha256=8MgUs15csTiyqFhpgK0C8YKkAyuqAhePyYW7Kry70cw,7573
-django_restit-4.1.82.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.82.dist-info/RECORD,,
+django_restit-4.1.83.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.1.83.dist-info/METADATA,sha256=h78fY6BxpLcwK34yFcQkJ5qlQSI_LW_g7unWCNFzqDQ,7573
+django_restit-4.1.83.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.1.83.dist-info/RECORD,,

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.1.82"
+__version__ = "4.1.83"