aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg/forms
diff options
context:
space:
mode:
Diffstat (limited to 'webmentions_ssg/forms')
-rw-r--r--webmentions_ssg/forms/__init__.py10
-rw-r--r--webmentions_ssg/forms/validators.py30
2 files changed, 39 insertions, 1 deletions
diff --git a/webmentions_ssg/forms/__init__.py b/webmentions_ssg/forms/__init__.py
index 5006365..589cbd9 100644
--- a/webmentions_ssg/forms/__init__.py
+++ b/webmentions_ssg/forms/__init__.py
@@ -10,7 +10,13 @@ from flask_wtf import FlaskForm
from wtforms import PasswordField, StringField, SubmitField
from wtforms.validators import URL, InputRequired, Regexp
-from .validators import AllowedHostname, NotEqualTo, PublicIPLiteral, URLMaxBytes
+from .validators import (
+ AllowedHostname,
+ HTTPXURL,
+ NotEqualTo,
+ PublicIPLiteral,
+ URLMaxBytes,
+)
class LoginForm(FlaskForm):
@@ -36,6 +42,7 @@ class EndpointForm(FlaskForm):
validators=[
InputRequired(),
URLMaxBytes(),
+ HTTPXURL(),
URL(),
Regexp(
"^https?://.*",
@@ -51,6 +58,7 @@ class EndpointForm(FlaskForm):
validators=[
InputRequired(),
URLMaxBytes(),
+ HTTPXURL(),
URL(),
Regexp(
"^https?://.*",
diff --git a/webmentions_ssg/forms/validators.py b/webmentions_ssg/forms/validators.py
index c1f1c97..384c7a1 100644
--- a/webmentions_ssg/forms/validators.py
+++ b/webmentions_ssg/forms/validators.py
@@ -5,10 +5,13 @@
"""Provide validators for URL safety and form field constraints."""
import ipaddress
+import unicodedata
from urllib.parse import urlsplit
+import httpx
from flask import current_app
from wtforms import Field, ValidationError
+from wtforms.validators import StopValidation
from wtforms.form import BaseForm
from ..url_security import AddressResolutionError, is_public_address, is_public_url
@@ -40,6 +43,33 @@ class URLMaxBytes:
)
+class HTTPXURL:
+ """Reject URLs that cannot be fetched by httpx or contain whitespace/controls.
+
+ httpx automatically percent-encodes some whitespace. Reject it instead of
+ silently changing the submitted URL (which may be used in exact URL matches).
+ """
+
+ def __call__(self, form: BaseForm, field: Field) -> None:
+ value = field.data
+ if not isinstance(value, str):
+ raise StopValidation(field.gettext("Invalid URL."))
+
+ if any(
+ character.isspace() or unicodedata.category(character) == "Cc"
+ for character in value
+ ):
+ raise StopValidation(field.gettext("Invalid URL."))
+
+ try:
+ parsed = httpx.URL(value)
+ except (httpx.InvalidURL, ValueError, UnicodeError) as exc:
+ raise StopValidation(field.gettext("Invalid URL.")) from exc
+
+ if not parsed.host:
+ raise StopValidation(field.gettext("Invalid URL."))
+
+
class NotEqualTo:
"""
Validate that a field does not equal another field.