Compare commits
No commits in common. "14b90de05919db183b5d974e913c2254442bc400" and "b348c872dc61ea1af52c53f07dbba650af248b59" have entirely different histories.
14b90de059
...
b348c872dc
@ -41,23 +41,15 @@ class DigestAuth:
|
|||||||
|
|
||||||
:param realm: The realm.
|
:param realm: The realm.
|
||||||
"""
|
"""
|
||||||
self.__serializer: URLSafeTimedSerializer \
|
self.secret_key: str = token_urlsafe(32)
|
||||||
= URLSafeTimedSerializer(token_urlsafe(32))
|
self.serializer: URLSafeTimedSerializer \
|
||||||
|
= URLSafeTimedSerializer(self.secret_key)
|
||||||
self.realm: str = "" if realm is None else realm
|
self.realm: str = "" if realm is None else realm
|
||||||
"""The realm. Default is an empty string."""
|
|
||||||
self.algorithm: t.Optional[str] = None
|
self.algorithm: t.Optional[str] = None
|
||||||
"""The algorithm, either None, ``MD5``, or ``MD5-sess``. Default is
|
|
||||||
None."""
|
|
||||||
self.use_opaque: bool = True
|
self.use_opaque: bool = True
|
||||||
"""Whether to use an opaque. Default is True."""
|
self.domain: t.List[str] = []
|
||||||
self.__domain: t.List[str] = []
|
self.qop: t.List[str] = ["auth", "auth-int"]
|
||||||
"""A list of directories that this username and password applies to.
|
|
||||||
Default is empty."""
|
|
||||||
self.__qop: t.List[str] = ["auth", "auth-int"]
|
|
||||||
"""A list of supported quality of protection supported, either
|
|
||||||
``qop``, ``auth-int``, both, or empty. Default is both."""
|
|
||||||
self.app: t.Optional[Flask] = None
|
self.app: t.Optional[Flask] = None
|
||||||
"""The current Flask application."""
|
|
||||||
self.__get_password_hash: BasePasswordHashGetter \
|
self.__get_password_hash: BasePasswordHashGetter \
|
||||||
= BasePasswordHashGetter()
|
= BasePasswordHashGetter()
|
||||||
self.__get_user: BaseUserGetter = BaseUserGetter()
|
self.__get_user: BaseUserGetter = BaseUserGetter()
|
||||||
@ -161,7 +153,7 @@ class DigestAuth:
|
|||||||
raise UnauthorizedException(
|
raise UnauthorizedException(
|
||||||
"Missing \"opaque\" in the Authorization header")
|
"Missing \"opaque\" in the Authorization header")
|
||||||
try:
|
try:
|
||||||
self.__serializer.loads(
|
self.serializer.loads(
|
||||||
authorization.opaque, salt="opaque", max_age=1800)
|
authorization.opaque, salt="opaque", max_age=1800)
|
||||||
except BadData:
|
except BadData:
|
||||||
raise UnauthorizedException("Invalid opaque")
|
raise UnauthorizedException("Invalid opaque")
|
||||||
@ -182,7 +174,7 @@ class DigestAuth:
|
|||||||
state.stale = False
|
state.stale = False
|
||||||
raise UnauthorizedException("Incorrect response value")
|
raise UnauthorizedException("Incorrect response value")
|
||||||
try:
|
try:
|
||||||
self.__serializer.loads(
|
self.serializer.loads(
|
||||||
authorization.nonce,
|
authorization.nonce,
|
||||||
salt="nonce" if authorization.opaque is None
|
salt="nonce" if authorization.opaque is None
|
||||||
else f"nonce-{authorization.opaque}")
|
else f"nonce-{authorization.opaque}")
|
||||||
@ -206,16 +198,16 @@ class DigestAuth:
|
|||||||
return None
|
return None
|
||||||
if state.opaque is not None:
|
if state.opaque is not None:
|
||||||
return state.opaque
|
return state.opaque
|
||||||
return self.__serializer.dumps(randbits(32), salt="opaque")
|
return self.serializer.dumps(randbits(32), salt="opaque")
|
||||||
|
|
||||||
opaque: t.Optional[str] = get_opaque()
|
opaque: t.Optional[str] = get_opaque()
|
||||||
nonce: str = self.__serializer.dumps(
|
nonce: str = self.serializer.dumps(
|
||||||
randbits(32),
|
randbits(32),
|
||||||
salt="nonce" if opaque is None else f"nonce-{opaque}")
|
salt="nonce" if opaque is None else f"nonce-{opaque}")
|
||||||
|
|
||||||
header: str = f"Digest realm=\"{self.realm}\""
|
header: str = f"Digest realm=\"{self.realm}\""
|
||||||
if len(self.__domain) > 0:
|
if len(self.domain) > 0:
|
||||||
domain_list: str = ",".join(self.__domain)
|
domain_list: str = ",".join(self.domain)
|
||||||
header += f", domain=\"{domain_list}\""
|
header += f", domain=\"{domain_list}\""
|
||||||
header += f", nonce=\"{nonce}\""
|
header += f", nonce=\"{nonce}\""
|
||||||
if opaque is not None:
|
if opaque is not None:
|
||||||
@ -224,8 +216,8 @@ class DigestAuth:
|
|||||||
header += f", stale=TRUE" if state.stale else f", stale=FALSE"
|
header += f", stale=TRUE" if state.stale else f", stale=FALSE"
|
||||||
if self.algorithm is not None:
|
if self.algorithm is not None:
|
||||||
header += f", algorithm=\"{self.algorithm}\""
|
header += f", algorithm=\"{self.algorithm}\""
|
||||||
if len(self.__qop) > 0:
|
if len(self.qop) > 0:
|
||||||
qop_list: str = ",".join(self.__qop)
|
qop_list: str = ",".join(self.qop)
|
||||||
header += f", qop=\"{qop_list}\""
|
header += f", qop=\"{qop_list}\""
|
||||||
return header
|
return header
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user