Repository navigation
chore(deps): update dependencies to address security advisories - #3558
Conversation
kevinjqliu
left a comment
There was a problem hiding this comment.
1 question about about.toml changes
For future reference, I think it would be good to include in the PR description references of which PRs we're backporting, just to keep track. And also which changes are net new to the branch.
| # `zstd` < 0.14.3 / `zstd-safe` < 8.2.0 memory-safety bugs. | ||
| # | ||
| # Fixed only in zstd 0.14, but parquet 58 and apache-avro 0.21 require | ||
| # zstd 0.13. Remove once on parquet >= 60 | ||
| # (https://github.com/apache/iceberg-rust/pull/3257), an apache-avro release | ||
| # after 0.21, and workspace `zstd` >= 0.14.3. | ||
| # | ||
| # None of the affected code is reachable here. To re-check, run | ||
| # `cargo tree --workspace --all-features --target all -e features -i zstd-safe` | ||
| # and confirm only `std` is enabled. | ||
| # | ||
| # Affects only zstd's `with_context` constructors, which nothing calls. | ||
| "RUSTSEC-2026-0391", | ||
| # Requires the `seekable` feature, which is off. | ||
| "RUSTSEC-2026-0398", | ||
| # Requires the `legacy` feature, which is off. | ||
| "RUSTSEC-2026-0403", |
| checksum = "3823dda7cf046602f4b4e77ec8e227863dc4736037cc85bb33d9f19febe16bb7" | ||
| path = "LICENSE.txt" | ||
|
|
||
| # zstd-sys vendors zstd's C code (BSD-3-Clause, Meta) next to the Rust |
There was a problem hiding this comment.
why this change?
I see the corresponding PR is not merged
https://github.com/apache/iceberg-rust/pull/3542/changes
There was a problem hiding this comment.
We can drop, this PR is what invalidates these clauses which is why I included them (and should have been included in the original PR upstream).
I think we should keep changes in the 0.11.x branch as minimal as possible and only to backport changes. Otherwise its hard to reason about in the future. |
Absolutely agree, sorry I missed it in this one! I've added them now. |
no worries, just a pointer so its easier for us to reason about in the future 😄 |
* chore(deps): bump zstd-sys to 2.1.2 to fix RUSTSEC-2026-0410 Co-authored-by: Danny C Jones <djonesoa@amazon.com> * ci: ignore unreachable zstd RUSTSEC advisories pending zstd 0.14 upstream Co-authored-by: Danny C Jones <djonesoa@amazon.com> * Address comments from Copilot Co-authored-by: Danny C Jones <djonesoa@amazon.com> * ci: clarify zstd advisory ignore rationale and removal condition Map each ignored advisory to why it is unreachable, add a command to re-check enabled zstd features, and include the workspace zstd bump in the removal condition. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Kevin Liu <kevin.jq.liu@gmail.com> Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> (cherry picked from commit e4f928a) [0.11.x: audit.toml comment names parquet 58 and apache-avro 0.21]
zstd-sys 2.1.2 removed LICENSE.Mit and changed LICENSE.BSD-3-Clause, so the old clarification stopped matching and cargo-about dropped the Meta notices for the bindings and the vendored zstd C code. Pin the 2.1.2 files instead of removing the clarification. Backport of apache#3542 at 54a20b2 (not yet merged). Co-authored-by: Danny C Jones <djonesoa@amazon.com> Co-authored-by: Kevin Liu <kevin.jq.liu@gmail.com> Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
… advisories Lockfile bumps from main, at main's versions: - quinn-proto 0.11.19 (apache#3425) - rustls 0.23.46, with aws-lc-rs 1.18.1 and aws-lc-sys 0.45.0 (apache#3455) - rustls-webpki 0.103.16, webpki-roots and webpki-root-certs 1.0.10 (apache#3496) - ctutils 0.4.5 (apache#3519) Co-authored-by: Danny C Jones <djonesoa@amazon.com> Co-authored-by: Kevin Liu <kevin.jq.liu@gmail.com> Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
06291f0 to
11a3d56
Compare
kevinjqliu
left a comment
There was a problem hiding this comment.
LGTM!
I updated the pr and description to reference the PRs we are backporting
| checksum = "3823dda7cf046602f4b4e77ec8e227863dc4736037cc85bb33d9f19febe16bb7" | ||
| path = "LICENSE.txt" | ||
|
|
||
| # zstd-sys vendors zstd's C code (BSD-3-Clause, Meta) next to the Rust |
|
waiting for ci to run to completion before pressing "squash and merge" |
f16959d to
11a3d56
Compare
Which issue does this PR close?
Supports #3034.
What changes are included in this PR?
Backports the security advisory fixes from
mainto0.11.x, one commit each:zstd-systo 2.1.2 and ignore the zstd advisories that don't apply here (RUSTSEC-2026-0391, RUSTSEC-2026-0398, RUSTSEC-2026-0403). Theaudit.tomlcomment names this branch's parquet 58 and apache-avro 0.21.zstd-sysclarification inbindings/python/about.tomlfor 2.1.2, so the wheel LICENSE keeps the Meta notices for the bindings and the vendored zstd C code. Taken from its head commit, as it isn't merged yet.main's versions:Not included: the event-listener, chacha20 and spin bumps from #3425, and the RUSTSEC-2026-0381 ignore from #3496.
cargo auditpasses without them.Are these changes tested?
cargo audit: passes. It reports 14 vulnerabilities on0.11.xwithout this PR.cargo about generate -c about.toml --locked --fail --manifest-path Cargo.tomlinbindings/python: passes with no warnings, and the output includes the Meta notices forzstd-sys.AI Disclosure
LLM used to validate the advisories, restructure the backport, align versions with
main, and run the checks above. Reviewers should check that the #3542 commit still matches #3542 when it merges.