Commit Graph
13 Commits
Author SHA1 Message Date
German Khokhlov 23efd3b343 Merge main into codex/fix-cctv-session-admission
Main's Street View budget tests in the media feed-type file now mount the
provider through the shared CCTV test harness, which also resets the Google
rate-limit setting.
2026-11-20 17:39:46 +04:00
German Khokhlov ed38a1ab3f fix(cctv): keep an HLS camera's health through the refused viewer's frame
A viewer refused for capacity falls back to /frame after hls.js gives up.
For a pullable HLS camera without a snapshot, /frame only has a
placeholder or a Street View frame, which says nothing about the stream,
yet it wrote degraded over the health that /media owns. /frame now
leaves that health as it is; a dead upstream is still reported through
/media.

Tests: the middleware suite covers both fallbacks, a real upstream
failure that still degrades, and cross-site segment and release refusals
on a live HLS lease; capacity checks use HLS_LIMITS and HlsCapacityError;
the three CCTV suites share one provider harness in src/testSupport.
CURRENT-STATE and the changelog fragment describe the refusal.
2026-11-20 11:48:22 +04:00
German Khokhlov 01d4a3f454 CCTV Street View budget: key the client before the camera wait, share the default
- The /frame handler reads the client's network key (IPv6 /64) before it
  awaits the camera, so a client that drops the connection is still
  charged to its own window instead of the shared fallback key.
- The budget is charged only after the Google key and finite catalog
  coordinates are confirmed, and the key is read once.
- Places and the CCTV window share one default (GOOGLE_DEFAULT_PER_MIN).
- Tests: the catalog-only test checks heading/fov/pitch from the query at
  the catalog location; the budget test covers unknown ids, forwarded
  requests and /64 grouping; a real-socket test covers a dropped
  connection. The duplicate pose test is removed.
- .env.example, SECURITY.md, CURRENT-STATE and the changelog fragment
  describe the separate per-IP window, the catalog position and the
  placeholder for seed cameras.
2026-11-20 11:31:14 +04:00
Said Turksever 4e1f004a83 fix(cctv): keep a camera's health when an HLS viewer is refused for capacity
A full lease or session budget fell into the general catch and marked the
camera degraded, although its upstream was fine and other viewers were
watching it. Capacity refusals now throw HlsCapacityError and still answer
503 with Retry-After, without touching health.

Tests: fill all 16 lease slots from one shared address and pin the refusal
of a ninth viewer and a third session, keep a second lease alive so the
released-lease 404 is the lease check, and share recordingResponse between
the two middleware test files.
2026-11-19 17:45:15 +00:00
German Khokhlov 0699876e4e fix(cctv): keep main's HLS leases and test them through the middleware
Drop the per-peer lease budget and the lease-to-address binding. Main's
keyless same-site gate already refuses cross-site media requests, while
the budget capped a shared address (Docker gateway, reverse proxy, NAT)
at 8 leases across both sessions and still let one address hold both.
A lease now keeps working when its viewer reconnects from a new address.

Add a middleware test that drives the HLS playlist, segment and DELETE
for viewers on one shared address, on distinct addresses and after an
address change, and fold the media cases (segment read, DELETE, no
catalog request) into the cross-site table test. Remove the redundant
puppeteer flag, the CURRENT-STATE paragraph and the changelog fragment,
which no longer describe a change.
2026-11-19 19:59:01 +04:00
German Khokhlov 11e1c9d26d CCTV Street View fallback: the browser's pose at the catalog position
The fallback keeps the catalog position but takes heading, field of view
and pitch from the request again, as before, clamped as before. A catalog
camera with no pose (every world-cameras row on main) otherwise asked
Google for heading 0, pitch 0, FOV 80 while the browser draws it at the
id-hash heading, pitch -17 and FOV 74, and a calibrated camera lost its
calibration. Cost and the per-IP budget are unchanged.

- The Street View budget is built per proxy, so tests no longer depend on
  GEV_RATELIMIT_GOOGLE_PER_MIN in the shell; the fixture pins it.
- New tests: a pose-less catalog camera, and the per-IP budget (no call
  without a key, the cap, a separate budget per address).
- The client no longer sends lat/lon on /frame.
- CURRENT-STATE, the changelog fragment and SECURITY.md say the fallback
  has its own per-client limit, and that unlisted (seed) cameras get the
  placeholder.
2026-11-19 19:06:53 +04:00
German Khokhlov 90e464eb5a Merge main into codex/fix-cctv-session-admission
Resolve the conflicts by keeping main's keyless CCTV gate, which already
refuses cross-site requests on every /api/cctv route and keeps the routes
reachable behind a reverse proxy, instead of the strict gate on /media/.
Keep the per-request client id the lease calls use, and both sides of the
CURRENT-STATE paragraphs and the media tests.
2026-11-19 17:58:14 +04:00
Said Turksever 7af0453f34 CCTV Street View fallback: catalog cameras only, at their catalog position, inside the Google budget 2026-11-06 11:51:34 +00:00
Sameh Khamis b75db874c6 Read API paths and forwarded requests as the router does
The router reads an absolute-form target's path without resolving dot
segments, so a target such as http://host/api/../x still reaches /api
middleware. Take that path the same way when deciding whether the API
response headers apply.

The Street View fallback now treats any forwarding header as forwarded, even
an empty one, before it spends the key.
2026-10-21 15:43:29 -07:00
Sameh Khamis b1ed77c26c Keep camera routes reachable behind a reverse proxy
The CCTV routes now use the keyless cross-site checks, which refuse cross-site
browser requests but accept forwarding headers, so cameras work behind the
documented reverse proxy. The Street View fallback is the one step that spends
a key; a request with forwarding headers skips it and gets the placeholder
frame, as when no key is configured.
2026-10-21 15:33:14 -07:00
Sameh Khamis 0ad75095a7 Validate provider response formats
CCTV frames and the Street View fallback accept only JPEG, PNG, GIF, WebP and
AVIF, parsed from the media type essence and sent under the canonical type;
any other type is cancelled and falls through to the next fallback as a
failed upstream does. Live media must match its feed kind (video/mp4,
video/webm, or multipart/x-mixed-replace with a boundary) before the camera
is reported healthy or any byte is relayed, and its redirects now stay on the
registered origin like frames. Every /api/cctv route uses the same-site gate.

The GBFS proxy relays only bodies that parse as JSON, re-serialized under a
fixed application/json type.
2026-10-21 15:07:20 -07:00
Said 167aa947ce fix(cctv): admit and bound HLS leases by peer 2026-10-20 00:11:31 +01:00
Sameh Khamis 248a658713 fix(cctv): serve only live feeds on /media
/api/cctv/media relayed still-image cameras with an ordinary fetch: it followed
redirects to any host, passed through any content type and had no body cap.
Stills are served by /api/cctv/frame, which keeps redirects on the registered
origin, accepts only image/* and caps the body, and no client requests a still
through /media. /media now answers 404 for anything but HLS, MP4/WebM and
MJPEG, before any upstream request.
2026-10-15 15:53:09 -07:00