Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

Expand Down
Original file line number Diff line number Diff line change
@@ -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/`.
9 changes: 9 additions & 0 deletions plans/registry.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 |
Expand Down
Loading