From 5263330e8bfce8af709db9a3339b6b851ce21f62 Mon Sep 17 00:00:00 2001 From: David Bowman Date: Tue, 17 Nov 2026 19:41:07 +0000 Subject: [PATCH] fix: update patched Rust dependencies --- Cargo.lock | 38 ++++---- Cargo.toml | 2 +- .../m020-dependency-advisory-remediation.md | 92 +++++++++++++++++++ plans/registry.md | 9 ++ 4 files changed, 121 insertions(+), 20 deletions(-) create mode 100644 plans/implementation/corrective/m020-dependency-advisory-remediation.md diff --git a/Cargo.lock b/Cargo.lock index 16805e0..3ac8ff1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -545,9 +545,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.7.5" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a52aa3fcda4e6302a9f48734f234d35d4721b96f8fe07d073f07ce9df4f0271" +checksum = "914c195c4d7fbc5ed7f88d14cbf85914d5c664967658d43404b263913a477e82" dependencies = [ "cpubits", "ctutils", @@ -602,9 +602,9 @@ dependencies = [ [[package]] name = "ctutils" -version = "0.4.2" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" +checksum = "261af4dc7a06ea8a527a8717d8cbba3417530d6ea14e1edb3de6b67806be474f" dependencies = [ "cmov", "subtle", @@ -1723,7 +1723,7 @@ dependencies = [ "hyper", "libc", "pin-project-lite", - "socket2 0.6.5", + "socket2 0.5.10", "tokio", "tower-service", "tracing", @@ -2932,9 +2932,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags", "errno", @@ -2945,9 +2945,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.45" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "log", "once_cell", @@ -2981,9 +2981,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.15" +version = "0.103.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" +checksum = "e3a0760a887c14823fca5a1c970b01d47c328c696c0c64829d1df50e8f853fd5" dependencies = [ "ring", "rustls-pki-types", @@ -3443,7 +3443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.3", + "getrandom 0.3.4", "once_cell", "rustix", "windows-sys 0.61.2", @@ -3540,9 +3540,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.53.1" +version = "1.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed" +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" dependencies = [ "bytes", "libc", @@ -4010,14 +4010,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.9", + "webpki-roots 1.0.12", ] [[package]] name = "webpki-roots" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a" +checksum = "7265c9301c16a8711c992c2d8da90ee77ef54b1ed51482d6dfeb00dc756b1297" dependencies = [ "rustls-pki-types", ] @@ -4287,9 +4287,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33811428bee40dbceb6d545e95754741d17a6aef9a4849f0fd62e2ba4f412a78" +checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 3670433..a7cb072 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,7 +77,7 @@ eggnet-tls = { version = "=0.2.0" } # false` keeps the H1/direct graph clean; `http2`/`tls` are turned on only by # the `h2-inbound`/`h2-inbound-tls` features of `eggreplay-http`. eggserve-core = { version = "=0.4.0", default-features = false } -rustls = { version = "=0.23.45", default-features = false, features = ["ring", "std", "tls12"] } +rustls = { version = "=0.23.46", default-features = false, features = ["ring", "std", "tls12"] } tokio-rustls = { version = "=0.26.2", default-features = false, features = ["ring", "tls12"] } rcgen = { version = "=0.13.2", default-features = false, features = ["ring", "pem", "x509-parser"] } diff --git a/plans/implementation/corrective/m020-dependency-advisory-remediation.md b/plans/implementation/corrective/m020-dependency-advisory-remediation.md new file mode 100644 index 0000000..dfb6b27 --- /dev/null +++ b/plans/implementation/corrective/m020-dependency-advisory-remediation.md @@ -0,0 +1,92 @@ +# M020 — Rust Dependency Advisory Remediation + +Status: implemented +Depends on: M019 (closed) + +## Objective + +Remediate the patched RustSec findings identified in the current Cargo.lock and +remove yanked resolutions where Cargo can select a compatible replacement, +without broad dependency refreshes or changes to EggReplay's transport and +feature boundaries. + +## Scope + +- Raise the exact `rustls` pin from 0.23.45 to the patched 0.23.46 release. +- Refresh the lockfile to patched compatible releases of `rustls-webpki`, + `webpki-roots`, `tokio`, `rustix`, `crypto-bigint`, and `ctutils`. +- Replace the yanked `yoke-derive` resolution with a non-yanked compatible + release. +- Keep all Eggstack transport pins, optional feature selections, product + source, and the Rust 1.89 MSRV unchanged. +- Re-run the full locked workspace gate and `cargo audit`; record residual + advisories precisely rather than suppressing or misclassifying them. + +## Resolved versions + +| Package | Before | Resolved | +|---|---:|---:| +| `rustls` | 0.23.45 | 0.23.46 | +| `rustls-webpki` | 0.103.15 | 0.103.17 | +| `webpki-roots` (1.x) | 1.0.9 | 1.0.12 | +| `tokio` | 1.53.1 | 1.54.1 | +| `rustix` | 1.1.5 | 1.1.6 | +| `crypto-bigint` | 0.7.5 | 0.7.11 | +| `ctutils` | 0.4.2 | 0.4.8 | +| `yoke-derive` | 0.8.3 (yanked) | 0.8.4 | + +The lockfile changes were targeted; the broad 93-package dry-run refresh was +not applied. EggFetch, EggServe, Eggress, Tokio-Rustls, and protocol features +remain pinned/configured as before, apart from the direct rustls patch pin. + +## Verification result + +The full locked workspace gate passed: formatting, all-target/all-feature +`cargo check`, all-target/all-feature Clippy with `-D warnings`, and +all-feature tests with `--no-fail-fast`. The local dependency-boundary queries +confirmed the HTTP direct, default CLI, interception, and Python profiles still +exclude both `eggserve-core` and `eggserve-static`. + +After the updates, `cargo audit` reports three vulnerabilities (`rsa 0.10.0-rc.18` +and `russh 0.62.7`, twice) in the inactive optional SSH dependency path, plus +the existing unmaintained `chrono` warning. No yanked crates from the targeted +update remain. Hosted CI has not been run; keep M020 open until hosted +qualification and its closure record are complete. + +## Explicit advisory dispositions + +- `russh 0.62.7` and its `rsa 0.10.0-rc.18` dependency are in the lockfile but + not in the activated workspace graph. The current Eggress SSH adapter line + constrains russh to 0.62.x; the inspected Eggress 1.0.12 adapter still has + that constraint. Do not locally patch or vendor this transport dependency. + Keep this finding open for an upstream Eggress release that adopts patched + russh, or a separately planned transport change. +- `chrono` is reported unmaintained with no fixed release. Do not migrate date + handling in this dependency-only corrective; evaluate `time`/`jiff` in a + separately scoped change. +- Do not bump EggServe or Eggress merely to chase newer versions, and do not + accept a broad all-lockfile update in place of the targeted security fixes. + +## Verification + +Run the required locked workspace gate: + +```sh +cargo fmt --all -- --check \ + && cargo check --workspace --all-targets --all-features --locked \ + && cargo clippy --workspace --all-targets --all-features --locked -- -D warnings \ + && cargo test --workspace --all-features --locked --no-fail-fast +``` + +Also run `cargo audit` against a refreshed RustSec database, `git diff --check`, +and inspect dependency trees to confirm the default and optional transport +boundaries remain unchanged. + +## Acceptance + +M020 may be marked implemented when all in-scope findings are on patched or +non-yanked versions, the remaining lockfile-only/unmaintained findings above are +accurately reported, the full locked workspace gate passes, and dependency +boundary checks show no unintended graph expansion. Keep M020 open until its +hosted CI qualification is green and a closure record is added under +`plans/closure/`. diff --git a/plans/registry.md b/plans/registry.md index ba0bf18..de3192e 100644 --- a/plans/registry.md +++ b/plans/registry.md @@ -82,6 +82,7 @@ boundary, and ADR 0008 owns interception security/transport ownership. | M017 | `implementation/corrective/m017-unterminated-bidi-grpc.md` | closed | M016 closure, M015D closure | un-terminated bidirectional gRPC: classified body errors, pinned replay contract | | M018 | `implementation/corrective/m018-candidate-error-attribution-and-h2-body-diagnostics.md` | closed | M017 closure | shared error table; 413 for a declared oversized body; retired the mis-measured H2 header-list limitation | | M019 | `implementation/corrective/m019-comparison-authority.md` | closed | M018 (closed) | comparison authority: `date` normalization with a visible suppression, `TimingAssertion` wired to CLI and Python, request-direction stream comparison resolved by removal, gRPC decision, `curl_interop` record | +| M020 | `implementation/corrective/m020-dependency-advisory-remediation.md` | implemented | M019 (closed) | patched advisory dependencies; full locked local gate passed; optional SSH advisories remain dispositioned pending upstream fix | ### Current execution gate @@ -284,6 +285,14 @@ reproducible rather than deleted. Local gate: 495 passed, 2 failed (both the known machine-specific `curl_interop` pair). See `closure/m019-comparison-authority.md`. +M020 is implemented locally: rustls is at 0.23.46, the targeted lockfile +patches are applied, the full locked workspace gate passed, and the default, +interception, and Python boundary checks remain free of `eggserve-core` and +`eggserve-static`. `cargo audit` still reports three vulnerabilities confined +to the inactive optional russh/rsa SSH graph, plus the unmaintained `chrono` +warning. Hosted CI qualification is pending, so M020 remains open. See +`implementation/corrective/m020-dependency-advisory-remediation.md`. + ## Canonical planning documents | Document | Purpose |