django-restit 4.0.12__py3-none-any.whl → 4.1.1__py3-none-any.whl

{django_restit-4.0.12.dist-info → django_restit-4.1.1.dist-info}/METADATA

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

{django_restit-4.0.12.dist-info → django_restit-4.1.1.dist-info}/RECORD

@@ -322,7 +322,7 @@ metrics/models.py,sha256=YGZqx-rN9dhNTSzO9-mZlJZlbtZeaqcnpWxLZlQc5II,10599
 metrics/periodic.py,sha256=QQmN_bTRagOf54QKeJOrW99YqEsozTsZjKaPg-yRgyo,480
 metrics/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metrics/providers/aws.py,sha256=1TC3o_sSDETNzIQw-vqJ_J62rnjrWTXuEroWN1sbmfI,7335
-metrics/rpc.py,sha256=oo82JG1oPDMskWXUpcIjDtfWVSOpZURoUCfEQvNoCws,14826
+metrics/rpc.py,sha256=cb3D4Xu6yOzD29SmCUyCNGSYtE0yDHAq-hanIdxJxvY,14827
 metrics/settings.py,sha256=wwHA9Z7BAHNeu3tFVn8Fh5j46KR-eGx0E8r5dzCFlAU,132
 metrics/tq.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metrics/utils.py,sha256=4IE1gHAjm6fuan9D27fYEks11Y5Bugk62VSN2InidmU,10490
@@ -330,7 +330,7 @@ pushit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pushit/admin.py,sha256=69HdDZU_Iz8Fm72M8r8FUztsZvW37zdGwVmj8VTqr0c,451
 pushit/migrations/0001_initial.py,sha256=kYF1ksOlKf9ElrlagGhpNf5GbKEq6SORWGreMH9A7as,4555
 pushit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pushit/models.py,sha256=jrfreqBTThe0GvSbu16ACBMIGcZQX1534ECxVVtbVBk,5076
+pushit/models.py,sha256=dbUJgD9W1y_2H5NxMUQhjsucvLkruErRMXkUSbza3ck,5066
 pushit/rpc/__init__.py,sha256=13ibfbWNdjoNxzCzF8QxasSzFgs8IZJPc05XhErOBCw,88
 pushit/rpc/githooks.py,sha256=p81qKjIcrFeQll1fKnm2pGRURWxKhT9TlH8PEHoc9po,1874
 pushit/rpc/legacy.py,sha256=9xsZH1S70htIb0bwKENfhTe-uHvyqSTiPiwYTlLWS3E,5028
@@ -341,21 +341,22 @@ pushit/utils.py,sha256=5NcWELJJjmiY2N7SiSh-qonJbLgVtFAu-EMkcFJ5St4,1966
 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=k5UlBm9gmj1BDfTHc6r7J_Yv-2GYFwfAet8dBKoZkW0,121
+rest/__init__.py,sha256=iEYrXYktGlXVVYPSHMGfpqa4QCKPy-tgI2w_NoWjsNE,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
 rest/crypto/aes.py,sha256=f7UgiTGCfgjCc7dL94vnxkPhq_5NzooI-kw0B8_nA58,3605
 rest/crypto/privpub.py,sha256=_FioylVcbMmDP80yPYjURmafEiDmEAMkskbc7WF10ac,4082
-rest/crypto/util.py,sha256=9xrXpdI7Q9L4B6N_UKkf0tyQCSNLIxPRoEVAyJraS3Y,3955
+rest/crypto/util.py,sha256=agFN2OCPHC70tHNGWrMkkZX4Tt_Ty6imoKEMdTkZpKA,4514
 rest/datem.py,sha256=Tv8wF2PX0Ktr1wLgGEj6o0OW45RSkD9XDLnLRk8bRjc,7784
-rest/decorators.py,sha256=LRjT6nBoxlMAkcylooL6GTBSLcXMMHpr172s0y1JN84,15603
+rest/decorators.py,sha256=kT15oKQLRto4rD3tjsdOcf0OvC_Bwo7WTWGNl3wiUxo,15573
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
+rest/errors.py,sha256=Jy7Hld3d0Ooc-nJ995N5SDx0EXQLWKac7g6VLJpVJf0,501
 rest/extra/__init__.py,sha256=YzmNsch5H5FFLkUK9mIAKyoRK_rJCA9HGb0kubp4h30,54
 rest/extra/json_metadata.py,sha256=p_ffzmANmOFix_oC3voR6_NNTjcn7-T7aXcH-I4_Npg,1078
 rest/fields.py,sha256=_v1TJVc6vyWlqmwFRJ6mtuR5Fo-lS0KcUhPWIrzKZUo,9719
 rest/forms.py,sha256=66Wm5cdy8tKib_mGicjq_yd-gNVMFWRECnrDksnNnwU,6316
-rest/helpers.py,sha256=ahTTAnsHPeBQTcxs7u-Yfjh5lP_hefDoBcIio12cYZg,23837
+rest/helpers.py,sha256=RRYpmZnsFtaZxUtdbBgud3mFYVkZ0HspGROXhgNDAxA,24650
 rest/joke.py,sha256=0PpKaX2iN7jlS62kgjfmmqkFBYLPURz15aQ8R7OJkJ8,260
 rest/jwtoken.py,sha256=1ruZGPTXnodb85ywPd8ZmRiRYCskopA8EhcbX7Adixc,2298
 rest/log.py,sha256=hd1_4HBOS395sfXJIL6BTw9yekm1SLgBwYx_PdfIhKA,20930
@@ -371,18 +372,21 @@ rest/middleware/jwt.py,sha256=p-1v-hIwLxo7wrI16ajrLDL5GRwA1Co_ObmSH81aOg8,5395
 rest/middleware/request.py,sha256=OlWE4_8nJ1krzuiNn2heecPxqtbTEhFzGYp3_7bnEEA,4127
 rest/middleware/session.py,sha256=-CzKTQHGDzz5tGrdSXC6fsNfRlYEjotAfuTbb_tSER0,9015
 rest/middleware/session_store.py,sha256=X_i06TnZLW1srV0vkjjLhZ7fl1G56PswXxRpVzdFasw,1874
-rest/models.py,sha256=OWhFSH1-J6U8FlskvjPgUyV0pAr-FO4Fv1ctD-wnX7A,76371
+rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
+rest/models/base.py,sha256=B4Jk8lgUgyjOMTy4Fvi6XZ0o_mCd2GpFblb26Imm2h0,62119
+rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
+rest/models/metadata.py,sha256=MQKiwXNGkpmloyLMNJoOSCV2ID_Fg9GP2VXm5t8iGX8,11606
 rest/regexes.yaml,sha256=VoGb4E-P_K9f82Yzcpltgzekpt9usRtwu9PYlo46nUw,149463
 rest/requestex.py,sha256=eD1eCPhLl7fj0oUKpESCTIr8O7mjOyBUsRXVMQ1h3W8,14894
 rest/rpc.py,sha256=KMih2Z4Z0Pqgwmcy_14nKqMCKJ9lGDJ6-vwMA2NSlyQ,3713
 rest/search.py,sha256=i7rnZZhlnuAT0isyVcMHEqGjbiz7EIArgjzzg7xwK-s,7645
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rest/serializers/collection.py,sha256=4Elf59d5GJK13ZvzjI7e5ftyF3ZmIjRyucYbnHW3JHE,1757
+rest/serializers/collection.py,sha256=A5T6A_iqQiVNt0AirhJrZfkGIKi-tIPtFxxDvrOZYmY,2008
 rest/serializers/csv.py,sha256=nae_SIIpDH7HReErjNacVxEujzTvJqQxHd29BY-RXh0,2975
 rest/serializers/excel.py,sha256=KtxqZZU5Huzo31tyVVWbshMudeSAImKLO71ufQQt0-c,1077
 rest/serializers/json.py,sha256=R1has2PZQuXacA6WwfdrBnMG4rSM6CrnXQOhGoAU6Dk,1736
-rest/serializers/legacy.py,sha256=ZFvUzN_IW71v2zH3Upm0cSjXPGcT0c3un-Ulj0CIbxI,61801
-rest/serializers/model.py,sha256=uGjEoDsq5dYabULqOgekhMh1vkoRSXziWAtc-p2rZso,5861
+rest/serializers/legacy.py,sha256=AhwXFZQQ2XedV5ztQiHPbDRkd4vDX1iTejZrHH-r5Gs,61795
+rest/serializers/model.py,sha256=60A7ahflZZDiYQjHVOBYdzTT83V5cqlOafDq0MmVN4w,6624
 rest/serializers/profiler.py,sha256=OxOimhEyvCAuzUBC9Q1dz2xaakjAqmSnekMATsjduXM,997
 rest/serializers/response.py,sha256=XU_0IVnt48PXPxKqMIS3NuCEM7lRzaL-QdonfQce29k,6464
 rest/serializers/util.py,sha256=-In89fpuVTd6_Ul8nwEUt3DjVKdpeoEyAxudlyB8K6Y,2734
@@ -437,9 +441,9 @@ telephony/rpc.py,sha256=dHpTFjyy6lv7AS_MyYurJu0XIRBES-A3A-beqnPhKHQ,2659
 ws4redis/README.md,sha256=QvwdsauPKxx4qQqnJ991xeU8DgFQCj3CeQt-nCE4s-w,3624
 ws4redis/__init__.py,sha256=teNfv83A_ke1CBt9BB7NsnWCcFBhnUFPsPESjF554_k,46
 ws4redis/client.py,sha256=ePuEh1mznxLkj3Xkq4j6yQ4nSZCOZiJFeDvh1-4FMM8,4942
-ws4redis/connection.py,sha256=Xqzz42msKozyoC1sb7WsACmUFvMCTg1ux1ciTVkpZR8,13026
+ws4redis/connection.py,sha256=XpGVconQdB7yk4hR3VTQBGGrtBDZJVtwnl4RKKMFHik,13110
 ws4redis/exceptions.py,sha256=EGLoRTdqJVwz900pwhciqPuSjBBd08hhLgFu6umHrI4,636
-ws4redis/redis.py,sha256=SZqi_-_FqDi35uSwUneXxjxqwWns8xvSvRr3UEKRvOM,5548
+ws4redis/redis.py,sha256=AmkiKc-KIytjAqNYIj6BBveJZfvmM7HA-anMGe_nlrU,5561
 ws4redis/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws4redis/servers/base.py,sha256=3nYZF5jSsQxNLbnLtKLFJ82xJs_Mc7N1H2kEOx8wT6o,3747
 ws4redis/servers/django.py,sha256=iNzWtGN4vZ-2ltClayCnPD-OPvB_ZGySnKD2EyXl6l8,4329
@@ -447,7 +451,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=lF-6nzv7SWjmFgmontpZKdSBhp8q4FhvFOcEYZGR8pc,1411
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.0.12.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.0.12.dist-info/METADATA,sha256=H_gWGoGdyH2TCa4NQ95BQ6IZiuKdvAcqhME0C2L8Hyo,7532
-django_restit-4.0.12.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.0.12.dist-info/RECORD,,
+django_restit-4.1.1.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.1.1.dist-info/METADATA,sha256=lAxYOcGU4XHO2wmr3aYEOmX3jyjhb9DiJq1LW2ztABY,7531
+django_restit-4.1.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.1.1.dist-info/RECORD,,

metrics/rpc.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from rest import decorators as rd
 from rest import views as rv
 from rest import settings
-from rest.models import requestHasPerms
+from rest.helpers import requestHasPerms
 from location.models import GeoIP
 from . import client as metrics
 from . import models as mm

pushit/models.py

@@ -10,7 +10,7 @@ from location.models import GeoIP, Address
 from rest import helpers as rest_helpers
 from rest.middleware import get_request
 from rest import RemoteEvents
-from rest.models import RestModel, MetaDataModel, MetaDataBase, UberDict
+from rest.models import RestModel, MetaDataModel, MetaDataBase
 
 class Product(models.Model, RestModel, MetaDataModel):
     class RestMeta:

rest/__init__.py

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

rest/crypto/util.py

@@ -13,6 +13,26 @@ def generateKey(bit_size=128, allow_punctuation=False):
     return randomString(byte_size, allow_punctuation)
 
 
+def generateUUID(*args, **kwargs):
+    upper = kwargs.get("upper", True)
+    max_length = kwargs.get("max_length", None)
+    uuid = ""
+    for key in args:
+        if isinstance(key, float):
+            key = str(float)
+        if isinstance(key, int):
+            uuid += Hashids().encrypt(key)
+        if isinstance(key, str):
+            uuid += toString(md5(toBytes(key)).hexdigest())
+    if len(uuid) > 125:
+        uuid = uuid[:125]
+    if max_length != None:
+        uuid = uuid[:max_length]
+    if upper:
+        return uuid.upper()
+    return uuid
+
+
 def get_random_bits(bit_size=128):
     return crypt_random.getrandbits(bit_size)
 

rest/decorators.py

@@ -9,8 +9,8 @@ from django.utils.cache import patch_cache_control, add_never_cache_headers, pat
 
 from rest import settings
 from rest.views import restStatus, restPermissionDenied
-from rest.models import RestError, requestHasPerms, PermissionDeniedException
-from rest import helpers
+from rest.errors import RestError, PermissionDeniedException
+from rest import helpers as rh
 import metrics
 import incident
 
@@ -61,16 +61,16 @@ 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:
-        helpers.log_error("permission denied: '{}' for {} {}:{}".format(err, request.user, request.method, request.path))
+        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)
     except RestError as err:
-        helpers.log_exception(err.reason)
+        rh.log_exception(err.reason)
         if settings.get("REST_ERROR_METRICS", True):
             metrics.metric("rest_errors")
         return restStatus(request, False, error=err.reason, error_code=err.code)
     except Exception as err:
         # TODO email errors to admins
-        helpers.log_exception(request.path)
+        rh.log_exception(request.path)
         if settings.get("REST_ERROR_METRICS", True):
             metrics.metric("rest_errors")
         stack = str(traceback.format_exc())
@@ -194,7 +194,7 @@ def _url_method(pattern, method=None, *args, **kwargs):
                 else:
                     func = f
                 if not isinstance(pattern, str):
-                    helpers.log_print("NOT A STRING", pattern)
+                    rh.log_print("NOT A STRING", pattern)
                 if pattern.startswith("^") or pattern.endswith("$"):
                     rpc_root_module.urlpatterns += [re_path(pattern, func, *args, **kwargs)]
                 else:
@@ -369,7 +369,7 @@ class perm_required(object):
 
     def __call__(self, func):
         def inner_func(request=None, *args, **kwargs):
-            status, error, code = requestHasPerms(request, self.perms)
+            status, error, code = rh.requestHasPerms(request, self.perms)
             if not status:
                 return restStatus(request, False, error=error, error_code=code)
             return func(request, *args, **kwargs)
@@ -383,7 +383,7 @@ class post_perm_required(object):
     def __call__(self, func):
         def inner_func(request=None, *args, **kwargs):
             if request.method == "post":
-                status, error, code = requestHasPerms(request, self.perms)
+                status, error, code = rh.requestHasPerms(request, self.perms)
                 if not status:
                     return restStatus(request, False, error=error, error_code=code)
             elif not request.user.is_authenticated:
@@ -439,7 +439,7 @@ def periodic(minute=None, hour=None, day=None, month=None, weekday=None, tz=None
             if force:
                 return func(force, verbose, now)
             if tz:
-                now = helpers.convertToLocalTime(tz, now)
+                now = rh.convertToLocalTime(tz, now)
             # lets create our when
             if minute is not None and not periodicCheckListHas(minute, now.minute):
                 return -22

rest/errors.py

@@ -0,0 +1,20 @@
+
+class RestError(Exception):
+    def __init__(self, reason, code=None):
+        self.reason = reason
+        self.code = code
+
+    def __repr__(self):
+        return self.reason
+
+
+class PermissionDeniedException(RestError):
+    def __init__(self, reason="permission denied", code=401):
+        self.reason = reason
+        self.code = code
+
+
+class RestValidationError(RestError):
+    def __init__(self, reason="rest data is not valid", code=123):
+        self.reason = reason
+        self.code = code

rest/helpers.py

@@ -54,6 +54,30 @@ def getActiveRequest():
     return HELPER_CACHE.get_request()
 
 
+def requestHasPerms(request, perms, group=None):
+    # third party auth models
+    if request.auth_model is not None:
+        if request.auth_model.hasPerm(perms):
+            return True, None, None
+
+    if not request.user.is_authenticated:
+        return False, "auth required", 401
+
+    if request.member.hasPerm(perms):
+        return True, None, None
+    if group is None and hasattr(request, "group"):
+        group = request.group
+    ms_perms = None
+    if group:
+        ms = request.member.getMembershipFor(group)
+        if ms and ms.hasPerm(perms):
+            return True, None, None
+        if ms:
+            ms_perms = ms.getPermissions()
+
+    # rest_helpers.log_error(F"PERMISSION DENIED for {request.member.username}, {perms}", str(group), ms_perms)
+    return False, "permission denied", 402
+
 def importModule(name):
     return importlib.import_module(name)
 

rest/models/__init__.py

@@ -0,0 +1,3 @@
+from rest.errors import *  # noqa: F401, F403
+from .base import *  # noqa: F401, F403
+# from .cacher import *  # noqa: F401, F403