Compare commits

..

No commits in common. "f04ea7ac184e36c82a7ae5a09a4629612f6e0d38" and "5b255b65046077d000255fa261f50bc4225e9126" have entirely different histories.

5 changed files with 8 additions and 17 deletions

View File

@ -2,14 +2,6 @@ Change Log
========== ==========
Version 0.6.1
-------------
Released 2023/5/3
* Revised the code for the upcoming Werkzeug 2.4.
Version 0.6.0 Version 0.6.0
------------- -------------

View File

@ -22,5 +22,5 @@ from flask_digest_auth.algo import make_password_hash, calc_response
from flask_digest_auth.auth import DigestAuth from flask_digest_auth.auth import DigestAuth
from flask_digest_auth.test import Client from flask_digest_auth.test import Client
VERSION: str = "0.6.1" VERSION: str = "0.6.0"
"""The package version.""" """The package version."""

View File

@ -23,7 +23,6 @@ from typing import Optional, Literal, Tuple, Dict
from flask import g from flask import g
from werkzeug.datastructures import Authorization, WWWAuthenticate from werkzeug.datastructures import Authorization, WWWAuthenticate
from werkzeug.http import parse_set_header
from werkzeug.test import TestResponse, Client as WerkzeugClient from werkzeug.test import TestResponse, Client as WerkzeugClient
from flask_digest_auth.algo import calc_response, make_password_hash from flask_digest_auth.algo import calc_response, make_password_hash
@ -119,7 +118,7 @@ class Client(WerkzeugClient):
:return: The request authorization. :return: The request authorization.
""" """
qop: Optional[Literal["auth", "auth-int"]] = None qop: Optional[Literal["auth", "auth-int"]] = None
if "auth" in parse_set_header(www_authenticate.get("qop")): if www_authenticate.qop is not None and "auth" in www_authenticate.qop:
qop = "auth" qop = "auth"
cnonce: Optional[str] = None cnonce: Optional[str] = None

View File

@ -158,7 +158,7 @@ class AuthenticationTestCase(TestCase):
self.assertEqual(response.status_code, 401) self.assertEqual(response.status_code, 401)
www_authenticate = response.www_authenticate www_authenticate = response.www_authenticate
self.assertEqual(www_authenticate.type, "digest") self.assertEqual(www_authenticate.type, "digest")
self.assertIsNone(www_authenticate.get("stale")) self.assertEqual(www_authenticate.stale, None)
opaque: str = www_authenticate.opaque opaque: str = www_authenticate.opaque
www_authenticate.nonce = "bad" www_authenticate.nonce = "bad"
@ -167,7 +167,7 @@ class AuthenticationTestCase(TestCase):
response = super(Client, self.client).get(admin_uri, auth=auth_data) response = super(Client, self.client).get(admin_uri, auth=auth_data)
self.assertEqual(response.status_code, 401) self.assertEqual(response.status_code, 401)
www_authenticate = response.www_authenticate www_authenticate = response.www_authenticate
self.assertEqual(www_authenticate.get("stale"), "TRUE") self.assertEqual(www_authenticate.stale, True)
self.assertEqual(www_authenticate.opaque, opaque) self.assertEqual(www_authenticate.opaque, opaque)
auth_data = Client.make_authorization( auth_data = Client.make_authorization(
@ -175,7 +175,7 @@ class AuthenticationTestCase(TestCase):
response = super(Client, self.client).get(admin_uri, auth=auth_data) response = super(Client, self.client).get(admin_uri, auth=auth_data)
self.assertEqual(response.status_code, 401) self.assertEqual(response.status_code, 401)
www_authenticate = response.www_authenticate www_authenticate = response.www_authenticate
self.assertEqual(www_authenticate.get("stale"), "FALSE") self.assertEqual(www_authenticate.stale, False)
self.assertEqual(www_authenticate.opaque, opaque) self.assertEqual(www_authenticate.opaque, opaque)
auth_data = Client.make_authorization( auth_data = Client.make_authorization(

View File

@ -195,7 +195,7 @@ class FlaskLoginTestCase(TestCase):
self.assertEqual(response.status_code, 401) self.assertEqual(response.status_code, 401)
www_authenticate = response.www_authenticate www_authenticate = response.www_authenticate
self.assertEqual(www_authenticate.type, "digest") self.assertEqual(www_authenticate.type, "digest")
self.assertIsNone(www_authenticate.get("stale")) self.assertEqual(www_authenticate.stale, None)
opaque: str = www_authenticate.opaque opaque: str = www_authenticate.opaque
if hasattr(g, "_login_user"): if hasattr(g, "_login_user"):
@ -206,7 +206,7 @@ class FlaskLoginTestCase(TestCase):
response = super(Client, self.client).get(admin_uri, auth=auth_data) response = super(Client, self.client).get(admin_uri, auth=auth_data)
self.assertEqual(response.status_code, 401) self.assertEqual(response.status_code, 401)
www_authenticate = response.www_authenticate www_authenticate = response.www_authenticate
self.assertEqual(www_authenticate.get("stale"), "TRUE") self.assertEqual(www_authenticate.stale, True)
self.assertEqual(www_authenticate.opaque, opaque) self.assertEqual(www_authenticate.opaque, opaque)
if hasattr(g, "_login_user"): if hasattr(g, "_login_user"):
@ -216,7 +216,7 @@ class FlaskLoginTestCase(TestCase):
response = super(Client, self.client).get(admin_uri, auth=auth_data) response = super(Client, self.client).get(admin_uri, auth=auth_data)
self.assertEqual(response.status_code, 401) self.assertEqual(response.status_code, 401)
www_authenticate = response.www_authenticate www_authenticate = response.www_authenticate
self.assertEqual(www_authenticate.get("stale"), "FALSE") self.assertEqual(www_authenticate.stale, False)
self.assertEqual(www_authenticate.opaque, opaque) self.assertEqual(www_authenticate.opaque, opaque)
if hasattr(g, "_login_user"): if hasattr(g, "_login_user"):