django-restit 4.1.78__py3-none-any.whl → 4.1.79__py3-none-any.whl

account/rpc/auth.py

@@ -1,7 +1,8 @@
 from rest import decorators as rd
 from rest import crypto
 from rest.mail import render_to_mail
-from rest.views import restStatus, restGet, restPermissionDenied
+from rest import views as rv
+# from rest.views import restStatus, restGet, restPermissionDenied
 from rest.jwtoken import JWToken, JWT_KEY
 from rest import helpers
 from rest import settings
@@ -22,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 restStatus(request, False, error="Invalid credentials", error_code=401)
+    return rv.restPermissionDenied(request, "Invalid credentials", 401)
 
 
 @rd.urlPOST(r'^jwt/login$')
@@ -32,10 +33,10 @@ def jwt_login(request):
     # poor mans JWT, carried over
     username = request.DATA.get('username', None)
     if not username:
-        return restStatus(request, False, error="Password and/or Username is incorrect", error_code=422)
+        return rv.restPermissionDenied(request, "Password and/or Username is incorrect", error_code=422)
     member = getMemberByUsername(username)
     if not member:
-        return restStatus(request, False, error="Password and/or Username is incorrect", error_code=422)
+        return rv.restPermissionDenied(request, error="Password and/or Username is incorrect", error_code=422)
     password = request.DATA.get('password', None)
     member.canLogin(request)  # throws exception if cannot login
     if member.requires_totp:
@@ -44,7 +45,7 @@ def jwt_login(request):
             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 restStatus(request, False, error="Invalid Credentials", error_code=401)
+        return rv.restPermissionDenied(request, error="Invalid Credentials", error_code=401)
     return on_complete_jwt(request, member)
 
 
@@ -69,7 +70,7 @@ def on_complete_jwt(request, member):
         am.MemberDevice.register(request, member, device_id)
     
     request.jwt_token = token.access_token  # this tells the middleware to store in cookie
-    return restGet(
+    return rv.restGet(
         request, 
         dict(
             access=token.access_token,
@@ -87,7 +88,7 @@ def jwt_logout(request):
         request.member.sendEvent("logout", "user requested logout")
         request.member.refreshSecurityToken()
         request.clear_jwt_cookie = True  # tells middleware to remove from cookie
-    return restStatus(request, True)
+    return rv.restStatus(request, True)
 
 
 @rd.urlPOST(r'^jwt/refresh$')
@@ -97,20 +98,20 @@ def jwt_refresh(request):
     # poor mans JWT, carried over
     rtoken = request.DATA.get(['refresh_token', 'refresh'], None)
     if not bool(rtoken):
-        return restStatus(request, False, error="requires token")
+        return rv.restPermissionDenied(request, error="requires token", error_code=703)
     token = JWToken(token=rtoken)
     member = am.Member.objects.filter(pk=token.payload.user_id).last()
     if not member:
-        return restStatus(request, False, error="Password or Username is incorrect", error_code=422)
+        return rv.restPermissionDenied(request, error="Password or Username is incorrect", error_code=422)
     if member.security_token is None:
         member.refreshSecurityToken()
     token.key = member.security_token
     if not token.is_valid or token.payload.user_id is None:
-        return restStatus(request, False, error="invalid token", error_code=-702)
+        return rv.restPermissionDenied(request, error="invalid token", error_code=-702)
     member.canLogin()
     token.refresh()
     request.jwt_token = token.access_token  # this tells the middleware to store in cookie
-    return restGet(request, dict(access=token.access_token, refresh=token.refresh_token))
+    return rv.restGet(request, dict(access=token.access_token, refresh=token.refresh_token))
 
 
 def getMemberByUsername(username):
@@ -133,23 +134,23 @@ 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
-        return restStatus(
-            request, False, error=member.phone_number[-4:],
+        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)
-        return restStatus(request, False, error="Requires MFA (TOTP)", error_code=455)
+        return rv.restPermissionDenied(request, error="Requires MFA (TOTP)", error_code=455)
     if not member.totp_verify(totp_code):
         member.log("login_blocked", "Invalid MFA code", request, method="login", level=31)
-        return restStatus(request, False, error="Invalid Credentials", error_code=456)
+        return rv.restPermissionDenied(request, error="Invalid Credentials", error_code=456)
     return None
 
 
 def member_login_uname_pword(request, username, password):
     member = getMemberByUsername(username)
     if not member:
-        return restStatus(request, False, error="Password or Username is not correct", error_code=422)
+        return rv.restPermissionDenied(request, error="Password or Username is not correct", error_code=422)
     member.canLogin(request)  # throws exception if cannot login
     if member.requires_topt:
         resp = checkForTOTP(request, member)
@@ -157,30 +158,30 @@ def member_login_uname_pword(request, username, password):
             return resp
     if not member.login(request=request, password=password, use_jwt=False):
         member.log("login_failed", "incorrect password", request, method="login", level=31)
-        return restStatus(request, False, error="Password or Username is incorrect", error_code=401)
+        return rv.restPermissionDenied(request, error="Password or Username is incorrect", error_code=401)
 
     member.log("password_login", "password login", request, method="login", level=7)
     if request.session is not None:
         request.session["member_id"] = member.pk
         request.session["_auth_user_id"] = member.pk
-    return restGet(request, dict(id=member.pk, session_key=request.session.session_key))
+    return rv.restGet(request, dict(id=member.pk, session_key=request.session.session_key))
 
 
 def member_login_uname_code(request, username, auth_code):
     member = getMemberByUsername(username)
     if not member:
-        return restStatus(request, False, error="Username or code is incorrect", error_code=422)
+        return rv.restPermissionDenied(request, error="Username or code is incorrect", error_code=422)
     if not member.is_active:
         member.log("login_blocked", "account is not active", request, method="login", level=31)
-        return restStatus(request, False, error="Account disabled", error_code=410)
+        return rv.restPermissionDenied(request, error="Account disabled", error_code=410)
     if member.is_blocked:
         member.log("login_blocked", "account is locked out", request, method="login", level=31)
-        return restStatus(request, False, error="Account locked out", error_code=411)
+        return rv.restPermissionDenied(request, error="Account locked out", error_code=411)
     auth_code = auth_code.replace('-', '').replace(' ', '')
     if member.auth_code is None or member.auth_code != auth_code:
-        return restPermissionDenied(request, "token most likely expired, try again", error_code=492)
+        return rv.restPermissionDenied(request, "token most likely expired, try again", error_code=492)
     if member.auth_code_expires < datetime.now():
-        return restPermissionDenied(request, "token expired", error_code=493)
+        return rv.restPermissionDenied(request, "token expired", error_code=493)
     password = request.DATA.get(['password', 'new_password'], None)
     if password:
         member.setPassword(password)
@@ -190,7 +191,7 @@ def member_login_uname_code(request, username, auth_code):
     member.save()
     member.log("code_login", "code login", request, method="login", level=8)
     if request.DATA.get("auth_method") == "basic":
-        return restGet(request, dict(id=member.pk, session_key=request.session.session_key))
+        return rv.restGet(request, dict(id=member.pk, session_key=request.session.session_key))
 
     return on_complete_jwt(request, member)
 
@@ -209,7 +210,7 @@ def member_logout(request):
     if request.user.is_authenticated:
         request.user.log("logout", "user logged out", request, method="logout", level=8)
     request.member.logout(request)
-    return restStatus(request, True)
+    return rv.restStatus(request, True)
 
 
 @rd.url(r'^loggedin/$')
@@ -223,8 +224,8 @@ def is_member_logged_in(request):
     | Check if the current user is logged in
     """
     if request.user:
-        return restStatus(request, request.user.is_authenticated)
-    return restStatus(request, False)
+        return rv.restStatus(request, request.user.is_authenticated)
+    return rv.restStatus(request, False)
 
 
 @rd.urlPOST('mfa/request_code')
@@ -240,19 +241,19 @@ def member_request_code(request):
 def member_from_request(request):
     username = request.DATA.get('username', None)
     if not username:
-        raise restPermissionDenied("Username is required")
+        raise rv.restPermissionDenied("Username is required")
     return getMemberByUsername(username)
 
 
 def member_check_can_login(request, member):
     if not member:
-        return restStatus(request, False, error="Password or Username is incorrect", error_code=422)
+        return rv.restPermissionDenied(request, error="Password or Username is incorrect", error_code=422)
     if not member.is_active:
         member.log("login_blocked", "account is not active", request, method="login", level=31)
-        return restStatus(request, False, error="Account disabled", error_code=410)
+        return rv.restPermissionDenied(request, error="Account disabled", error_code=410)
     if member.is_blocked:
         member.log("login_blocked", "account is locked out", request, method="login", level=31)
-        return restStatus(request, False, error="Account locked out", error_code=411)
+        return rv.restPermissionDenied(request, error="Account locked out", error_code=411)
     return None  
 
 
@@ -289,7 +290,7 @@ def member_forgot_password(request):
         'to': [member.email],
     })
 
-    return restStatus(request, True, msg="Password reset instructions have been sent to your email.")
+    return rv.restStatus(request, True, msg="Password reset instructions have been sent to your email.")
 
 
 def member_forgot_password_code(request, member):
@@ -309,9 +310,9 @@ def member_forgot_password_code(request, member):
             template=settings.get("EMAIL_TEMPLATE_RESET", "email/reset_code.html"),
             sms_msg="Your login code is:\n{}".format(code)):
         member.log("requested", "user requested password reset code", request, method="login_token", level=8)
-        return restStatus(request, True)
+        return rv.restStatus(request, True)
     member.log("error", "No valid email/phone, check users profile!", request, method="login_token", level=6)
-    return restStatus(request, False, error="No valid email/phone, check users profile!")
+    return rv.restPermissionDenied(request, error="No valid email/phone, check users profile!")
 
 
 # time based one time passwords
@@ -321,7 +322,7 @@ def totp_qrcode(request):
     token = request.member.getProperty("totp_token", category="secrets", default=None)
     reset = request.DATA.get("force_reset", False)
     if token is not None and not reset:
-        return restPermissionDenied(request, "token exists")
+        return rv.restPermissionDenied(request, "token exists")
     params = dict(data=request.member.totp_getURI())
     error = request.DATA.get("error", None)
     if error is not None:
@@ -349,10 +350,10 @@ def totp_qrcode(request):
 def totp_verify(request):
     code = request.DATA.get("code", None)
     if code is None or len(code) != 6:
-        return restPermissionDenied(request, "invalid code format")
+        return rv.restPermissionDenied(request, "invalid code format")
     if not request.member.totp_verify(code):
-        return restPermissionDenied(request, "invalid code")
+        return rv.restPermissionDenied(request, "invalid code")
     request.member.setProperty("totp_verified", 1)
-    return restStatus(request, True)
+    return rv.restStatus(request, True)
 
 

{django_restit-4.1.78.dist-info → django_restit-4.1.79.dist-info}/METADATA

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

{django_restit-4.1.78.dist-info → django_restit-4.1.79.dist-info}/RECORD

@@ -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=TL74o-LH8ETqF0EzLb6Bis_lsLx9VEirA-ZvivBUPaE,13652
+account/rpc/auth.py,sha256=8HNXOGHxIuBi8kZwnJsbvydoeuqbSMqz06QUOWR_Aig,13841
 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
@@ -70,9 +70,9 @@ inbox/migrations/0003_attachment_content_type.py,sha256=dh_km90V6R3O0-N2oNTWhWLZ
 inbox/migrations/0004_mailtemplate.py,sha256=yV51UdsRWmKC5Dy34-h2bXBeYeFtjoWQ7kOw7cuYCQo,1140
 inbox/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inbox/models/__init__.py,sha256=yARvP31nhJGLjqP-U_ONi2OLjiTUFspdH0AlKynt4Y8,174
-inbox/models/bounce.py,sha256=VwQ9soyE44p-tbcR2mROY59WY4tYwWTN0ry-2610Xn0,2832
-inbox/models/complaint.py,sha256=AjL7qhQf0Sto-DFMRvpsu2Xzukj2S1rrbf4qU7z6HJA,2468
-inbox/models/message.py,sha256=eB_YCaKo5sSvQ10noyghulX59qHx1wb_-rCGYnaheqc,2905
+inbox/models/bounce.py,sha256=3b_pCKH3gwb3NE8I1XlVI6JeoVmobZyKidsILH-jIRg,2881
+inbox/models/complaint.py,sha256=AcESgSzb26wLLmcW2VCsQ-MApZCkp_TfFJnaghiPf2s,2517
+inbox/models/message.py,sha256=iSbeKv6GUPflk_2v97ZR51OdSUAHjbTZA5xXs7CLREs,3003
 inbox/models/template.py,sha256=i5vf0vsM1U0251UmVsF61MDCV_c7xt-zdCdx1SiKOG0,1013
 inbox/rpc.py,sha256=7JXvpXlEGKG7by_NkANPGYLCzagyCnTIGM4rme_htpk,1534
 inbox/utils/__init__.py,sha256=P_UR2rGK3L0tZNlTN-mf99tpeYM-tLkA18iDKXSSLDM,89
@@ -80,7 +80,7 @@ inbox/utils/parsing.py,sha256=ae8JKm10qg6Q3dGhC29oDKKycN3yeDxI6e9SryPKxcY,4615
 inbox/utils/render.py,sha256=t07vtf-G4clnFpFidswjflrlB-klJpQkEW7ZCcsanb0,4098
 inbox/utils/sending.py,sha256=BKelTZnbkdSLGpjOY6IRTrzj-Hnw2pPZ7RYQGwe-tqk,2179
 incident/README.md,sha256=4vbZTJj7uUmq8rogYngxqNYjFTlBOujfWUGheLoFKMc,1114
-incident/__init__.py,sha256=01WPRJe5I50wsIig-ZVM2YZk4qvp9hO7VhugrB9yK9Y,3079
+incident/__init__.py,sha256=9El01x5l9Xc28FD3cxGfYzXtzLWnuD1nebdktY76Bb8,3249
 incident/migrations/0001_initial.py,sha256=KmJRau3a2QFRaUwUrFUgY2p7FQZCODv3F-Sl0ZArpu0,9720
 incident/migrations/0002_event_component_event_component_id.py,sha256=Qfu3ndJKh4v7953ULTUZlSa3mVI-lnFIq9VFN1Rbs7Q,595
 incident/migrations/0003_rule_action.py,sha256=LNqV52qOjxxe3L8qEdln-Hd2voFcpyjOZ_cEsasrv7s,425
@@ -94,15 +94,15 @@ incident/migrations/0010_incident_category_incident_component_id.py,sha256=FGRHn
 incident/migrations/0011_ticket.py,sha256=Ml5E_Qi4Z0MD89fetoOFOL3rPlVQdjaaDCcFBfOuwd4,2142
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
-incident/models/event.py,sha256=AXFV92OtnVi3opSZcRX1o3qZ8uBvqGFL549AXH2gjY8,6792
-incident/models/incident.py,sha256=zaq81_ZdGAeUDKpmP2c9Du8TPTMt2EW5e-Oyt8q2Lwo,14390
-incident/models/ossec.py,sha256=pWMqcuTRxPFTEF-OZQSMn7YpNEE9mfsI4GMhWWjJs5I,2187
-incident/models/rules.py,sha256=Ua-hC78_D6YikJjP3DXfA8ghi6zu__Qud8H1bk7MRG0,5342
+incident/models/event.py,sha256=zXH8srWCm_bZLupWsuupqPfcu22733QBPgH-16yIMks,6786
+incident/models/incident.py,sha256=Zsg0FP6wtl2gU8Z1MoCg2uFQ57YfPYpAkIlirYHRMIA,14384
+incident/models/ossec.py,sha256=p1ptr-8lnaj1EP_VmPR58b2LmaYBGaYYKAMqhWK5yZM,2227
+incident/models/rules.py,sha256=NZHy4CZ42Z4ypm4SMURl70lga91slt1gWjx7db78a0M,5382
 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
 incident/periodic.py,sha256=K5ICRdXrRyR2rwf3IlBdByJlFw-pk80kKkXQCnx59Y0,227
-incident/rpc.py,sha256=YdosJCdBl7WORNc_c4Fh2NHUjmOLf25sOW_SSd12208,5695
+incident/rpc.py,sha256=BYRb6fhvh3klGf7OziKxALi2UfsTdQpEWLGFF-lrk90,6590
 incident/templates/email/incident_change.html,sha256=O_5ocWTsnqmmOuQhAtXEiE4rWecnZnJjoKU4MwV6ILo,14178
 incident/templates/email/incident_new.html,sha256=IPX3CqIrvdrZSn13_jlR6sEb0If8ftvUrUpkzC5G2Gc,15173
 incident/templates/email/incident_plain.html,sha256=fx4zsoldG1AQEBA6IYx5BJp_MAMizgjjx9EmuR5m4SQ,14727
@@ -115,7 +115,7 @@ location/migrations/0002_geoip_subnet_alter_geoip_ip.py,sha256=n-oJrEnIqN9VnMhiZ
 location/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 location/models/__init__.py,sha256=rZhldkoKmoJQXjBAK1IIQn7K_OOJvFtIGOGVl_szqbE,230
 location/models/address.py,sha256=GFMyGg9md0y6Szj6bue7sx7ucVjhOgpwJAaz6lYtQEs,2028
-location/models/ip.py,sha256=YTKLoaUARV0lXh44P45UOqM_FjhsN6Ic-Ce4fxwWFdE,5416
+location/models/ip.py,sha256=ZaBFdW1tL1Q3bnS5gIY9SseiQ5xeeP_oyP1hp3czFeA,5984
 location/models/legacy.py,sha256=8ROsUSZrjGQkUyXeJvoxPdKAWaKfUH-AL9TIeJb7krg,1994
 location/models/location.py,sha256=01dJPJecbp5orExsIGWOsBC_KkwFRIW0rGDIwyx1r0w,2316
 location/models/track.py,sha256=OdhRL1KVXlPcZkp4S6QpKc7Ctoth8VjwHs_dlZ8XHI4,1474
@@ -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=SsTnBSKxV3hgQ7x3z8wsHEwMBpWmQS9pMcwWsMT5lH4,121
+rest/__init__.py,sha256=ZR8fqdCL5dahKgs4COpTPpJ7HcPf2qKjiL6pgnu8vCI,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
@@ -359,7 +359,7 @@ rest/crypto/aes.py,sha256=f7UgiTGCfgjCc7dL94vnxkPhq_5NzooI-kw0B8_nA58,3605
 rest/crypto/privpub.py,sha256=_FioylVcbMmDP80yPYjURmafEiDmEAMkskbc7WF10ac,4082
 rest/crypto/util.py,sha256=agFN2OCPHC70tHNGWrMkkZX4Tt_Ty6imoKEMdTkZpKA,4514
 rest/datem.py,sha256=boG5a1PeK1q51Pf7vHhLZHItbQOlzTc9bC4bdbhiOFE,9330
-rest/decorators.py,sha256=3RB1ZkJ0dxZhdUyYr8v9QQ4xk_zXB7fn97Y68ZeeMqo,15177
+rest/decorators.py,sha256=ig0LATc3-2mhEJPAWHRbIRM-ZOFyjm6e_F9RhpRWidE,15082
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
 rest/errors.py,sha256=Jy7Hld3d0Ooc-nJ995N5SDx0EXQLWKac7g6VLJpVJf0,501
 rest/extra/__init__.py,sha256=YzmNsch5H5FFLkUK9mIAKyoRK_rJCA9HGb0kubp4h30,54
@@ -385,7 +385,7 @@ rest/middleware/session_store.py,sha256=X_i06TnZLW1srV0vkjjLhZ7fl1G56PswXxRpVzdF
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
 rest/models/base.py,sha256=pjilLSXpkNVdyOVm8ipExYpjW-P--w4yKW36j3-EOdY,65787
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
-rest/models/metadata.py,sha256=VM5t3I1DYgvwLAOjaYcMdVZ2JWrrcJUMU3o3gATkPYk,12626
+rest/models/metadata.py,sha256=ui0962oaWbYGIbkNs7oaUGKyaca9epsW2H-ywgyH7rg,12631
 rest/net.py,sha256=LTF4ip-ur8C2G7NETVOg7ioACegBGo4sDJA18PfF5kQ,1691
 rest/regexes.yaml,sha256=VoGb4E-P_K9f82Yzcpltgzekpt9usRtwu9PYlo46nUw,149463
 rest/requestex.py,sha256=rOMWK8S_mGm-AlDe0WfBmU-SaTE0u5G2RxJupxl9zgQ,15582
@@ -399,7 +399,7 @@ rest/serializers/json.py,sha256=R1has2PZQuXacA6WwfdrBnMG4rSM6CrnXQOhGoAU6Dk,1736
 rest/serializers/legacy.py,sha256=JMv1eWhUJveBGO0E80PrsxvROGDl9EYAlx407tmVt7g,61872
 rest/serializers/model.py,sha256=08HJeqpmytjxvyiJFfsSRRG0uH-iK2mXCw6w0oMfWrI,8598
 rest/serializers/profiler.py,sha256=OxOimhEyvCAuzUBC9Q1dz2xaakjAqmSnekMATsjduXM,997
-rest/serializers/response.py,sha256=9zIgIYj_Y47X001_Ujwul4-xE2wMGw3hZ4B_g62NSBI,6840
+rest/serializers/response.py,sha256=-XDJG60LGfy1kwuuOamrEKkxiDX-nbBelWBjwK0weHg,6903
 rest/serializers/util.py,sha256=-In89fpuVTd6_Ul8nwEUt3DjVKdpeoEyAxudlyB8K6Y,2734
 rest/settings_helper.py,sha256=_Vn9nmL5_GPss9zIsXzacbTQkn99NbO42CqvOZC3ge4,1532
 rest/ssl_check.py,sha256=kH4Pk4upUEwKTAnBLR0DIKezNJHjkW3g2TdQAObEgW4,1419
@@ -431,9 +431,9 @@ taskqueue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/admin.py,sha256=E6zXoToS_ea3MdoGjZzF1JiepWFtDSoZUQdan8H-pXI,208
 taskqueue/migrations/0001_initial.py,sha256=JwYib8CK5ftSXlfxKZUcKEEVsXktNB5q3h-2tu9inGk,4738
 taskqueue/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-taskqueue/models.py,sha256=0hqAYWfbWn-EhXL4cvzJNIIblC6gcLceyW3rhmZvnDs,19208
+taskqueue/models.py,sha256=nYS9Thv3P673cWJ3DPVVr0SnZEWj7Fqa0uHvyXhTJkg,19274
 taskqueue/periodic.py,sha256=2i0271khrCow3hDmlNEcoAZnesBVl40jd7MIim2Cxs4,3543
-taskqueue/rpc.py,sha256=CrxWKMTXi1EDvjB6iW5rAlwCpQIP_n1RW8Yfx9aKB9Y,5711
+taskqueue/rpc.py,sha256=If5E9D9AR2RqW4lHRaDuD9L9b9ZfL_PaBQ6iX91ehvU,5736
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
 taskqueue/transports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/transports/email.py,sha256=H4GaomiyCck5R_AOcsrMawCl-_Bp_Zg-uWto9t1Xcoo,623
@@ -448,9 +448,9 @@ telephony/decorators.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/migrations/0001_initial.py,sha256=YRiNtpeqj-4uvq19sfI64Q-KRnQ_T53kNzyt-CZUl14,3030
 telephony/migrations/0002_alter_sms_sid.py,sha256=QAnMG-UZ5emssZwdJ8XwfaRh3872zUUR55maDMD4RkE,424
 telephony/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-telephony/models.py,sha256=68BWPyTZ_bNptuCqhFEv3iraMp6bcWKXfJ7jnj_pUpo,8142
+telephony/models.py,sha256=xltZ-PJIOOB2NaHTGM9oBaCLSjNDzP2tVEyyqgk38s0,8248
 telephony/phone_util.py,sha256=15IWkTSqkjDWT9edPAYogAxHc1OdjOziPSxsJ8vfpfE,2426
-telephony/rpc.py,sha256=GVPWH5XSPNar-ICu5oq-yF6FBmJbju3XJr6gSXA6ZVU,3535
+telephony/rpc.py,sha256=PXPDFvgoXkCKlfMzIbt6lYZPay3fcveNj2X4Pjby7p4,3473
 wiki/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 wiki/migrations/0001_initial.py,sha256=9jvUyjrbJrbDilRnwzQUPhPV8Xi_olEPBk_N0nycvM0,3606
 wiki/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.78.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.78.dist-info/METADATA,sha256=GMzT_toBJXnUOfQqII6E7odb-y7Ffm5eiRrEJTfvVCo,7573
-django_restit-4.1.78.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.78.dist-info/RECORD,,
+django_restit-4.1.79.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.1.79.dist-info/METADATA,sha256=Ba4UkIRWNgZ9Ongd5-J4HgIza9ZN7GueY_o_tY5VA6E,7573
+django_restit-4.1.79.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.1.79.dist-info/RECORD,,

inbox/models/bounce.py

@@ -12,6 +12,7 @@ class Bounce(models.Model, rm.RestModel):
     class RestMeta:
         CAN_SAVE = CAN_CREATE = False
         DEFAULT_SORT = "-id"
+        VIEW_PERMS = ["view_logs", "view_email"]
         SEARCH_FIELDS = ["address"]
         SEARCH_TERMS = [
             ("email", "address"),

inbox/models/complaint.py

@@ -13,6 +13,7 @@ class Complaint(models.Model, rm.RestModel):
         CAN_SAVE = CAN_CREATE = False
         DEFAULT_SORT = "-id"
         SEARCH_FIELDS = ["address"]
+        VIEW_PERMS = ["view_logs", "view_email"]
         SEARCH_TERMS = [
             ("email", "address"),
             ("to", "address"), "source", "reason", "state",

inbox/models/message.py

@@ -5,6 +5,7 @@ from rest import models as rm
 class Mailbox(models.Model, rm.RestModel, rm.MetaDataModel):
     class RestMeta:
         DEFAULT_SORT = "-id"
+        VIEW_PERMS = ["view_logs", "view_email"]
 
     created = models.DateTimeField(auto_now_add=True, editable=False, db_index=True)
     modified = models.DateTimeField(auto_now=True)
@@ -28,6 +29,7 @@ class Message(models.Model, rm.RestModel):
         CAN_SAVE = CAN_CREATE = False
         CAN_DELETE = True
         DEFAULT_SORT = "-id"
+        VIEW_PERMS = ["view_logs", "view_email"]
 
     created = models.DateTimeField(auto_now_add=True, editable=False, db_index=True)
     modified = models.DateTimeField(auto_now=True)

incident/__init__.py

@@ -24,6 +24,8 @@ def event_now(category, description, level=10, request=None, **kwargs):
                 data.metadata[key.lower()] = str(value)
         if hasattr(request, "buid"):
             data.metadata["buid"] = request.buid
+        if "username" not in data.metadata and hasattr(request, "member") and request.member is not None:
+            data.metadata["username"] = request.member.username
     if "hostname" in data.metadata:
         data.hostname = data.metadata.hostname
     if "details" in data.metadata:

incident/models/event.py

@@ -46,7 +46,7 @@ class Event(JSONMetaData, rm.RestModel):
     class RestMeta:
         POST_SAVE_FIELDS = ["level", "catagory"]
         SEARCH_FIELDS = ["description", "hostname"]
-        # VIEW_PERMS = ["example_permission"]
+        VIEW_PERMS = ["view_incidents"]
         GRAPHS = {
             "default": {
                 "graphs": {

incident/models/incident.py

@@ -36,7 +36,7 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
     class RestMeta:
         POST_SAVE_FIELDS = ["level", "catagory"]
         SEARCH_FIELDS = ["description", "hostname"]
-        # VIEW_PERMS = ["example_permission"]
+        VIEW_PERMS = ["view_incidents"]
         GRAPHS = {
             "default": {
                 "extra": ["metadata", ("get_state_display", "state_display")],

incident/models/ossec.py

@@ -9,6 +9,7 @@ class ServerOssecAlert(models.Model, rm.RestModel):
     # osec alert settings will be managed through metadata
     class RestMeta:
         DEFAULT_SORT = "-id"
+        VIEW_PERMS = ["view_incidents"]
         SEARCH_FIELDS = ["rule_id", "hostname", "action"]
         GRAPHS = {
             "default": {

incident/models/rules.py

@@ -27,6 +27,7 @@ class Rule(models.Model, rm.RestModel):
     class RestMeta:
         SEARCH_FIELDS = ["name", "group__name"]
         CAN_DELETE = True
+        VIEW_PERMS = ["view_incidents"]
         # VIEW_PERMS = ["example_permission"]
         GRAPHS = {
             "default": {

incident/rpc.py

@@ -5,6 +5,31 @@ from rest import settings
 from . import models as am
 from .parsers import ossec
 from taskqueue.models import Task
+import incident
+
+
+def patched_restPermissionDenied(request, error="permission denied", error_code=403):
+    description = f"permission denied: {error_code} '{error}' for {request.user} {request.method}:{request.path}"
+    rh.log_error(description)
+    metadata = dict(error=error, error_code=error_code)
+    if hasattr(request, "member") and request.member is not None:
+        metadata["component"] = "account.Member"
+        metadata["component_id"] = request.member.pk
+    incident.event_now(
+        "rest_denied",
+        description,
+        level=10,
+        request=request,
+        **metadata)
+    return rv.restStatus(request, False, error=error, error_code=error_code)
+
+
+def patched_restNotFound(request):
+    return rv.restPermissionDenied(request, error="not found", error_code=404)
+
+
+if settings.REPORT_PERMISSION_DENIED:
+    rv.restPermissionDenied = patched_restPermissionDenied
 
 
 @rd.urlPOST(r'^ossec/alert$')

location/models/ip.py

@@ -12,6 +12,7 @@ GEOIP_LOOKUP_BY_SUBNET = settings.get("GEOIP_LOOKUP_BY_SUBNET", True)
 class GeoIP(models.Model, rm.RestModel):
     class RestMeta:
         SEARCH_FIELDS = ["ip", "isp"]
+        CAN_DELETE = False
 
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
@@ -124,21 +125,28 @@ class GeoIP(models.Model, rm.RestModel):
     @staticmethod
     def removeDuplicates():
         # Find all ip_addresses that have duplicates
+        # would be good to figure out how to not create duplicates
         duplicates = GeoIP.objects.values('ip')\
-                                    .annotate(ip_count=models.Count('id'))\
-                                    .filter(ip_count__gt=1)
+                                  .annotate(ip_count=models.Count('id'))\
+                                  .filter(ip_count__gt=1)
         for entry in duplicates:
             # Get the first instance of MyModel for this ip_address
             first_instance = GeoIP.objects.filter(ip=entry['ip'])\
                                             .order_by('id').first()
-
             # Find all related models
             for rel in GeoIP._meta.related_objects:
                 if isinstance(rel, models.ForeignKey):
                     related_model = rel.related_model
                     fk_field = rel.field.name
                     # Update the ForeignKey in each related model
-                    related_model.objects.filter(**{fk_field: entry['ip']})\
+                    related_model.objects.filter(**{f"{fk_field}__ip": entry['ip']})\
+                                         .exclude(**{fk_field: first_instance})\
+                                         .update(**{fk_field: first_instance})
+                elif isinstance(rel, models.ManyToOneRel):
+                    related_model = rel.related_model
+                    fk_field = rel.field.name
+                    # print(f"{rel}.{related_model}.{fk_field}")
+                    related_model.objects.filter(**{f"{fk_field}__ip": entry['ip']})\
                                          .exclude(**{fk_field: first_instance})\
                                          .update(**{fk_field: first_instance})
 

rest/__init__.py

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

rest/decorators.py

@@ -8,7 +8,7 @@ from django.http import HttpResponseRedirect
 from django.utils.cache import patch_cache_control, add_never_cache_headers, patch_vary_headers
 
 from rest import settings
-from rest.views import restStatus, restPermissionDenied
+from rest import views as rv
 from rest.errors import RestError, PermissionDeniedException
 from rest import helpers as rh
 import metrics
@@ -61,8 +61,7 @@ def rest_error_catcher(func, request, *args, **kwargs):
                 metrics.metric(f"rest_call_{slug_path}", category="rest_calls")
         return func(request, *args, **kwargs)
     except PermissionDeniedException as err:
-        rh.log_error("permission denied: '{}' for {} {}:{}".format(err, request.user, request.method, request.path))
-        return restStatus(request, False, error=err.reason, error_code=err.code)
+        return rv.restPermissionDenied(request, err.reason, err.code)
     except RestError as err:
         rh.log_exception("REST ERROR", request.path, err.reason)
         if settings.get("REST_ERROR_METRICS", True):
@@ -72,7 +71,7 @@ def rest_error_catcher(func, request, *args, **kwargs):
                 request, f"{err.code}: {err.reason}", level=7,
                 category="rest_error",
                 reason=err.reason, code=err.code)
-        return restStatus(request, False, error=err.reason, error_code=err.code)
+        return rv.restStatus(request, False, error=err.reason, error_code=err.code)
     except Exception as err:
         rh.log_exception("REST EXCEPTION", request.path)
         if settings.get("REST_ERROR_METRICS", True):
@@ -84,8 +83,8 @@ def rest_error_catcher(func, request, *args, **kwargs):
         PersistentLog.logException(body, request=request, component="rest", action="error")
         stack = str(traceback.format_exc())
         incident.exception_event(request, err, body, stack)
-        return restStatus(request, False, error=str(err), stack=stack)
-    return restStatus(request, False)
+        return rv.restStatus(request, False, error=str(err), stack=stack)
+    return rv.restStatus(request, False)
 
 
 def dispatcher(request, *args, **kwargs):
@@ -102,7 +101,7 @@ def dispatcher(request, *args, **kwargs):
     if key in module.urlpattern_methods:
         return rest_error_catcher(module.urlpattern_methods[key], request, *args, **kwargs)
     # print module.urlpattern_methods
-    return restStatus(request, False, error="endpoint not found", error_code=404)
+    return rv.restPermissionDenied(request, error="endpoint not found", error_code=404)
 
 
 def _load_module(mod):
@@ -303,7 +302,7 @@ def login_required(func):
     @wraps(func)
     def inner_func(request=None, *args, **kwargs):
         if not request.user.is_authenticated:
-            return restStatus(request, False, error="permission denied", error_code=401)
+            return rv.restPermissionDenied(request, error="permission denied", error_code=401)
         return func(request, *args, **kwargs)
     return inner_func
 
@@ -319,7 +318,7 @@ def staff_required(func):
     @wraps(func)
     def inner_func(request=None, *args, **kwargs):
         if not request.user.is_authenticated or not request.user.is_staff:
-            return restStatus(request, False, error="staff request denied", error_code=402)
+            return rv.restPermissionDenied(request, error="staff request denied", error_code=402)
         return func(request, *args, **kwargs)
     return inner_func
 
@@ -328,7 +327,7 @@ def superuser_required(func):
     @wraps(func)
     def inner_func(request=None, *args, **kwargs):
         if not request.user.is_authenticated or not request.user.is_superuser:
-            return restStatus(request, False, error="admin request denied", error_code=402)
+            return rv.restPermissionDenied(request, error="admin request denied", error_code=402)
         return func(request, *args, **kwargs)
     return inner_func
 
@@ -340,7 +339,7 @@ class requires_params(object):
     def __call__(self, func):
         def inner_func(request=None, *args, **kwargs):
             if not request.DATA.hasRequired(self.params):
-                return restPermissionDenied(request, error="missing required fields")
+                return rv.restPermissionDenied(request, error="missing required fields")
             return func(request, *args, **kwargs)
         return inner_func
 
@@ -353,7 +352,7 @@ class perm_required(object):
         def inner_func(request=None, *args, **kwargs):
             status, error, code = rh.requestHasPerms(request, self.perms)
             if not status:
-                return restStatus(request, False, error=error, error_code=code)
+                return rv.restPermissionDenied(request, error=error, error_code=code)
             return func(request, *args, **kwargs)
         return inner_func
 
@@ -367,9 +366,9 @@ class post_perm_required(object):
             if request.method == "post":
                 status, error, code = rh.requestHasPerms(request, self.perms)
                 if not status:
-                    return restStatus(request, False, error=error, error_code=code)
+                    return rv.restPermissionDenied(request, error=error, error_code=code)
             elif not request.user.is_authenticated:
-                return restStatus(request, False, error="permission denied", error_code=401)
+                return rv.restPermissionDenied(request, error="permission denied", error_code=401)
             return func(request, *args, **kwargs)
         return inner_func
 
@@ -379,7 +378,7 @@ def ip_whitelist(func, *args, **kwargs):
     def inner_func(request=None, *args, **kwargs):
         request_ip = request.META['REMOTE_ADDR']
         if request_ip not in settings.AUTHORIZED_IPS:
-            return restStatus(request, False, error="permission denied")
+            return rv.restPermissionDenied(request, error="permission denied")
         return func(request, *args, **kwargs)
     return inner_func
 

rest/models/metadata.py

@@ -213,7 +213,7 @@ class MetaDataModel(object):
                     self
                 )
             request.member.notifyWithPermission(props.notify, subject, msg, email_only=True)
-        raise re.PermissionDeniedException(subject)
+        raise re.PermissionDeniedException(subject, 481)
 
     def setProperties(self, data, category=None, request=None, using=None):
         for k, v in data.items():

rest/serializers/response.py

@@ -95,6 +95,8 @@ def restResponseLog(request, resp):
 
 
 def restPermissionDenied(request, error="permission denied", error_code=403):
+    # from rest import helpers as rh
+    # rh.log_error(error)
     return restStatus(request, False, error=error, error_code=error_code)
 
 

taskqueue/models.py

@@ -61,6 +61,7 @@ class Task(models.Model, RestModel):
         DEFAULT_SORT = "-modified"
         POST_SAVE_FIELDS = ["action"]
         SEARCH_FIELDS = ["channel", "model", "fname", "data"]
+        VIEW_PERMS = ["tq_view"]
         SEARCH_TERMS = [
             "channel", "model", "fname",
             "data", "reason", "runtime", "state"
@@ -469,6 +470,7 @@ class TaskHook(models.Model, RestModel, MetaDataModel):
         CAN_DELETE = True
         DEFAULT_SORT = "-modified"
         SEARCH_FIELDS = ["channel", "model", "endpoint"]
+        VIEW_PERMS = ["tq_view"]
         SEARCH_TERMS = [
             "channel", "model", "fname",
             "data", "reason", "runtime", "state"

taskqueue/rpc.py

@@ -27,12 +27,12 @@ def rest_on_tasklog(request, pk=None):
 @rd.url(r'^task/schedule$')
 @rd.url(r'^task/schedule/(?P<pk>\d+)$')
 @rd.login_required
-def rest_on_tasklog(request, pk=None):
+def rest_on_tasklog_schedule(request, pk=None):
     return tq.ScheduledTask.on_rest_request(request, pk)
 
 
 @rd.urlPOST(r'^task/publish$')
-@rd.perm_required("manage_staff")
+@rd.perm_required(["manage_users", "tq_publish"])
 def rest_on_task_publish(request, pk=None):
     app = request.DATA.get("app").strip()
     module = request.DATA.get("module").strip()

telephony/models.py

@@ -12,6 +12,7 @@ class SMS(models.Model, RestModel):
         CAN_CREATE = False
         CAN_DELETE = True
         DEFAULT_SORT = "-created"
+        VIEW_PERMS = ["view_logs", "view_telephony"]
         QUERY_FIELDS = ["endpoint", "srcpoint"]
         SEARCH_FIELDS = ["endpoint", "srcpoint"]
         SEARCH_TERMS = [
@@ -175,6 +176,7 @@ class SMS(models.Model, RestModel):
 class PhonenumberInfo(models.Model, RestModel):
     class RestMeta:
         CAN_CREATE = False
+        VIEW_PERMS = ["view_logs", "view_telephony"]
         QUERY_FIELDS = ["number", "owner_name"]
         SEARCH_FIELDS = ["number", "owner_name"]
         SEARCH_TERMS = [

telephony/rpc.py

@@ -17,14 +17,12 @@ except ImportError:
 
 @rd.url('sms/msg')
 @rd.url('sms/msg/<int:pk>')
-@rd.perm_required("view_logs")
 def handle_sms_list(request, pk=None):
     return SMS.on_rest_request(request, pk)
 
 
 @rd.urlGET('info')
 @rd.urlGET('info/<int:pk>')
-@rd.perm_required("view_logs")
 def handle_number_info(request, pk=None):
     return PhonenumberInfo.on_rest_request(request, pk)