django-restit 4.1.88__py3-none-any.whl → 4.2.1__py3-none-any.whl

account/models/group.py

@@ -46,7 +46,7 @@ class Group(models.Model, RestModel, MetaDataModel):
             "is_active": True
         }
         POST_SAVE_FIELDS = ["child_of"]
-        VIEW_PERMS = ["view_all_groups", "is_terminal"]
+        VIEW_PERMS = ["view_all_groups", "manage_groups", "is_terminal"]
         CREATE_PERMS = ["manage_groups", "create_groups"]
         GRAPHS = {
             "basic": {

account/models/member.py

@@ -401,13 +401,13 @@ class Member(User, RestModel, MetaDataModel):
         score += 1 if re.match(r'.*[!@#$%^&*.]', value) else 0
         if score < 3:
             self.log("password_error", "password is weak or duplicate", method="password_change", level=21)
-            raise RestValidationError("password is weak or duplicate")
+            raise RestValidationError(f"password is weak or duplicate: {self.pk}")
         if not skip_history and settings.PASSWORD_HISTORY:
             hashed_password = PasswordHistory.HashPassword(value)
             # this means you can never reuse the same password
             if self.password_history.filter(password=hashed_password).count():
                 self.log("password_error", "password already used", method="password_change", level=21)
-                raise RestValidationError("password already used")
+                raise RestValidationError(f"password already used: {self.pk}")
             if not self.id:
                 self.save()
             PasswordHistory(owner=self, password=hashed_password).save()

account/rpc/oauth.py

@@ -9,6 +9,7 @@ from account.oauth import google
 from account.models import Member
 from objict import objict
 from datetime import datetime, timedelta
+REST_PREFIX = settings.get("REST_PREFIX", "api/")
 
 
 @rd.url('oauth/google/login')
@@ -30,7 +31,7 @@ def oauth_google_login(request):
         params = urlencode({'error': error})
         return redirect(f"{app_url}?{params}")
 
-    redirect_uri = f"{settings.BASE_URL_SECURE}rpc/account/oauth/google/login"
+    redirect_uri = f"{settings.BASE_URL_SECURE}{REST_PREFIX}account/oauth/google/login"
     auth_data = google.getAccessToken(code, redirect_uri)
     if auth_data is None or auth_data.access_token is None:
         params = urlencode({'error': "failed to get access token from google"})

auditlog/middleware.py

@@ -4,6 +4,9 @@ from .models import PersistentLog
 DEBUG_REST_ALL = settings.get("DEBUG_REST_ALL", False)
 DEBUG_REST_END_POINTS = settings.get("DEBUG_REST_END_POINTS", [])
 IGNORE_REST_END_POINTS = settings.get("IGNORE_REST_END_POINTS", [])
+LOG_REST_PREFIX = settings.get("REST_PREFIX", "api/")
+if not LOG_REST_PREFIX.startswith("/"):
+    LOG_REST_PREFIX = f"/{LOG_REST_PREFIX}"
 
 
 def checkRestDebug(request):
@@ -37,7 +40,7 @@ class LogRequest(object):
     def process_request(self, request):
         # LogRequest.last_request = request
         request.rest_debug = False
-        if request.path.startswith("/rpc/"):
+        if request.path.startswith(LOG_REST_PREFIX) or request.path.startswith("/rpc/"):
             request.rest_debug = checkRestDebug(request)
             if request.rest_debug:
                 request.DATA.log()

{django_restit-4.1.88.dist-info → django_restit-4.2.1.dist-info}/METADATA

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

{django_restit-4.1.88.dist-info → django_restit-4.2.1.dist-info}/RECORD

@@ -21,9 +21,9 @@ account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 account/models/__init__.py,sha256=OxQbDkVcZogwgNj3bQWljOxAkkt15KgBYVrsumzek8Q,341
 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/group.py,sha256=jj4csGHDyDRMS_maL8AeV1k3whSxBdeffHxmnXrn-sg,20064
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
-account/models/member.py,sha256=B-EQAOi0-_ar8_u77BO4lMNrkst8nV4VhvHa3zqyDWg,48914
+account/models/member.py,sha256=5e-odISpgas7M4ZEqdNqAQwAWrdWG3lhgZDh0rNvdBs,48938
 account/models/membership.py,sha256=Qmp0xQa_3ObB581L83gce69t9eSfyH-mZZuGqW3ueI8,7763
 account/models/notify.py,sha256=YnZujSHJHY7B09e6FIyZIEJRWLPYk1Sk1e92tFzB1IA,12078
 account/models/session.py,sha256=swhxcx_lWzOpGCmfifXoACgWYqmKmS7eZsD9s9jSToc,3509
@@ -37,7 +37,7 @@ 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
 account/rpc/notify.py,sha256=Q2YWejP36egeF060Hih5uX4Psv_B8NWlLLPi7iDYlIw,3344
-account/rpc/oauth.py,sha256=-BW38HjYwSQhOs31ubnBxO0yCKVpczEMoHq54NC9uOU,2610
+account/rpc/oauth.py,sha256=qhXgrGrmg966_WTg7c4ZuldgWZEaub0dI3u102vX0wg,2669
 account/rpc/settings.py,sha256=EvPuwW63Gp_Va0ANIPAZ894tnS_JCctQ0FzqYRdKUNM,271
 account/settings.py,sha256=XEvZdcA6p_iUpDq9NmICK8rxzIQ8NViKfrpyuYgSV4o,53
 account/templates/email/base.html,sha256=GnqUkoOYLDmaL370E1M-Q0PKJ60VH0MzkcjUyg9DdyY,9709
@@ -52,7 +52,7 @@ auditlog/README,sha256=q4DXhdz5CuMyuxYISHXzhlHnIkRJlojwOMchLzW2qOI,520
 auditlog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auditlog/admin.py,sha256=-q7fstdFjNeDFfbwdrxVqy0WGKxMpBwrsM7AyG1p80g,1006
 auditlog/decorators.py,sha256=ZoIv0fhZjxtMEV15NcKijW4xPF5UEScPna60zB3TxZo,6553
-auditlog/middleware.py,sha256=GtfFR90uLltiLsAx8t4xeid5QssqcusbrKjgBl08kuw,1329
+auditlog/middleware.py,sha256=jQiuedadlu8NU0Fi7ExfPx6X1aQquXfSxMECMprO_tg,1511
 auditlog/migrations/0001_initial.py,sha256=X171gKQZIaTO9FGNG1yKTjGSZS0ZjZj5gvimF9-_kks,3309
 auditlog/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auditlog/models.py,sha256=6CyWMRNvqCYoyiXE9_qk41EJFjutwo6nfoP9KKYWiYw,16294
@@ -332,7 +332,7 @@ metrics/models.py,sha256=lD9nVzfwdav70ENulqJ8rE8Ui8EWlzdVp05rg8bAlMA,13444
 metrics/periodic.py,sha256=VmL0YG05D6k5fcNsF4QqPEU-BBPbZXjbOrp3b8EHZ-U,651
 metrics/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metrics/providers/aws.py,sha256=RDM5RLeFADHexm4cHaJdAm3K6iz1NwMSNcV9GYuGtjY,7432
-metrics/rpc.py,sha256=M-DcRk7SFiuoXIWIwkk13iJ2yMOMQ4mtWcigwa-5cIk,17614
+metrics/rpc.py,sha256=B-A2jbIvq85Li-nlR4P8ZnjMaydn_nAnGvw4AO-6oxE,17674
 metrics/settings.py,sha256=wwHA9Z7BAHNeu3tFVn8Fh5j46KR-eGx0E8r5dzCFlAU,132
 metrics/tq.py,sha256=pl9RG4vXViX2hhSTOENZwXsAXD-5luXkBQjgzj4bwtk,799
 metrics/utils.py,sha256=w6H2v8zjlOZ5uqZsJOQvZoN-2Kyv1h8PN76gMGow7AE,11995
@@ -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=b--x5oxoVqfx5p4BiCjgnFcNRXIbgQ3QlSdzW6rtnEE,121
+rest/__init__.py,sha256=wpNMb8Fg1zzY8J9BnZ6LahQtnmjZyKaJ68HvfSAUWuE,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
@@ -415,8 +415,8 @@ rest/templates/rest_html.html,sha256=wGZV3j_tB9rzzJlsMxidUQ5ex_uRPyU_s8GCmHLXiqk
 rest/ua.py,sha256=0wwOtJPWCiCxUKzWKyMApRbSaiuAxCCk0Pe3OwzYBhE,185398
 rest/uberdict.py,sha256=ivDpzfchQqX8dM2_TtuyMW7NNO-j7zDmxkdKixQxvU4,17064
 rest/url_docs.py,sha256=O8O_CQso3fB-7o-huidIT1BRGv5R6lDW-yKHnsGyAPk,11881
-rest/urls.py,sha256=U3eD9kI19wp-NkkXCiAjdQe560fslskQngStRcGDS0I,1787
-rest/views.py,sha256=IxG3RF5txtQg7ov4H_Iymozq3NjeJ-GQNMsmdmsmExM,1056
+rest/urls.py,sha256=QUx1F8eKpNnTibLg4L9KaaU3qQRkXcElcDClSeO_H48,1869
+rest/views.py,sha256=WUjHQMCzw2f4Te2X4Kh40ksfoVAAlrWC2pbt8nhcIYA,1115
 sessionlog/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 sessionlog/README.md,sha256=vQEVJ_8u3Vv19VwPfscjCiHFu61ZSrEM-KIuBpUXhws,62
 sessionlog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -441,7 +441,7 @@ taskqueue/transports/http.py,sha256=WFRLOfto_ODYzRUtYqeJq2GyV63pLfAWbvnRZTzaLIY,
 taskqueue/transports/s3.py,sha256=fMosL893u1iQdo6Y1djwb7KEoNo6TTsDPJl13OJdJP8,1913
 taskqueue/transports/sftp.py,sha256=jT1_krjTHA7DCAukD85aGYRCg9m0cEH9EWzOC-wJGdk,1891
 taskqueue/transports/sms.py,sha256=H1-LIGEMfbUNqJD9amRcsvKUSwtz9yBj1QNfB7EHjHE,142
-taskqueue/worker.py,sha256=bt3rFrw7Ahf1-RHAqAFCv_M6sMad6u2m2WygnFPsaxI,15960
+taskqueue/worker.py,sha256=MeG--B_OyiHniNEsk2LNgysAUh780iP0NdtdEO55ZKM,16050
 telephony/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/admin.py,sha256=iOdsBfFFbBisdqKSZ36bIrh_z5sU0Wx_PkaFi8wd1iA,243
 telephony/decorators.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.88.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.88.dist-info/METADATA,sha256=Gd2eWQz8TrNEEZ2BL3ztoPIR7RbtGjMnxrAUkLiQu6o,7573
-django_restit-4.1.88.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.88.dist-info/RECORD,,
+django_restit-4.2.1.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.1.dist-info/METADATA,sha256=brsAi3INkr3zkG4WQlHVp0MAngEWecz5RaKB1UVco3k,7572
+django_restit-4.2.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.1.dist-info/RECORD,,

metrics/rpc.py

@@ -17,6 +17,7 @@ import time
 Capture simple analytics counters.
 """
 LOCATION_METRICS = settings.LOCATION_METRICS
+REST_PREFIX = settings.get("REST_PREFIX", "api/")
 
 
 @rd.urlPOST('metric')
@@ -293,7 +294,7 @@ def rest_on_ec2_restit_stats(request, pk=None):
                 host = f"{name}.{hostname}"
         else:
             host = f"{name}.{hostname}"
-        resp = net.REQUEST("GET", host, "/rpc/versions", params=dict(detailed=1))
+        resp = net.REQUEST("GET", host, f"/{REST_PREFIX}versions", params=dict(detailed=1))
         if resp.status:
             resp.data.id = host
             resp.data.hostname = host

rest/__init__.py

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

rest/urls.py

@@ -27,6 +27,8 @@ def load_app(app, root_module=None):
         module = loadModule(f"{app}.rpc")
         if module is None:
             module = loadModule(f"{app}.rurl")
+            if module is None:
+                module = loadModule(f"{app}.rapi")
     except ImportError as err:
         print("**** failed to load {0}.rpc! ****".format(app))
         print("**** missing dependencies ****")

rest/views.py

@@ -5,13 +5,14 @@ else:
     from .serializers.response import *  # noqa: F401, F403
 from . import url_docs
 from django.shortcuts import render
+REST_PREFIX = settings.get("REST_PREFIX", "api/")
 
 
 def showDocs(request):
     from . import urls
     apis, graphs = url_docs.getRestApis(urls.urlpatterns)
     for api in apis:
-        api["url"] = "rpc/{0}".format(api["url"])
+        api["url"] = "{REST_PREFIX}{0}".format(api["url"])
     return render(request, "rest_docs.html", {"apis": apis, "graphs":graphs})
 
 

taskqueue/worker.py

@@ -204,7 +204,9 @@ class WorkManager(object):
             task.completed()
         elif task.state == 1:
             # slowly backoff retries
-            task.retry_later(from_now_secs=(task.attempts-1) * 120)
+            if task.attempts >= 5:
+                task.failed("max attempts")
+            task.retry_later(from_now_secs=task.attempts * task.attempts * 60)
 
     def _on_hookrequest(self, task):
         # we need to copy the data and remove the url