diff options
Diffstat (limited to 'webmentions_ssg/views.py')
| -rw-r--r-- | webmentions_ssg/views.py | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/webmentions_ssg/views.py b/webmentions_ssg/views.py index 1dcdd2e..fcb5f2d 100644 --- a/webmentions_ssg/views.py +++ b/webmentions_ssg/views.py @@ -33,6 +33,7 @@ from .models import ReceivedWebmention, SentWebmention, Source, User from .tasks.receiver import verify_webmention from .tasks.scanner import manual_scan_sources from .tasks.sender import send_webmention +from .url_digest import received_url_digest from .url_security import is_safe_next_url root_page = Blueprint("root", __name__) @@ -339,12 +340,18 @@ def endpoint() -> ResponseReturnValue: source = cast(str, form.source.data) target = cast(str, form.target.data) + url_digest = received_url_digest(source, target) webmention = db.session.execute( - sa.select(ReceivedWebmention).where( - ReceivedWebmention.source == source, ReceivedWebmention.target == target - ) + sa.select(ReceivedWebmention).where(ReceivedWebmention.url_digest == url_digest) ).scalar_one_or_none() + # A SHA-256 collision must never cause an unrelated Webmention to be overwritten. + if webmention is not None and (webmention.source, webmention.target) != ( + source, + target, + ): + return {"error": "Webmention URL fingerprint conflict"}, 409 + should_verify = False if webmention is None: @@ -364,10 +371,14 @@ def endpoint() -> ResponseReturnValue: # after our SELECT but before our COMMIT. webmention = db.session.execute( sa.select(ReceivedWebmention).where( - ReceivedWebmention.source == source, - ReceivedWebmention.target == target, + ReceivedWebmention.url_digest == url_digest ) - ).scalar_one() + ).scalar_one_or_none() + if webmention is None or (webmention.source, webmention.target) != ( + source, + target, + ): + return {"error": "Webmention URL fingerprint conflict"}, 409 else: now = datetime.now(UTC) |
