diff options
Diffstat (limited to 'webmentions_ssg/views')
| -rw-r--r-- | webmentions_ssg/views/admin.py | 2 | ||||
| -rw-r--r-- | webmentions_ssg/views/endpoint.py | 9 | ||||
| -rw-r--r-- | webmentions_ssg/views/session.py | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/webmentions_ssg/views/admin.py b/webmentions_ssg/views/admin.py index 2f3f3ab..dadf8dd 100644 --- a/webmentions_ssg/views/admin.py +++ b/webmentions_ssg/views/admin.py @@ -13,7 +13,7 @@ from flask_login import login_required from sqlalchemy.orm import selectinload from .. import forms -from ..extensions import DATABASE as db +from ..extensions import db from ..models import ReceivedWebmention, SentWebmention, Source from ..tasks.receiver import verify_webmention from ..tasks.scanner import manual_scan_sources diff --git a/webmentions_ssg/views/endpoint.py b/webmentions_ssg/views/endpoint.py index baab397..91bb881 100644 --- a/webmentions_ssg/views/endpoint.py +++ b/webmentions_ssg/views/endpoint.py @@ -15,8 +15,7 @@ from flask.typing import ResponseReturnValue from sqlalchemy.engine import CursorResult from .. import forms -from ..extensions import CSRF, LIMITER -from ..extensions import DATABASE as db +from ..extensions import csrf, db, limiter from ..models import ReceivedWebmention, received_url_digest from ..tasks.receiver import verify_webmention from . import root_page @@ -92,12 +91,12 @@ def submit_received(source: str, target: str) -> tuple[uuid.UUID, bool] | None: @root_page.post("/endpoint") -@LIMITER.limit( +@limiter.limit( lambda: current_app.config["ENDPOINT_GLOBAL_RATE_LIMIT"], key_func=lambda: "all-clients", ) -@LIMITER.limit(lambda: current_app.config["ENDPOINT_RATE_LIMIT"]) -@CSRF.exempt +@limiter.limit(lambda: current_app.config["ENDPOINT_RATE_LIMIT"]) +@csrf.exempt def endpoint() -> ResponseReturnValue: """Receive and queue a Webmention for verification. diff --git a/webmentions_ssg/views/session.py b/webmentions_ssg/views/session.py index 3f8a0f2..e4c462f 100644 --- a/webmentions_ssg/views/session.py +++ b/webmentions_ssg/views/session.py @@ -11,8 +11,7 @@ from flask_login import current_user, login_required, login_user, logout_user from .. import forms from ..auth import DUMMY_USER, is_safe_next_url, login_username_limit_key -from ..extensions import DATABASE as db -from ..extensions import LIMITER +from ..extensions import db, limiter from ..models import User from . import root_page @@ -27,13 +26,13 @@ def index() -> ResponseReturnValue: @root_page.route("/login", methods=["GET", "POST"]) -@LIMITER.limit( +@limiter.limit( lambda: current_app.config["LOGIN_USERNAME_RATE_LIMIT"], key_func=login_username_limit_key, methods=["POST"], error_message="Too many login attempts. Please try again later.", ) -@LIMITER.limit( +@limiter.limit( lambda: current_app.config["LOGIN_RATE_LIMIT"], methods=["POST"], error_message="Too many login attempts. Please try again later.", |
