remote/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2026-09-11 19:14:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Normalize URL column schemes consistently

Browse source
This commit is contained in:
Simon Willison 2026-09-08 21:16:35 -07:00
commit 7e6039b8df
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
datasette/default_column_types.py
View file

@ -5,7 +5,17 @@ import markupsafe
from datasette import hookimpl
from datasette.column_types import ColumnType, SQLiteType
from datasette.utils import is_url
_HTTP_URL_RE = re.compile(r"https?://\S+", re.IGNORECASE)
def _normalize_http_url(value):
if not isinstance(value, str):
return None
normalized = value.strip()
if not _HTTP_URL_RE.fullmatch(normalized):
return None
return normalized
class UrlColumnType(ColumnType):
@ -16,10 +26,10 @@ class UrlColumnType(ColumnType):
async def render_cell(self, value, column, table, database, datasette, request):
if not value or not isinstance(value, str):
return None
stripped = value.strip()
if not is_url(stripped):
return None
escaped = markupsafe.escape(stripped)
normalized = _normalize_http_url(value)
if normalized is None:
return markupsafe.escape(value.strip())
escaped = markupsafe.escape(normalized)
return markupsafe.Markup(f'<a href="{escaped}">{escaped}</a>')
async def validate(self, value, datasette):
@ -27,7 +37,7 @@ class UrlColumnType(ColumnType):
return None
if not isinstance(value, str):
return "URL must be a string"
if not re.match(r"^https?://\S+$", value.strip()):
if _normalize_http_url(value) is None:
return "Invalid URL"
return None