wrolpi/controller/api/captive_portal.py

82 lines
3.1 KiB
Python
Raw Normal View History

Hotspot captive portal: welcome page with the WROLPi's address (#709) * Hotspot captive portal: welcome page with the WROLPi's address Devices that join the hotspot probe a fixed plain-HTTP URL to check for Internet access. NetworkManager's shared-mode dnsmasq now resolves those probe hostnames (and `wrolpi`) to the hotspot address via an include the Controller writes when the hotspot starts, the probes land on the Controller (port 80), and are redirected to /portal: "This is your WROLPi, its address is 10.42.0.1, open WROLPi / open the Controller". Only the probe hostnames are hijacked so the hotspot keeps forwarding everything else when the WROLPi has an uplink. The include is corrected and the connection re-activated once if NetworkManager picked a non-default subnet. Writing the include is best-effort; the hotspot starts regardless. `hotspot.captive_portal` (controller.yaml, default true) toggles the probe redirects and the include; like the other hotspot settings it applies on the next hotspot start, so saving while the hotspot is up reports restart_required and both Controller UIs say so. The status endpoint gains the hotspot address and portal URL, shown in both UIs. repair.sh only creates the include directory so a disabled setting survives upgrades. Native only: Docker has no hotspot. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * captive portal: address review * React: re-read the hotspot address whenever the HotspotToggle starts or stops the hotspot, matching the fallback UI's refresh-on-status. * A WPA3 start that reverts to WPA2 leaves the hotspot up, so it now gets the captive portal address correction too. * The corrective `nmcli connection up` logs a warning on a non-zero exit; dnsmasq would otherwise keep the old address silently. * HotspotStatusResponse.captive_portal defaults to true like everywhere else. * Trim design narrative from the module docstring and React comments. * The include-before-activate test now observes the include at the moment of the `nmcli ... hotspot` call instead of inferring from call order. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * captive portal: never forward any record type for probe hosts `address=` only synthesizes A/AAAA answers. iOS also asks for the HTTPS record type; dnsmasq forwarded that upstream, Apple's answer aliased to captive.g.aaplimg.com, and the phone fetched the genuine "Success" from Apple instead of the portal. Each probe host now also gets `local=`, so dnsmasq answers every type itself, and the CDN alias is a probe host too. Observed with dnsmasq query logging on a hotspot with an eth0 uplink. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * captive portal: let acknowledged clients finish so the OS offers "Done" A phone's sign-in sheet only shows "Done" once the OS re-probes and gets the genuine success reply. The Controller now remembers each client (by hotspot IP) that has loaded the portal page and answers its later probes with the reply each OS expects (Apple "Success" HTML, Android 204, Windows "Microsoft Connect Test", ...). The set is cleared when the hotspot starts so a new session shows the page again. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * captive portal: acknowledge on Continue, not on view iOS fetches the portal page in the background before opening the sheet, then re-probes after the sheet's own navigation. Acknowledging on view made that re-probe return "Success" as the sheet's content. Phones only re-check the network (and offer "Done") after a full-page navigation, so the welcome page now has a Continue button leading to /portal/continue, which is the only place a client is acknowledged. The Continue page says to tap Done and links to WROLPi and the Controller. Also hijack clients3.google.com (older Android probe host). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * help: bump wrolpi-help to the captive portal and Speed Test docs Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * captive portal: comments describe the Continue design; clear acks on stop Three comments still described acknowledging on view, which c72a7f7b removed. Acknowledged clients are now also cleared when the hotspot stops, so a lease reused in a later session sees the portal page. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
2026-09-13 20:09:48 -06:00
"""
Captive portal routes: the landing page hotspot clients see, and the OS connectivity probes
which are redirected to it.
These live at bare paths (not under /api/) because phones request fixed URLs such as
`http://captive.apple.com/hotspot-detect.html`; the hotspot's DNS points those hostnames here.
"""
import logging
from pathlib import Path
from fastapi import APIRouter, HTTPException, Request
from fastapi.responses import RedirectResponse, Response
from fastapi.templating import Jinja2Templates
from controller.lib.admin import get_hotspot_device, get_hotspot_ssid
from controller.lib.captive_portal import (
PORTAL_CONTINUE_PATH,
PORTAL_PATH,
PROBE_PATHS,
PROBE_SUCCESS_RESPONSES,
acknowledge_client,
get_hotspot_ip,
is_captive_portal_enabled,
is_client_acknowledged,
)
from controller.lib.config import is_docker_mode
logger = logging.getLogger(__name__)
router = APIRouter()
templates = Jinja2Templates(directory=str(Path(__file__).parent.parent / "templates"))
# Phones must re-probe every time; a cached redirect would show a stale portal.
NO_STORE = {"Cache-Control": "no-store"}
def _render_portal(request: Request, connected: bool):
if is_docker_mode():
raise HTTPException(status_code=404)
ip = get_hotspot_ip(get_hotspot_device())
if not ip:
# Hotspot is down; a page with the wrong address is worse than none.
raise HTTPException(status_code=404)
context = {"ip": ip, "ssid": get_hotspot_ssid(), "connected": connected,
"continue_path": PORTAL_CONTINUE_PATH}
return templates.TemplateResponse(request, "portal.html", context, headers=NO_STORE)
@router.get(PORTAL_PATH, include_in_schema=False)
async def portal(request: Request):
"""The welcome page: this WROLPi's address and a Continue button."""
return _render_portal(request, connected=False)
@router.get(PORTAL_CONTINUE_PATH, include_in_schema=False)
async def portal_continue(request: Request):
"""
The page after Continue. The phone re-probes after this navigation; the client is now
acknowledged so that probe succeeds and the sheet offers "Done".
"""
response = _render_portal(request, connected=True) # 404s first if the hotspot is down
acknowledge_client(request.client.host if request.client else None)
return response
async def probe(request: Request):
"""
A connectivity probe. Anything but the expected reply makes the phone show the portal, so
redirect until this client has tapped Continue on the portal, then give the reply it expects.
"""
if not is_captive_portal_enabled():
raise HTTPException(status_code=404)
if is_client_acknowledged(request.client.host if request.client else None):
status, media_type, body = PROBE_SUCCESS_RESPONSES[request.url.path]
return Response(content=body, status_code=status, media_type=media_type, headers=NO_STORE)
return RedirectResponse(url=PORTAL_PATH, status_code=302, headers=NO_STORE)
for _path in PROBE_PATHS:
router.add_api_route(_path, probe, methods=["GET", "HEAD"], include_in_schema=False)