aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--webmentions_ssg/forms.py38
1 files changed, 10 insertions, 28 deletions
diff --git a/webmentions_ssg/forms.py b/webmentions_ssg/forms.py
index af24423..0d83327 100644
--- a/webmentions_ssg/forms.py
+++ b/webmentions_ssg/forms.py
@@ -5,7 +5,6 @@
"""Webmention forms and URL validation."""
import ipaddress
-import re
import unicodedata
from urllib.parse import urlsplit
@@ -14,7 +13,7 @@ from flask import current_app
from flask_wtf import FlaskForm
from wtforms import Field, PasswordField, StringField, SubmitField, ValidationError
from wtforms.form import BaseForm
-from wtforms.validators import URL, InputRequired, Regexp, StopValidation
+from wtforms.validators import InputRequired, StopValidation
from .net import is_public_address
@@ -45,8 +44,8 @@ class URLMaxBytes:
)
-class HTTPXURL:
- """Reject URLs that cannot be fetched by httpx or contain whitespace/controls.
+class HTTPURL:
+ """Require an HTTP(S) URL that httpx can parse without rewriting whitespace.
httpx automatically percent-encodes some whitespace. Reject it instead of
silently changing the submitted URL (which may be used in exact URL matches).
@@ -71,6 +70,11 @@ class HTTPXURL:
if not parsed.host:
raise StopValidation(field.gettext("Invalid URL."))
+ if parsed.scheme not in ("http", "https"):
+ raise StopValidation(
+ field.gettext(f"{field.name} must begin with http or https")
+ )
+
class AllowedHostname:
"""Validate that a URL uses an allowed hostname.
@@ -139,33 +143,11 @@ class EndpointForm(FlaskForm):
source = StringField(
"source",
- validators=[
- InputRequired(),
- URLMaxBytes(),
- HTTPXURL(),
- URL(),
- Regexp(
- "^https?://.*",
- flags=re.IGNORECASE,
- message="source must begin with http or https",
- ),
- PublicIPLiteral(),
- ],
+ validators=[InputRequired(), URLMaxBytes(), HTTPURL(), PublicIPLiteral()],
)
target = StringField(
"target",
- validators=[
- InputRequired(),
- URLMaxBytes(),
- HTTPXURL(),
- URL(),
- Regexp(
- "^https?://.*",
- flags=re.IGNORECASE,
- message="target must begin with http or https",
- ),
- AllowedHostname(),
- ],
+ validators=[InputRequired(), URLMaxBytes(), HTTPURL(), AllowedHostname()],
)
def validate_source(self, field: Field) -> None: