engineering/remarkbox
1
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: prefer X-Forwarded-Host over rewritten Host

Browse source 
Edge proxy rewrites Host: www.foxhop.net → foxhop.net before forwarding
to origin (see proxy.unturf.com Caddyfile). request.host on origin is
therefore always the apex, stripping any www. prefix even when the user
fetched from www. Caddy's reverse_proxy preserves the original host in
X-Forwarded-Host, so consult that first and fall back to request.host
when the proxy isn't in the path.
This commit is contained in:
russell@unturf.com 2026-04-27 11:34:41 -04:00
parent 97a1fffeba
commit 763cacba57
No known key found for this signature in database
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
remarkbox/api/export.py
View file

@ -36,6 +36,20 @@ from .views import check_namespace_api_access
log = logging.getLogger(__name__)
def _public_host(request):
"""Return the host the user is browsing from.
The edge proxy rewrites the Host header (e.g. www.foxhop.net → foxhop.net)
before reaching origin. Caddy preserves the original in X-Forwarded-Host,
so prefer that when present — otherwise fall back to request.host.
Handles a comma-separated chain by taking the first entry.
"""
forwarded = request.headers.get("X-Forwarded-Host", "")
if forwarded:
return forwarded.split(",")[0].strip()
return request.host
def _parse_format_from_subpath(subpath):
"""Extract format from the subpath (e.g. 'abc-123.md' -> ('abc-123', 'markdown')).
@ -138,10 +152,10 @@ def api_export_thread(request):
# canonical URIs preserve user-facing prefixes like `www.` that the
# namespace's stored name may omit.
provenance = prov.build(
canonical_uri=prov.canonical_uri_for_node(root, host=request.host),
canonical_uri=prov.canonical_uri_for_node(root, host=_public_host(request)),
version=request.static_version,
kind="thread",
host=request.host,
host=_public_host(request),
)
# Render tree to markdown
@ -215,10 +229,10 @@ def api_export_namespace(request):
).all()
provenance = prov.build(
canonical_uri=prov.canonical_uri_for_namespace(namespace, host=request.host),
canonical_uri=prov.canonical_uri_for_namespace(namespace, host=_public_host(request)),
version=request.static_version,
kind="namespace",
host=request.host,
host=_public_host(request),
)
md = namespace_to_markdown(namespace, roots, node_fetcher, provenance=provenance)
@ -305,10 +319,10 @@ def api_export_node(request):
subtree_nodes = [n for n in all_nodes if n.id in descendant_ids]
provenance = prov.build(
canonical_uri=prov.canonical_uri_for_node(node, host=request.host),
canonical_uri=prov.canonical_uri_for_node(node, host=_public_host(request)),
version=request.static_version,
kind="subthread",
host=request.host,
host=_public_host(request),
)
md = node_tree_to_markdown(