From 5c1eb15f00e20ece0a4ff8e7e1b4a5ab51e54232 Mon Sep 17 00:00:00 2001 From: Dennis Fink Date: Fri, 13 Nov 2026 19:22:33 +0100 Subject: refactor(core): simplify login password verification Replace the module-level dummy user with a lazily cached password hash so unknown usernames still perform a password check without hashing during every import. Use one linear verification path for existing, missing, and empty passwords. --- webmentions_ssg/auth.py | 9 +++++++-- webmentions_ssg/views/session.py | 16 +++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'webmentions_ssg') diff --git a/webmentions_ssg/auth.py b/webmentions_ssg/auth.py index 6d4fe95..edfc858 100644 --- a/webmentions_ssg/auth.py +++ b/webmentions_ssg/auth.py @@ -6,12 +6,14 @@ import hashlib import secrets +from functools import cache from hmac import compare_digest from urllib.parse import urlsplit from flask import request from flask_limiter.util import get_remote_address from flask_login import LoginManager +from werkzeug.security import generate_password_hash from .extensions import db from .models import User @@ -23,8 +25,11 @@ AUTH.login_view = "root.login" # pyright: ignore[reportAttributeAccessIssue] MIN_PASSWORD_LENGTH = 8 -DUMMY_USER = User(username=secrets.token_urlsafe()) -DUMMY_USER.password = secrets.token_urlsafe() + +@cache +def dummy_password_hash() -> str: + """Lazily generate a reusable hash for unknown login usernames.""" + return generate_password_hash(secrets.token_urlsafe()) def validate_password(password: str) -> None: diff --git a/webmentions_ssg/views/session.py b/webmentions_ssg/views/session.py index b78fd13..870c967 100644 --- a/webmentions_ssg/views/session.py +++ b/webmentions_ssg/views/session.py @@ -8,9 +8,10 @@ import sqlalchemy as sa from flask import current_app, flash, redirect, render_template, request, url_for from flask.typing import ResponseReturnValue from flask_login import current_user, login_required, login_user, logout_user +from werkzeug.security import check_password_hash from .. import forms -from ..auth import DUMMY_USER, is_safe_next_url, login_username_limit_key +from ..auth import dummy_password_hash, is_safe_next_url, login_username_limit_key from ..extensions import db, limiter from ..models import User from .blueprint import root_page @@ -56,16 +57,9 @@ def login() -> ResponseReturnValue: sa.select(User).where(User.username == form.username.data) ) - user_exists = user is not None - - if user is None: - user = DUMMY_USER - - if ( - form.password.data is None - or not user.check_password(form.password.data) - or not user_exists - ): + password_hash = user.password_hash if user else dummy_password_hash() + password_ok = check_password_hash(password_hash, form.password.data or "") + if user is None or not password_ok: flash("Invalid username or password", "danger") return redirect(url_for("root.login")) login_user(user) -- cgit v1.3.1