django-restit 4.0.12__tar.gz → 4.1.1__tar.gz

{django_restit-4.0.12 → django_restit-4.1.1}/PKG-INFO

@@ -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 → django_restit-4.1.1}/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

{django_restit-4.0.12 → django_restit-4.1.1}/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:

{django_restit-4.0.12 → django_restit-4.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.0.12"
+version = "4.1.1"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.0.12 → django_restit-4.1.1}/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"

{django_restit-4.0.12 → django_restit-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)
 

{django_restit-4.0.12 → django_restit-4.1.1}/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

django_restit-4.1.1/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

{django_restit-4.0.12 → django_restit-4.1.1}/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)
 

django_restit-4.1.1/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