diff options
Diffstat (limited to 'webmentions_ssg/views')
| -rw-r--r-- | webmentions_ssg/views/session.py | 16 |
1 files changed, 5 insertions, 11 deletions
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) |
