aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--tests/test_views.py10
-rw-r--r--webmentions_ssg/views.py2
2 files changed, 5 insertions, 7 deletions
diff --git a/tests/test_views.py b/tests/test_views.py
index 2048594..3de4c3d 100644
--- a/tests/test_views.py
+++ b/tests/test_views.py
@@ -295,7 +295,7 @@ def mock_login_form(
*,
valid: bool,
username: str = "admin",
- password: str = "test",
+ password: str | None = "test",
) -> Mock:
form = Mock()
form.validate_on_submit.return_value = valid
@@ -378,22 +378,20 @@ def test_login_renders_form(client: FlaskClient) -> None:
assert "login" in response.get_data(as_text=True).lower()
+@pytest.mark.parametrize("password", ("wrong-password", None))
def test_login_rejects_invalid_credentials(
app: Flask,
client: FlaskClient,
views_module: ModuleType,
monkeypatch: pytest.MonkeyPatch,
+ password: str | None,
) -> None:
with app.app_context():
db.session.add(User(username="admin", password="test"))
db.session.commit()
mock_login_form(
- views_module,
- monkeypatch,
- valid=True,
- username="admin",
- password="wrong-password",
+ views_module, monkeypatch, valid=True, username="admin", password=password
)
response = client.post("/login")
diff --git a/webmentions_ssg/views.py b/webmentions_ssg/views.py
index 23e8406..d411296 100644
--- a/webmentions_ssg/views.py
+++ b/webmentions_ssg/views.py
@@ -66,7 +66,7 @@ def login() -> ResponseReturnValue:
)
password = form.password.data
- if user is None or (password is not None and not user.check_password(password)):
+ if user is None or password is None or not user.check_password(password):
flash("Invalid username or password", "danger")
return redirect(url_for("root.login"))