9 Commits

10 changed files with 92 additions and 82 deletions

View File

@ -350,7 +350,7 @@ A unittest Test Case
response = self.client.get("/admin") response = self.client.get("/admin")
self.assertEqual(response.status_code, 401) self.assertEqual(response.status_code, 401)
response = self.client.get( response = self.client.get(
"/admin", digest_auth=("my_name", "my_pass")) "/admin", digest_auth=(USERNAME, PASSWORD))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
@ -382,7 +382,7 @@ A pytest Test
response = client.get("/admin") response = client.get("/admin")
assert response.status_code == 401 assert response.status_code == 401
response = client.get( response = client.get(
"/admin", digest_auth=("my_name", "my_pass")) "/admin", digest_auth=(USERNAME, PASSWORD))
assert response.status_code == 200 assert response.status_code == 200

View File

@ -10,8 +10,6 @@ if "%SPHINXBUILD%" == "" (
set SOURCEDIR=source set SOURCEDIR=source
set BUILDDIR=build set BUILDDIR=build
if "%1" == "" goto help
%SPHINXBUILD% >NUL 2>NUL %SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 ( if errorlevel 9009 (
echo. echo.
@ -21,10 +19,12 @@ if errorlevel 9009 (
echo.may add the Sphinx directory to PATH. echo.may add the Sphinx directory to PATH.
echo. echo.
echo.If you don't have Sphinx installed, grab it from echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/ echo.https://www.sphinx-doc.org/
exit /b 1 exit /b 1
) )
if "%1" == "" goto help
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% %SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
goto end goto end

View File

@ -1,59 +1,32 @@
# Configuration file for the Sphinx documentation builder. # Configuration file for the Sphinx documentation builder.
# #
# This file only contains a selection of the most common options. For a full # For the full list of built-in configuration values, see the documentation:
# list see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html # https://www.sphinx-doc.org/en/master/usage/configuration.html
import os import os
# -- Path setup --------------------------------------------------------------
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
import sys import sys
sys.path.insert(0, os.path.abspath('../../src/')) sys.path.insert(0, os.path.abspath('../../src/'))
# -- Project information ----------------------------------------------------- # -- Project information -----------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
project = 'Flask-Digest-Auth' project = 'Flask-Digest-Auth'
copyright = '2022, imacat' copyright = '2022, imacat'
author = 'imacat' author = 'imacat'
# The full version, including alpha/beta/rc tags
release = '0.3.0' release = '0.3.0'
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
# Add any Sphinx extension module names here, as strings. They can be extensions = ["sphinx.ext.autodoc"]
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
"sphinx.ext.autodoc"
]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates'] templates_path = ['_templates']
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = [] exclude_patterns = []
# -- Options for HTML output ------------------------------------------------- # -- Options for HTML output -------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'sphinx_rtd_theme' html_theme = 'sphinx_rtd_theme'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static'] html_static_path = ['_static']
# For readthedocs.io to work properly.
master_doc = 'index'

View File

@ -229,7 +229,7 @@ A unittest Test Case
response = self.client.get("/admin") response = self.client.get("/admin")
self.assertEqual(response.status_code, 401) self.assertEqual(response.status_code, 401)
response = self.client.get( response = self.client.get(
"/admin", digest_auth=("my_name", "my_pass")) "/admin", digest_auth=(USERNAME, PASSWORD))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
@ -264,5 +264,5 @@ A pytest Test
response = client.get("/admin") response = client.get("/admin")
assert response.status_code == 401 assert response.status_code == 401
response = client.get( response = client.get(
"/admin", digest_auth=("my_name", "my_pass")) "/admin", digest_auth=(USERNAME, PASSWORD))
assert response.status_code == 200 assert response.status_code == 200

View File

@ -1,24 +1,37 @@
flask\_digest\_auth package flask\_digest\_auth package
=========================== ===========================
The ``DigestAuth`` Class Submodules
------------------------ ----------
.. autoclass:: flask_digest_auth.DigestAuth
:members:
:undoc-members:
:show-inheritance:
The ``make_password_hash`` Function flask\_digest\_auth.algo module
----------------------------------- -------------------------------
.. autofunction:: flask_digest_auth.make_password_hash
The ``calc_response`` Function .. automodule:: flask_digest_auth.algo
------------------------------ :members:
.. autofunction:: flask_digest_auth.calc_response :undoc-members:
:show-inheritance:
The ``Client`` Test Class flask\_digest\_auth.auth module
------------------------- -------------------------------
.. autoclass:: flask_digest_auth.Client
:members: .. automodule:: flask_digest_auth.auth
:undoc-members: :members:
:show-inheritance: :undoc-members:
:show-inheritance:
flask\_digest\_auth.test module
-------------------------------
.. automodule:: flask_digest_auth.test
:members:
:undoc-members:
:show-inheritance:
Module contents
---------------
.. automodule:: flask_digest_auth
:members:
:undoc-members:
:show-inheritance:

View File

@ -1,5 +1,5 @@
.. flask-digest-auth documentation master file, created by .. Flask-Digest-Auth documentation master file, created by
sphinx-quickstart on Tue Dec 6 15:15:08 2022. sphinx-quickstart on Wed Dec 7 09:40:48 2022.
You can adapt this file completely to your liking, but it should at least You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive. contain the root `toctree` directive.
@ -26,6 +26,7 @@ Indices and tables
================== ==================
* :ref:`genindex` * :ref:`genindex`
* :ref:`modindex`
* :ref:`search` * :ref:`search`
.. _HTTP Digest Authentication: https://en.wikipedia.org/wiki/Digest_access_authentication .. _HTTP Digest Authentication: https://en.wikipedia.org/wiki/Digest_access_authentication

View File

@ -63,7 +63,7 @@ The username is part of the hash. If the user changes their username,
you need to ask their password, to generate and store the new password you need to ask their password, to generate and store the new password
hash. hash.
See :meth:`flask_digest_auth.make_password_hash`. See :func:`flask_digest_auth.algo.make_password_hash`.
Flask-Digest-Auth Alone Flask-Digest-Auth Alone
@ -118,7 +118,7 @@ logging the log in event, adding the log in counter, etc.
def on_login(user: User) -> None: def on_login(user: User) -> None:
user.visits = user.visits + 1 user.visits = user.visits + 1
See :meth:`flask_digest_auth.DigestAuth.register_on_login`. See :meth:`flask_digest_auth.auth.DigestAuth.register_on_login`.
Log Out Log Out
@ -127,7 +127,7 @@ Log Out
Flask-Digest-Auth supports log out. The user will be prompted for the Flask-Digest-Auth supports log out. The user will be prompted for the
new username and password. new username and password.
See :meth:`flask_digest_auth.DigestAuth.logout`. See :meth:`flask_digest_auth.auth.DigestAuth.logout`.
Test Client Test Client
@ -136,7 +136,7 @@ Test Client
Flask-Digest-Auth comes with a test client that supports HTTP digest Flask-Digest-Auth comes with a test client that supports HTTP digest
authentication. authentication.
See :class:`flask_digest_auth.Client`. See :class:`flask_digest_auth.test.Client`.
Also see :ref:`example-unittest` and :ref:`example-pytest`. Also see :ref:`example-unittest` and :ref:`example-pytest`.

7
docs/source/modules.rst Normal file
View File

@ -0,0 +1,7 @@
src
===
.. toctree::
:maxdepth: 4
flask_digest_auth

View File

@ -16,8 +16,9 @@
# limitations under the License. # limitations under the License.
"""The HTTP Digest Authentication. """The HTTP Digest Authentication.
See RFC 2617 HTTP Authentication: Basic and Digest Access Authentication See `RFC 2617`_ HTTP Authentication: Basic and Digest Access Authentication
.. _RFC 2617: https://www.rfc-editor.org/rfc/rfc2617
""" """
from __future__ import annotations from __future__ import annotations
@ -43,6 +44,7 @@ class DigestAuth:
""" """
self.__serializer: URLSafeTimedSerializer \ self.__serializer: URLSafeTimedSerializer \
= URLSafeTimedSerializer(token_urlsafe(32)) = URLSafeTimedSerializer(token_urlsafe(32))
"""The serializer to generate and validate the nonce and opaque."""
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.""" """The realm. Default is an empty string."""
self.algorithm: t.Optional[t.Literal["MD5", "MD5-sess"]] = None self.algorithm: t.Optional[t.Literal["MD5", "MD5-sess"]] = None
@ -61,11 +63,14 @@ class DigestAuth:
"""The current Flask application.""" """The current Flask application."""
self.__get_password_hash: BasePasswordHashGetter \ self.__get_password_hash: BasePasswordHashGetter \
= BasePasswordHashGetter() = BasePasswordHashGetter()
"""The callback to return the password hash."""
self.__get_user: BaseUserGetter = BaseUserGetter() self.__get_user: BaseUserGetter = BaseUserGetter()
"""The callback to return the user."""
self.__on_login: BaseOnLogInCallback = BaseOnLogInCallback() self.__on_login: BaseOnLogInCallback = BaseOnLogInCallback()
"""The callback to run when the user logs in."""
def login_required(self, view) -> t.Callable: def login_required(self, view) -> t.Callable:
"""The view decorator for HTTP digest authentication. """The view decorator for the HTTP digest authentication.
:Example: :Example:
@ -413,21 +418,30 @@ class DigestAuth:
class AuthState: class AuthState:
"""The authorization state.""" """The authentication state. It keeps the status in the earlier
authentication stage, so that the latter response stage knows how to
response.
"""
def __init__(self): def __init__(self):
"""Constructs the authorization state.""" """Constructs the authorization state."""
self.opaque: t.Optional[str] = None self.opaque: t.Optional[str] = None
"""The opaque value specified by the client, if valid."""
self.stale: t.Optional[bool] = None self.stale: t.Optional[bool] = None
"""The stale value, if there is a previous log in attempt."""
class UnauthorizedException(Exception): class UnauthorizedException(Exception):
"""The exception thrown when the authentication is failed.""" """The exception thrown when the authentication fails."""
pass
class BasePasswordHashGetter: class BasePasswordHashGetter:
"""The base password hash getter.""" """The base callback that given the username, returns the password hash,
or None if the user does not exist. The default is to raise an
:class:`UnboundLocalError` if the callback is not registered yet.
See :meth:`flask_digest_auth.auth.DigestAuth.register_get_password`
"""
@staticmethod @staticmethod
def __call__(username: str) -> t.Optional[str]: def __call__(username: str) -> t.Optional[str]:
@ -443,7 +457,12 @@ class BasePasswordHashGetter:
class BaseUserGetter: class BaseUserGetter:
"""The base user getter.""" """The base callback that given the username, returns the user, or None if
the user does not exist. The default is to raise an
:class:`UnboundLocalError` if the callback is not registered yet.
See :meth:`flask_digest_auth.auth.DigestAuth.register_get_user`
"""
@staticmethod @staticmethod
def __call__(username: str) -> t.Optional[t.Any]: def __call__(username: str) -> t.Optional[t.Any]:
@ -459,7 +478,11 @@ class BaseUserGetter:
class BaseOnLogInCallback: class BaseOnLogInCallback:
"""The base callback when the user logs in.""" """The base callback to run when the user logs in, given the logged-in
user. The default does nothing.
See :meth:`flask_digest_auth.auth.DigestAuth.register_on_login`
"""
@staticmethod @staticmethod
def __call__(user: t.Any) -> None: def __call__(user: t.Any) -> None:

View File

@ -51,7 +51,7 @@ class Client(WerkzeugClient):
response = self.client.get("/admin") response = self.client.get("/admin")
self.assertEqual(response.status_code, 401) self.assertEqual(response.status_code, 401)
response = self.client.get( response = self.client.get(
"/admin", digest_auth=("my_name", "my_pass")) "/admin", digest_auth=(USERNAME, PASSWORD))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
For pytest_: For pytest_:
@ -76,7 +76,7 @@ class Client(WerkzeugClient):
response = client.get("/admin") response = client.get("/admin")
assert response.status_code == 401 assert response.status_code == 401
response = client.get( response = client.get(
"/admin", digest_auth=("my_name", "my_pass")) "/admin", digest_auth=(USERNAME, PASSWORD))
assert response.status_code == 200 assert response.status_code == 200
.. _unittest: https://docs.python.org/3/library/unittest.html .. _unittest: https://docs.python.org/3/library/unittest.html
@ -87,12 +87,8 @@ class Client(WerkzeugClient):
**kwargs) -> TestResponse: **kwargs) -> TestResponse:
"""Opens a request. """Opens a request.
.. warning::
This is to override the parent ``open`` method. You should call
the ``get``, ``post``, ``put``, and ``delete`` methods instead.
:param args: The arguments. :param args: The arguments.
:param digest_auth: A tuple of the username and password for the HTTP :param digest_auth: The (*username*, *password*) tuple for the HTTP
digest authentication. digest authentication.
:param kwargs: The keyword arguments. :param kwargs: The keyword arguments.
:return: The response. :return: The response.
@ -115,9 +111,6 @@ class Client(WerkzeugClient):
username: str, password: str) -> Authorization: username: str, password: str) -> Authorization:
"""Composes and returns the request authorization. """Composes and returns the request authorization.
.. warning::
This method is not for public.
:param www_authenticate: The ``WWW-Authenticate`` response. :param www_authenticate: The ``WWW-Authenticate`` response.
:param uri: The request URI. :param uri: The request URI.
:param username: The username. :param username: The username.