From 492fb1ed617d92931b31a37636a6dc7a0a382462 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Thu, 22 Oct 2026 08:58:41 -0700 Subject: [PATCH 1/3] quest: plan focused release backports Co-Authored-By: GPT-6 --- quest/m0/README.md | 1 + quest/m0/release-backports/README.md | 51 +++++++++++++++++++ .../m0/release-backports/ffi-cancellation.md | 36 +++++++++++++ quest/m0/release-backports/parsing.md | 26 ++++++++++ quest/m0/release-backports/publishing.md | 24 +++++++++ quest/m0/release-backports/tls.md | 22 ++++++++ quest/m0/release-fixed-delay.md | 5 ++ 7 files changed, 165 insertions(+) create mode 100644 quest/m0/release-backports/README.md create mode 100644 quest/m0/release-backports/ffi-cancellation.md create mode 100644 quest/m0/release-backports/parsing.md create mode 100644 quest/m0/release-backports/publishing.md create mode 100644 quest/m0/release-backports/tls.md diff --git a/quest/m0/README.md b/quest/m0/README.md index 7daf1289a1b..a70164a4fbc 100644 --- a/quest/m0/README.md +++ b/quest/m0/README.md @@ -41,6 +41,7 @@ Each lands its fixes in its own PR and plans only what needs a decision. ## Required - [Broadcast epochs](/quest/m0/broadcast-epoch/README.md) - every first-party publisher that can restart mints a fresh route epoch, the newest wins a path, and only routes with the same epoch resume a subscription +- [Focused release backports](/quest/m0/release-backports/README.md) - TLS, publishing, parser, and FFI cancellation fixes plus the existing fixed-delay backport preserve the current release API - [web-transport-proto 0.6.3](/quest/m0/web-transport-proto-0.6.3.md) - `main` and `release` lock the upstream release that bounds decoded CONNECT headers, so a peer can't make a relay hold megabytes per session before auth - [qmux 0.5.3](/quest/m0/qmux-0.5.3.md) - crates.io publishes qmux 0.5.3 with the builder session config the release backport of #5609 needs - [Release shutdown backport](/quest/m0/ffi-shutdown-backport.md) - `release` publishes a non-breaking moq-ffi with an async `drain()` and qmux sessions on the QUIC stream limit diff --git a/quest/m0/release-backports/README.md b/quest/m0/release-backports/README.md new file mode 100644 index 00000000000..4e80b296ed9 --- /dev/null +++ b/quest/m0/release-backports/README.md @@ -0,0 +1,51 @@ +# Backport focused fixes to the current release + +## Goal + +The current release line carries the selected security, cancellation, and +playback fixes from main while preserving its published APIs and wire +compatibility. These patch backports can ship before the next breaking cut. + +## Plan + +Decided 2026-10-22 (maintainer): focused backports, rather than a broader +stabilization audit. The four children are independently landable; splitting +the parser and workflow changes keeps each implementation PR to one problem. +The existing fixed-delay quest and PR retain their ownership. + +The comparison used main +[d44813cb70](https://github.com/moq-dev/moq/commit/d44813cb703bf0d5366266ae8206f794856c69f8) +and release +[36f392f492](https://github.com/moq-dev/moq/commit/36f392f492f571454e5abc0e441ddc0168f16477). +The findings are source comparisons, not release-side reproductions or a +release-clear verdict. Each implementation reproduces its behavior and ports +only the fix, with release-compatible tests and the relevant release checks. +New defects go to main first. Do not import main's transport or API rewrites. + +This epic's remaining work is to reconcile the landed backports on the +release candidate, confirm their checks, and hand the commit inventory to +the release process. Publication and version bumps stay with the existing +release owners. This does not add dependencies to the breaking-cut quest. + +Reuse the existing QPACK and draining-shutdown quests below. Their upstream +publication conditions remain their own blockers; they do not block these +independent fixes. The resubscribe investigation in +[moq-dev/moq#6285](https://github.com/moq-dev/moq/pull/6285) reports a benchmark +artifact, so it adds no production backport here. The broader release audit +in [moq-dev/moq#6311](https://github.com/moq-dev/moq/pull/6311) keeps its own +findings; expanding this shortlist needs a separate scope decision. + +## Required + +- [TLS dependencies](/quest/m0/release-backports/tls.md) - release takes the targeted WebPKI fixes already on main +- [Publishing workflows](/quest/m0/release-backports/publishing.md) - privileged wrapper publication validates the triggering repository +- [JS input parsing](/quest/m0/release-backports/parsing.md) - malformed certificates and paths cannot trigger disproportionate parsing work +- [FFI cancellation](/quest/m0/release-backports/ffi-cancellation.md) - cancelled reads and accepts leave the next event for the next caller +- [Fixed playback delay](/quest/m0/release-fixed-delay.md) - land the existing behavior-only backport without the watch API rework + +## Related + +- [QPACK bound](/quest/m0/web-transport-proto-0.6.3.md) - existing upstream dependency fix for decoded CONNECT headers +- [Draining shutdown](/quest/m0/ffi-shutdown-backport.md) - existing additive drain API and qmux stream-limit backport +- [Resubscribe investigation](/quest/m0/release-resubscribe-hang.md) - benchmark correction and investigation retirement retain their existing owner +- [Release execution](/quest/m2/release/README.md) - reconcile release-only fixes through the documented merge sequence at the breaking cut diff --git a/quest/m0/release-backports/ffi-cancellation.md b/quest/m0/release-backports/ffi-cancellation.md new file mode 100644 index 00000000000..87ca93ef3bb --- /dev/null +++ b/quest/m0/release-backports/ffi-cancellation.md @@ -0,0 +1,36 @@ +# [M] Backport cancellation-safe FFI reads and accepts + +## Goal + +On the current release line, cancelling a foreign read or accept cannot +consume the next frame or incoming session. Existing synchronous server +cancellation still releases its listener without deadlocking, and runtime +shutdown remains safe. Published signatures and wire behavior stay intact. + +## Plan + +Decided 2026-10-22 (maintainer): include the paired fixes from +[moq-dev/moq#5140](https://github.com/moq-dev/moq/pull/5140) and +[moq-dev/moq#5172](https://github.com/moq-dev/moq/pull/5172) in the focused +backports. Treat read and accept cancellation together because the server's +synchronous cancellation constrains how its pending accept is driven. + +Release 36f392f492 still spawns Task::run work independently. UniFFI's foreign +cancel stops polling before the future is freed, so spawned work can keep +running and take an event during that interval. Reproduce through the actual +UniFFI cancel/free boundary, including delivery between cancellation and +freeing; merely dropping a Rust future does not establish the contract. + +Port ownership of pending operations from the two fixes while retaining the +release runtime and listener APIs. Preserve bounded incoming-request storage, +listener release during a parked accept, and synchronization with runtime +shutdown. Do not import main's later worker-pool or transport redesigns. +Cover read/accept cancellation, the next caller's event, server cancellation, +and runtime shutdown with deterministic synchronization. Run affected binding +checks and just test interop --all in addition to the release gate. The +consumers are existing foreign-language readers and native binding servers; +no wrapper migration or new API is intended. + +## Related + +- [Draining shutdown](/quest/m0/ffi-shutdown-backport.md) - coordinate overlapping FFI files while keeping its additive drain API in its own backport diff --git a/quest/m0/release-backports/parsing.md b/quest/m0/release-backports/parsing.md new file mode 100644 index 00000000000..07d8069893d --- /dev/null +++ b/quest/m0/release-backports/parsing.md @@ -0,0 +1,26 @@ +# [S] Backport bounded JS certificate and path parsing + +## Goal + +Release's JS connection code rejects malformed certificates and paths without +quadratic PEM scanning or allocating one string for every path separator. +Valid inputs retain the published behavior and API. + +## Plan + +Decided 2026-10-22 (maintainer): port the JS input-hardening portion of +[moq-dev/moq#6084](https://github.com/moq-dev/moq/pull/6084) as a focused +backport; its publishing changes have a separate owner. + +Release 36f392f492 still uses a lazy certificate-armor regex and calls +parts(path).length before rejecting excess path components. Repeated BEGIN +markers without an END cause repeated scans, while slash-heavy paths create +an unnecessary allocation for every part. + +Reproduce both costs on release, then port the linear delimiter search and +early separator count with their edge-case coverage. Keep the existing path +limit and PEM acceptance contract. Measure increasing malformed input sizes +with the repository's benchmark conventions so parsing growth remains +visible; unit tests should assert behavior, not elapsed time. The consumers +are certificate-hash connection setup and outgoing path encoding in +@moq/net. Public API and wire formats are unchanged. diff --git a/quest/m0/release-backports/publishing.md b/quest/m0/release-backports/publishing.md new file mode 100644 index 00000000000..cd5bd8ab037 --- /dev/null +++ b/quest/m0/release-backports/publishing.md @@ -0,0 +1,24 @@ +# [S] Backport wrapper publication repository validation + +## Goal + +Release's privileged Go, Swift, and Kotlin publication jobs only use a +workflow-run checkout whose repository passes the trusted upstream gate. + +## Plan + +Decided 2026-10-22 (maintainer): include the publishing hardening from +[moq-dev/moq#6084](https://github.com/moq-dev/moq/pull/6084) in the focused +backports, independently of its JS parsing changes. + +Release 36f392f492 retains the workflow-run path without main's +head_repository.full_name check. Port the same-repository validation and +make each privileged downstream checkout depend on the validation job, +preserving the release line's existing tag and event behavior. Inspect the +whole dependency chain, including skipped and failed gates, rather than +assuming the condition on one job protects every checkout. + +Validate accepted and refused event shapes without publishing artifacts or +exercising credentials, and run the workflow checks. The consumers are the +existing wrapper release jobs. Public API, wire, package versions, and the +selection of published artifacts are unchanged. diff --git a/quest/m0/release-backports/tls.md b/quest/m0/release-backports/tls.md new file mode 100644 index 00000000000..6da7401aae8 --- /dev/null +++ b/quest/m0/release-backports/tls.md @@ -0,0 +1,22 @@ +# [XS] Backport the WebPKI dependency fixes + +## Goal + +Release's TLS consumers use the WebPKI fixes already on main without +unrelated dependency upgrades or changes to the published API or wire. + +## Plan + +Decided 2026-10-22 (maintainer): include this in the focused patch backports. +At release 36f392f492, Cargo.lock has rustls-webpki 0.103.15 and +webpki-root-certs/webpki-roots 1.0.9. Main took 0.103.16 and 1.0.10 in +[moq-dev/moq#6169](https://github.com/moq-dev/moq/pull/6169). +The later [moq-dev/moq#6197](https://github.com/moq-dev/moq/pull/6197) names +the security updates but its actual patch only changes a getrandom edge. + +Verify the upstream advisory fixes and update the affected locked packages +on release. Do not cherry-pick the broad dependency-audit patch, which also +upgrades GStreamer. Check the resulting dependency graph, advisory audit, +and affected TLS builds through the release gate. The consumers are existing +native clients and relays that validate peer certificates. No package version +bump, public API change, or MoQ wire change belongs in this backport. diff --git a/quest/m0/release-fixed-delay.md b/quest/m0/release-fixed-delay.md index 56e49499968..6d6a981be8c 100644 --- a/quest/m0/release-fixed-delay.md +++ b/quest/m0/release-fixed-delay.md @@ -11,6 +11,11 @@ ratchet up drags a "100 ms" viewer tens of seconds behind; a user reported a ## Plan +The implementation is already open in +[moq-dev/moq#6217](https://github.com/moq-dev/moq/pull/6217); continue that PR +rather than creating another backport. The +[focused backports](/quest/m0/release-backports/README.md) reuse this quest. + `main` already behaves this way since [#4162](https://github.com/moq-dev/moq/pull/4162), but that change is a breaking `@moq/watch` rework that won't be backported. Port only the behavior: From 457a9d4a2648c34862760943762336c0ba94057e Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Thu, 22 Oct 2026 09:04:01 -0700 Subject: [PATCH 2/3] quest: record merged fixed-delay backport Co-Authored-By: GPT-6 --- quest/m0/release-backports/README.md | 9 +++++-- quest/m0/release-fixed-delay.md | 35 +++++++++++----------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/quest/m0/release-backports/README.md b/quest/m0/release-backports/README.md index 4e80b296ed9..5422e062cfc 100644 --- a/quest/m0/release-backports/README.md +++ b/quest/m0/release-backports/README.md @@ -11,7 +11,7 @@ compatibility. These patch backports can ship before the next breaking cut. Decided 2026-10-22 (maintainer): focused backports, rather than a broader stabilization audit. The four children are independently landable; splitting the parser and workflow changes keeps each implementation PR to one problem. -The existing fixed-delay quest and PR retain their ownership. +The existing fixed-delay quest retains ownership of its release deploy. The comparison used main [d44813cb70](https://github.com/moq-dev/moq/commit/d44813cb703bf0d5366266ae8206f794856c69f8) @@ -22,6 +22,11 @@ release-clear verdict. Each implementation reproduces its behavior and ports only the fix, with release-compatible tests and the relevant release checks. New defects go to main first. Do not import main's transport or API rewrites. +The fixed-delay backport +[moq-dev/moq#6217](https://github.com/moq-dev/moq/pull/6217) merged into release +as [fd26b8ffec](https://github.com/moq-dev/moq/commit/fd26b8ffec) during planning; +it needs no additional implementation quest. + This epic's remaining work is to reconcile the landed backports on the release candidate, confirm their checks, and hand the commit inventory to the release process. Publication and version bumps stay with the existing @@ -41,10 +46,10 @@ findings; expanding this shortlist needs a separate scope decision. - [Publishing workflows](/quest/m0/release-backports/publishing.md) - privileged wrapper publication validates the triggering repository - [JS input parsing](/quest/m0/release-backports/parsing.md) - malformed certificates and paths cannot trigger disproportionate parsing work - [FFI cancellation](/quest/m0/release-backports/ffi-cancellation.md) - cancelled reads and accepts leave the next event for the next caller -- [Fixed playback delay](/quest/m0/release-fixed-delay.md) - land the existing behavior-only backport without the watch API rework ## Related +- [Fixed playback delay](/quest/m0/release-fixed-delay.md) - the merged behavior-only backport reaches moq.dev with its release deploy - [QPACK bound](/quest/m0/web-transport-proto-0.6.3.md) - existing upstream dependency fix for decoded CONNECT headers - [Draining shutdown](/quest/m0/ffi-shutdown-backport.md) - existing additive drain API and qmux stream-limit backport - [Resubscribe investigation](/quest/m0/release-resubscribe-hang.md) - benchmark correction and investigation retirement retain their existing owner diff --git a/quest/m0/release-fixed-delay.md b/quest/m0/release-fixed-delay.md index 6d6a981be8c..2998ad08224 100644 --- a/quest/m0/release-fixed-delay.md +++ b/quest/m0/release-fixed-delay.md @@ -2,28 +2,21 @@ ## Goal -On `release`, which `moq.dev` runs, a viewer who picks a fixed latency -(100 ms, 250 ms, ...) plays at that delay. Today `Sync.#runDelay` -(`js/watch/src/sync.ts` on `release`) adds every rendition's catalog -`delay + jitter` on top of the fixed value, so a publisher whose estimates -ratchet up drags a "100 ms" viewer tens of seconds behind; a user reported a -42 s total buffer with 100 ms selected. +The release deploy on `moq.dev` includes the fixed-delay backport. A viewer +who picks a fixed latency (100 ms, 250 ms, ...) plays at that delay even as +the rendition's catalog delay and jitter grow. Confirm the deployed revision +contains the fix and numeric selections no longer include those estimates. ## Plan -The implementation is already open in -[moq-dev/moq#6217](https://github.com/moq-dev/moq/pull/6217); continue that PR -rather than creating another backport. The -[focused backports](/quest/m0/release-backports/README.md) reuse this quest. +The implementation merged into release in +[moq-dev/moq#6217](https://github.com/moq-dev/moq/pull/6217). Verify its release +deploy reaches moq.dev, then retire this quest; no duplicate backport is +needed. The [focused backports](/quest/m0/release-backports/README.md) track +the other selected fixes. -`main` already behaves this way since -[#4162](https://github.com/moq-dev/moq/pull/4162), but that change is a -breaking `@moq/watch` rework that won't be backported. Port only the behavior: -when the configured delay is a number, the output delay is that number; -"auto" and "instant" are unchanged. - -- The PR targets `release` directly, with no `main` change, and keeps the - published API so it ships as a patch (see `CONTRIBUTING.md`). -- Add a regression test in `js/watch/src/sync.test.ts` on `release`: a - registered rendition jitter does not raise a fixed delay. -- The fix reaches `moq.dev` with the next release deploy. +The backport preserves the behavior from +[moq-dev/moq#4162](https://github.com/moq-dev/moq/pull/4162) without its +breaking watch API rework: a numeric configured delay is used directly; +"auto" and "instant" remain unchanged. The release-side tests and live-browser +validation are recorded in the merged PR. Public API and wire are unchanged. From 95a47474daa51316e38c29f05f790f4d97e31e6f Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Thu, 22 Oct 2026 09:06:28 -0700 Subject: [PATCH 3/3] quest: omit workflow backport already effective from main Co-Authored-By: GPT-6 --- quest/m0/README.md | 2 +- quest/m0/release-backports/README.md | 10 +++++++--- quest/m0/release-backports/parsing.md | 3 ++- quest/m0/release-backports/publishing.md | 24 ------------------------ 4 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 quest/m0/release-backports/publishing.md diff --git a/quest/m0/README.md b/quest/m0/README.md index a70164a4fbc..0417e3de2bd 100644 --- a/quest/m0/README.md +++ b/quest/m0/README.md @@ -41,7 +41,7 @@ Each lands its fixes in its own PR and plans only what needs a decision. ## Required - [Broadcast epochs](/quest/m0/broadcast-epoch/README.md) - every first-party publisher that can restart mints a fresh route epoch, the newest wins a path, and only routes with the same epoch resume a subscription -- [Focused release backports](/quest/m0/release-backports/README.md) - TLS, publishing, parser, and FFI cancellation fixes plus the existing fixed-delay backport preserve the current release API +- [Focused release backports](/quest/m0/release-backports/README.md) - TLS, parser, and FFI cancellation fixes preserve the current release API; the fixed-delay backport has merged - [web-transport-proto 0.6.3](/quest/m0/web-transport-proto-0.6.3.md) - `main` and `release` lock the upstream release that bounds decoded CONNECT headers, so a peer can't make a relay hold megabytes per session before auth - [qmux 0.5.3](/quest/m0/qmux-0.5.3.md) - crates.io publishes qmux 0.5.3 with the builder session config the release backport of #5609 needs - [Release shutdown backport](/quest/m0/ffi-shutdown-backport.md) - `release` publishes a non-breaking moq-ffi with an async `drain()` and qmux sessions on the QUIC stream limit diff --git a/quest/m0/release-backports/README.md b/quest/m0/release-backports/README.md index 5422e062cfc..d2f54d4c891 100644 --- a/quest/m0/release-backports/README.md +++ b/quest/m0/release-backports/README.md @@ -9,8 +9,7 @@ compatibility. These patch backports can ship before the next breaking cut. ## Plan Decided 2026-10-22 (maintainer): focused backports, rather than a broader -stabilization audit. The four children are independently landable; splitting -the parser and workflow changes keeps each implementation PR to one problem. +stabilization audit. The three children are independently landable. The existing fixed-delay quest retains ownership of its release deploy. The comparison used main @@ -27,6 +26,12 @@ The fixed-delay backport as [fd26b8ffec](https://github.com/moq-dev/moq/commit/fd26b8ffec) during planning; it needs no additional implementation quest. +The publishing-workflow changes in +[moq-dev/moq#6084](https://github.com/moq-dev/moq/pull/6084) need no backport: +GitHub runs workflow_run from the default branch, where the fix already +landed. Release-branch push/dispatch paths use their own github.sha, so +changing the release copy adds no protection for a workflow-run checkout. + This epic's remaining work is to reconcile the landed backports on the release candidate, confirm their checks, and hand the commit inventory to the release process. Publication and version bumps stay with the existing @@ -43,7 +48,6 @@ findings; expanding this shortlist needs a separate scope decision. ## Required - [TLS dependencies](/quest/m0/release-backports/tls.md) - release takes the targeted WebPKI fixes already on main -- [Publishing workflows](/quest/m0/release-backports/publishing.md) - privileged wrapper publication validates the triggering repository - [JS input parsing](/quest/m0/release-backports/parsing.md) - malformed certificates and paths cannot trigger disproportionate parsing work - [FFI cancellation](/quest/m0/release-backports/ffi-cancellation.md) - cancelled reads and accepts leave the next event for the next caller diff --git a/quest/m0/release-backports/parsing.md b/quest/m0/release-backports/parsing.md index 07d8069893d..4cfec01cd35 100644 --- a/quest/m0/release-backports/parsing.md +++ b/quest/m0/release-backports/parsing.md @@ -10,7 +10,8 @@ Valid inputs retain the published behavior and API. Decided 2026-10-22 (maintainer): port the JS input-hardening portion of [moq-dev/moq#6084](https://github.com/moq-dev/moq/pull/6084) as a focused -backport; its publishing changes have a separate owner. +backport. Its publishing changes already protect workflow-run events from +main and need no release backport. Release 36f392f492 still uses a lazy certificate-armor regex and calls parts(path).length before rejecting excess path components. Repeated BEGIN diff --git a/quest/m0/release-backports/publishing.md b/quest/m0/release-backports/publishing.md deleted file mode 100644 index cd5bd8ab037..00000000000 --- a/quest/m0/release-backports/publishing.md +++ /dev/null @@ -1,24 +0,0 @@ -# [S] Backport wrapper publication repository validation - -## Goal - -Release's privileged Go, Swift, and Kotlin publication jobs only use a -workflow-run checkout whose repository passes the trusted upstream gate. - -## Plan - -Decided 2026-10-22 (maintainer): include the publishing hardening from -[moq-dev/moq#6084](https://github.com/moq-dev/moq/pull/6084) in the focused -backports, independently of its JS parsing changes. - -Release 36f392f492 retains the workflow-run path without main's -head_repository.full_name check. Port the same-repository validation and -make each privileged downstream checkout depend on the validation job, -preserving the release line's existing tag and event behavior. Inspect the -whole dependency chain, including skipped and failed gates, rather than -assuming the condition on one job protects every checkout. - -Validate accepted and refused event shapes without publishing artifacts or -exercising credentials, and run the workflow checks. The consumers are the -existing wrapper release jobs. Public API, wire, package versions, and the -selection of published artifacts are unchanged.