django-restit 4.2.49__py3-none-any.whl → 4.2.51__py3-none-any.whl

auditlog/middleware.py

@@ -1,4 +1,5 @@
 from rest import settings
+from rest import helpers as rh
 from .models import PersistentLog
 
 DEBUG_REST_ALL = settings.get("DEBUG_REST_ALL", False)
@@ -10,19 +11,23 @@ if not LOG_REST_PREFIX.startswith("/"):
 
 
 def checkRestDebug(request):
+    if checkRestIgnore(request):
+        return False
     if DEBUG_REST_ALL:
         return True
     for ep in DEBUG_REST_END_POINTS:
         if request.path.startswith(ep):
-            return not checkRestIgnore(request)
+            return True
     return False
 
 
 def checkRestIgnore(request):
     for ep in IGNORE_REST_END_POINTS:
         if isinstance(ep, tuple):
-            method, ep = ep
-            return request.method == method and request.path.startswith(ep)
+            method, epath = ep
+            if request.method == method and request.path.startswith(epath):
+                return True
+        rh.debug("checkRestIgnore", f"{ep} vs {request.path}")
         if request.path.startswith(ep):
             return True
     return False
@@ -40,8 +45,10 @@ class LogRequest(object):
     def process_request(self, request):
         # LogRequest.last_request = request
         request.rest_debug = False
+        rh.debug("LogRequest.process_request", request.path, DEBUG_REST_ALL)
         if request.path.startswith(LOG_REST_PREFIX) or request.path.startswith("/rpc/"):
             request.rest_debug = checkRestDebug(request)
+            rh.debug("checkRestDebug", request.rest_debug, IGNORE_REST_END_POINTS)
             if request.rest_debug:
                 request.DATA.log()
         response = self.get_response(request)

{django_restit-4.2.49.dist-info → django_restit-4.2.51.dist-info}/METADATA

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

{django_restit-4.2.49.dist-info → django_restit-4.2.51.dist-info}/RECORD

@@ -58,7 +58,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=jQiuedadlu8NU0Fi7ExfPx6X1aQquXfSxMECMprO_tg,1511
+auditlog/middleware.py,sha256=SSzqqSg_5l6x8LEvawt_RpIvNwKaIeMjxjNJ_UMkICM,1826
 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
@@ -363,11 +363,11 @@ 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=2UwAPDFTUZ-LdPPxKWWUrQkxWHZ85F2rGngVesFdcWA,121
+rest/__init__.py,sha256=uoSQO22cfX2kuQ8uMpqYGrAX4PDy2Lvp_3n4797fgfk,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
-rest/crypto/aes.py,sha256=f7UgiTGCfgjCc7dL94vnxkPhq_5NzooI-kw0B8_nA58,3605
+rest/crypto/aes.py,sha256=NOVRBRSHCV-om68YpGySWWG-4kako3iEVjq8hxZWPUU,4372
 rest/crypto/privpub.py,sha256=_FioylVcbMmDP80yPYjURmafEiDmEAMkskbc7WF10ac,4082
 rest/crypto/util.py,sha256=agFN2OCPHC70tHNGWrMkkZX4Tt_Ty6imoKEMdTkZpKA,4514
 rest/datem.py,sha256=CHWQXgNltXxtWg34Xio-nNG_2FC6X1RSN3LrCKz2TvU,9469
@@ -496,7 +496,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.49.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.49.dist-info/METADATA,sha256=8a3OV8WG0_6tvGJrxb1pLMiX5URNEI8aHDU2tNVb8-0,7594
-django_restit-4.2.49.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.49.dist-info/RECORD,,
+django_restit-4.2.51.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.51.dist-info/METADATA,sha256=qolKiTHvTmfWLH7kIudyKPMtMg01aTX6ohPAjY-JZMs,7594
+django_restit-4.2.51.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.51.dist-info/RECORD,,

rest/__init__.py

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

rest/crypto/aes.py

@@ -1,6 +1,7 @@
 from Crypto.Cipher import AES
 from Crypto import Random
-from hashlib import md5
+import hashlib
+from hashlib import md5, sha256
 
 import json
 from . import util
@@ -10,29 +11,36 @@ DEFAULT_SALT = b"Salted__"
 MD5V_SALT = b"__MD5V__"
 SDKV_SALT = b"__SDKV__"
 SDKV16_SALT = b"__SDKV16"
+SHA256_SALT = b"SALTY__"
 
-KNOWN_SALTS = [DEFAULT_SALT, SDKV_SALT, MD5V_SALT, SDKV16_SALT]
+KNOWN_SALTS = [DEFAULT_SALT, SDKV_SALT, MD5V_SALT, SDKV16_SALT, SHA256_SALT]
 
 DEFAULT_IV_GENERATOR = "md5"
 
-# THIS USES AES/CBC/PKCS7Padding
 
-def encrypt(key, data, random_size=128, ivgen=DEFAULT_IV_GENERATOR):
+def encrypt(key, data, random_size=128, ivgen=DEFAULT_IV_GENERATOR, base64=True):
     """
     encrypts @data with @key using AES
     will pad data with random string of @random_size
         this will keep it so the same data is never producing the same encryption
     returns bytes as base64 string
+
+    HIS USES AES/CBC/PKCS7Padding
     """
     if random_size > 0:
         rdata = util.toBytes(data) + util.toBytes(util.randomString(random_size))
     else:
         rdata = data
+    if not base64:
+        return cbc_encrypt(key, rdata, ivgen, base64)
     return util.toString(cbc_encrypt(key, rdata, ivgen))
 
 
-def decrypt(key, edata, random_size=128, as_string=True):
-    encrypted = util.fromBase64(edata, False)
+def decrypt(key, edata, random_size=128, as_string=True, base64=True):
+    if base64:
+        encrypted = util.fromBase64(edata, False)
+    else:
+        encrypted = edata
     data = cbc_decrypt(key, encrypted)
     if random_size > 0:
         data = data[:-1 * random_size]
@@ -41,7 +49,7 @@ def decrypt(key, edata, random_size=128, as_string=True):
     return data
 
 
-def cbc_encrypt(key, data, ivgen=DEFAULT_IV_GENERATOR):
+def cbc_encrypt(key, data, ivgen=DEFAULT_IV_GENERATOR, base64=True):
     if isinstance(data, dict) or isinstance(data, list):
         data = json.dumps(data)
     salt_prefix = getSaltPrefix(ivgen)
@@ -57,6 +65,8 @@ def cbc_encrypt(key, data, ivgen=DEFAULT_IV_GENERATOR):
         key = key_iv[:32]
         iv = key_iv[32:]
     aes = AES.new(key, AES.MODE_CBC, iv)
+    if not base64:
+        return salt_prefix + salt + aes.encrypt(util.pad(data))
     return util.toBase64(salt_prefix + salt + aes.encrypt(util.pad(data)))
 
 
@@ -82,6 +92,8 @@ def cbc_decrypt(key, encrypted):
 def deterministric_key_iv(generator, data, salt, length=48):
     if generator in [DEFAULT_SALT, MD5V_SALT, "md5"]:
         return md5_deterministic_key_iv(data, salt, length)
+    elif generator == SHA256_SALT:
+        return sha256_deterministic_key_iv(data, salt, length)
     return simple_deterministic_key_iv(data, salt, length)
 
 
@@ -105,6 +117,18 @@ def md5_deterministic_key_iv(data, salt, length=48):
     return final_key[:length]
 
 
+def sha256_deterministic_key_iv(data, salt, length=48):
+    # extended from https://gist.github.com/gsakkis/4546068
+    assert len(salt) == 8, len(salt)
+    data += salt
+    key = sha256(data).digest()
+    final_key = key
+    while len(final_key) < length:
+        key = sha256(key + data).digest()
+        final_key += key
+    return final_key[:length]
+
+
 def simple_deterministic_key_iv(data, salt, length=48):
     src = data + salt
     src_len = len(src)