From 1db6b47f88dde5538efa433328987c70eab74d70 Mon Sep 17 00:00:00 2001 From: Dennis Fink Date: Thu, 12 Nov 2026 22:44:25 +0100 Subject: fix(core): validate Redis Huey URL schemes Parse Redis backend flavours explicitly so supported combinations preserve the correct redis or rediss scheme while malformed or unknown variants fail fast. --- webmentions_ssg/tasks/extension.py | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'webmentions_ssg') diff --git a/webmentions_ssg/tasks/extension.py b/webmentions_ssg/tasks/extension.py index f7072b2..ee9c442 100644 --- a/webmentions_ssg/tasks/extension.py +++ b/webmentions_ssg/tasks/extension.py @@ -144,27 +144,26 @@ class Huey: parsed = urlsplit(url) scheme = parsed.scheme.lower() - if scheme.startswith(("redis", "rediss")): - fixed_url = urlunsplit(parsed._replace(scheme=scheme.split("+", 1)[0])) - - if scheme.endswith("priority+expire"): - from huey import PriorityRedisExpireHuey - - return PriorityRedisExpireHuey, {"url": fixed_url} - - if scheme.endswith("priority"): - from huey import PriorityRedisHuey - - return PriorityRedisHuey, {"url": fixed_url} - - if scheme.endswith("expire"): - from huey import RedisExpireHuey - - return RedisExpireHuey, {"url": fixed_url} - - from huey import RedisHuey + base_scheme, separator, flavour = scheme.partition("+") + if base_scheme in {"redis", "rediss"}: + from huey import ( + PriorityRedisExpireHuey, + PriorityRedisHuey, + RedisExpireHuey, + RedisHuey, + ) - return RedisHuey, {"url": url} + backends = { + "": RedisHuey, + "priority": PriorityRedisHuey, + "expire": RedisExpireHuey, + "priority+expire": PriorityRedisExpireHuey, + } + if flavour not in backends or (separator and not flavour): + raise RuntimeError(f"Unsupported HUEY_URL scheme: {scheme!r}") + + fixed_url = urlunsplit(parsed._replace(scheme=base_scheme)) + return backends[flavour], {"url": fixed_url} if scheme == "sqlite": from huey import SqliteHuey -- cgit v1.3.1