mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-08 18:58:11 +08:00
Linting and hints
This commit is contained in:
@@ -2,8 +2,15 @@ import datetime
|
||||
import time
|
||||
import zlib
|
||||
|
||||
from django.core.signing import BadSignature, SignatureExpired, b64_decode, JSONSerializer, \
|
||||
Signer as Sgnr, TimestampSigner as TsS, dumps
|
||||
from django.core.signing import (
|
||||
BadSignature,
|
||||
SignatureExpired,
|
||||
b64_decode,
|
||||
JSONSerializer,
|
||||
Signer as Sgnr,
|
||||
TimestampSigner as TsS,
|
||||
dumps,
|
||||
)
|
||||
from django.utils import baseconv
|
||||
from django.utils.crypto import constant_time_compare
|
||||
from django.utils.encoding import force_bytes, force_str, force_text
|
||||
@@ -16,7 +23,13 @@ The difference is that `this` loads function calls `TimestampSigner` and `Signer
|
||||
"""
|
||||
|
||||
|
||||
def loads(s, key=None, salt='django.core.signing', serializer=JSONSerializer, max_age=None):
|
||||
def loads(
|
||||
s,
|
||||
key=None,
|
||||
salt: str = "django.core.signing",
|
||||
serializer=JSONSerializer,
|
||||
max_age=None,
|
||||
):
|
||||
"""
|
||||
Reverse of dumps(), raise BadSignature if signature fails.
|
||||
|
||||
@@ -26,7 +39,7 @@ def loads(s, key=None, salt='django.core.signing', serializer=JSONSerializer, ma
|
||||
# operate on bytes.
|
||||
base64d = force_bytes(TimestampSigner(key, salt=salt).unsign(s, max_age=max_age))
|
||||
decompress = False
|
||||
if base64d[:1] == b'.':
|
||||
if base64d[:1] == b".":
|
||||
# It's compressed; uncompress it first
|
||||
base64d = base64d[1:]
|
||||
decompress = True
|
||||
@@ -37,7 +50,6 @@ def loads(s, key=None, salt='django.core.signing', serializer=JSONSerializer, ma
|
||||
|
||||
|
||||
class Signer(Sgnr):
|
||||
|
||||
def unsign(self, signed_value):
|
||||
# force_str is removed in Django 2.0
|
||||
signed_value = force_str(signed_value)
|
||||
@@ -57,7 +69,6 @@ calling `this` Signer.
|
||||
|
||||
|
||||
class TimestampSigner(Signer, TsS):
|
||||
|
||||
def unsign(self, value, max_age=None):
|
||||
"""
|
||||
Retrieve original value and check it wasn't signed more
|
||||
@@ -72,6 +83,5 @@ class TimestampSigner(Signer, TsS):
|
||||
# Check timestamp is not older than max_age
|
||||
age = time.time() - timestamp
|
||||
if age > max_age:
|
||||
raise SignatureExpired(
|
||||
'Signature age %s > %s seconds' % (age, max_age))
|
||||
raise SignatureExpired("Signature age %s > %s seconds" % (age, max_age))
|
||||
return value
|
||||
|
||||
Reference in New Issue
Block a user