From 7b06ce399b59167f6344f811c417d4d5b488d39f Mon Sep 17 00:00:00 2001 From: Adrian Maraj Date: Thu, 2 May 2024 13:33:33 +0200 Subject: [PATCH] fix: function name --- website/web/__init__.py | 6 +++--- website/web/helpers.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/website/web/__init__.py b/website/web/__init__.py index 3168003..8df3169 100644 --- a/website/web/__init__.py +++ b/website/web/__init__.py @@ -53,7 +53,7 @@ else: all_timezones_set = available_timezones() from .genericapi import api as generic_api -from .helpers import (User, valid_username, build_users_table, get_secret_key, +from .helpers import (User, is_valid_username, build_users_table, get_secret_key, load_user_from_request, src_request_ip, sri_load, get_lookyloo_instance) from .proxied import ReverseProxied @@ -107,7 +107,7 @@ def login() -> WerkzeugResponse | str | Response: ''' username = request.form['username'] - if not valid_username(username): + if not is_valid_username(username): flash('User is not permitted.', 'error') return redirect(url_for('login')) users_table = build_users_table() @@ -1640,7 +1640,7 @@ def capture_web() -> str | Response | WerkzeugResponse: @flask_login.login_required # type: ignore[misc] def simple_capture() -> str | Response | WerkzeugResponse: user = flask_login.current_user.get_id() - if not re.match("^[A-Za-z0-9]+$", user): + if not is_valid_username(user): # Username has been manipulated flash('User is not permitted.', 'error') return redirect(url_for('submit_capture')) diff --git a/website/web/helpers.py b/website/web/helpers.py index 3a49fd1..cc8aacc 100644 --- a/website/web/helpers.py +++ b/website/web/helpers.py @@ -5,6 +5,7 @@ from __future__ import annotations import hashlib import json import os +import re from functools import lru_cache from pathlib import Path @@ -49,7 +50,7 @@ def load_user_from_request(request: Request) -> User | None: return user return None -def valid_username(username: str) -> bool: +def is_valid_username(username: str) -> bool: return re.match("^[A-Za-z0-9]+$", username) @lru_cache(64)