django-restit 4.2.4__py3-none-any.whl → 4.2.6__py3-none-any.whl

account/models/member.py

@@ -296,7 +296,9 @@ class Member(User, RestModel, MetaDataModel):
         if not self.is_active:
             self.log("login_blocked", F"account is not active {self.username}", request, method="login", level=31)
             if throw_exception:
-                raise PermissionDeniedException("Account disabled", 410)
+                if request is not None:
+                    request.member = self
+                raise PermissionDeniedException(f"{self.username} Account disabled", 410)
             return False
         if self.is_blocked:
             self.log("login_blocked", F"account is locked out {self.username}", request, method="login", level=31)

account/rpc/auth.py

@@ -111,7 +111,7 @@ def jwt_refresh(request):
         return rv.restPermissionDenied(request, error="invalid token", error_code=-702)
     if member.security_token is None:
         member.refreshSecurityToken()
-    member.canLogin()
+    member.canLogin(request)
     token.refresh()
     request.jwt_token = token.access_token  # this tells the middleware to store in cookie
     return rv.restGet(request, dict(access=token.access_token, refresh=token.refresh_token))
@@ -260,11 +260,11 @@ def get_member_from_request(request):
     if not member.is_active:
         request.member = member
         member.log("login_blocked", "account is not active", request, method="login", level=31)
-        return member, rv.restPermissionDenied(request, error="Account disabled", error_code=410)
+        return member, rv.restPermissionDenied(request, error=f"{member.username} 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 member, rv.restPermissionDenied(request, error="Account locked out", error_code=411)
+        return member, rv.restPermissionDenied(request, error=f"{member.username} Account locked out", error_code=411)
     return member, None  
 
 

{django_restit-4.2.4.dist-info → django_restit-4.2.6.dist-info}/METADATA

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

{django_restit-4.2.4.dist-info → django_restit-4.2.6.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=jj4csGHDyDRMS_maL8AeV1k3whSxBdeffHxmnXrn-sg,20064
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
-account/models/member.py,sha256=5e-odISpgas7M4ZEqdNqAQwAWrdWG3lhgZDh0rNvdBs,48938
+account/models/member.py,sha256=5y8Reo5Cc0opKrDsd4XJz22fhZoy3_EmE93qPl4649Y,49037
 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=qIxbzqaeacq-boMlw0j7zMgzhONag3Jjrld1hBohdag,14851
+account/rpc/auth.py,sha256=twt0gMHVZgKX3aV5oN5K_1jXpRoOH9_ckDeA9nd0Tsk,14896
 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
@@ -98,7 +98,7 @@ incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,2
 incident/models/event.py,sha256=Nzy21glVc7V8Z6YziTt3SeQB3xCEKWuVaF01ufjB6xk,6849
 incident/models/incident.py,sha256=Zsg0FP6wtl2gU8Z1MoCg2uFQ57YfPYpAkIlirYHRMIA,14384
 incident/models/ossec.py,sha256=p1ptr-8lnaj1EP_VmPR58b2LmaYBGaYYKAMqhWK5yZM,2227
-incident/models/rules.py,sha256=u1cMr0r9ERgHWM5-yXBpcuXtmUUWPWj_Gu2nCGF9YEc,5765
+incident/models/rules.py,sha256=f1TYWxT8WxZtLkngi3jBXbV0-u0CdmgB2mePDunE3-Y,5797
 incident/models/ticket.py,sha256=S3kqGQpYLE6Y4M9IKu_60sgW-f592xNr8uufqHnvDoU,2302
 incident/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/parsers/ossec.py,sha256=joduBYN3J5IINPJaI5G6hn03Mhz9Ymd6xfw8cSiwKAc,5969
@@ -352,7 +352,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=_I684lrp_HSaBLzVxFhPLceGAaTydTDTHDvfUtWFp_E,120
+rest/__init__.py,sha256=_aTspOWQgQGORnkd-w0Qm6O_8KEmxZnKx5BO5x-mhkc,120
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -484,7 +484,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.2.4.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.4.dist-info/METADATA,sha256=JXXM1lk8IAyD8gMuP0AVs1cb0r7xh9qiz92u_6RMUKw,7572
-django_restit-4.2.4.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.4.dist-info/RECORD,,
+django_restit-4.2.6.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.6.dist-info/METADATA,sha256=-tZKn_1-IB0BehL-M7bNaQTy_YnoBt_l83j4hpyRYiM,7572
+django_restit-4.2.6.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.6.dist-info/RECORD,,

incident/models/rules.py

@@ -47,7 +47,8 @@ class Rule(models.Model, rm.RestModel):
                     "action",
                     "action_after",
                     "bundle",
-                    "bundle_by"
+                    "bundle_by",
+                    "match_by"
                 ]
             }
         }

rest/__init__.py

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