Repository navigation
ci: ignore GHSA-2mjx-qc3c-rqvc in the Trivy lockfile scan, matching the cargo-audit waiver - #1414
Merged
Merged
Conversation
Trivy reports RUSTSEC-2026-0285 by its GitHub ID, GHSA-2mjx-qc3c-rqvc, so the cargo-audit waiver does not apply to it, and the Lockfile Scan fails on every branch. Add the same waiver to .trivyignore.yaml, and point each ignore list at the other so both are removed together. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
🔗 Commit SHA: ef93606 | Docs | View more details | Give us feedback! |
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The narrowly scoped waiver is consistent across both scanners and clearly documents its temporary constraint and removal condition.
0 open findings
What changed in this PR
Aligns Trivy’s Rust lockfile scan waiver with the existing cargo-audit waiver for the temporarily unavoidable rustls advisory.
Changes:
- Ignores
GHSA-2mjx-qc3c-rqvcin Trivy lockfile scans. - Cross-references both waiver locations and documents removal criteria.
| File | Description |
|---|---|
.trivyignore.yaml |
Adds the Trivy advisory waiver and rationale. |
bottlecap/.cargo/audit.toml |
Links the existing RustSec waiver to Trivy’s waiver. |
🧠 Review effort: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
lym953
requested review from
a team and
litianningdatadog
and removed request for
a team and
DarcyRaynerDD
October 9, 2026 15:16
litianningdatadog
approved these changes
Oct 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The "Bottlecap (Rust) / Lockfile Scan" check fails on every branch, for example #1412 and an automated dd-trace-go upgrade branch. Trivy finds advisory GHSA-2mjx-qc3c-rqvc in
rustls0.23.43 and exits 1.mainwill fail the same way on its next run.Why this PR ignores the advisory
The fix is in
rustls0.23.45, and we cannot use that version yet:rustls0.23.45 requiresaws-lc-rs1.18 or later.aws-lc-rs1.18 uses AWS-LC-FIPS 4.x, which has no FIPS 140-3 certification yet. Our FIPS builds must use a certified crypto module. So the team reverted the bump to 0.23.45 in Revert "chore(deps): bumprustlsto 0.23.45" (#1376) #1389, and chore(deps): pinaws-lc-rs<1.18 to retainAWS-LC-FIPS3.x backend #1390 pinnedaws-lc-rsbelow 1.18.aws-lc-rs, but both builds use the sameCargo.lock, so they get the samerustlsversion.datadog-fipsfromserverless-componentsalso requiresrustlsbelow 0.23.45. In a copy ofmainwithout our own cap,cargo update -p rustls --precise 0.23.45fails on that requirement.#1389 accepted this risk for
cargo-audit, where the advisory has its RustSec ID, RUSTSEC-2026-0285. The GitHub advisory links to that RustSec page. The advisory says that the handshake transcript stays authenticated, so an attacker cannot change or complete a handshake. The effect is that a peer can send in plaintext some handshake messages that must be encrypted.Change
Trivy uses its own ignore list,
.trivyignore.yaml, and that list did not have the advisory. This PR adds GHSA-2mjx-qc3c-rqvc to it, with the same reason. It also adds a line tobottlecap/.cargo/audit.tomlthat names the Trivy entry. Then the person who removes one ignore after the certification also removes the other..github/workflows/vulnerability-scan.ymlreads the same file for its dailyCargo.lockscan, so that scan also skips the advisory. The daily image scans in that workflow do not read the file, and this PR does not change them.Testing
Steps
bottlecap/Cargo.lock,bottlecap/Cargo.tomland.trivyignore.yamlinto an empty directory.trivy fs --scanners vuln --ignorefile .trivyignore.yaml --ignore-unfixed --exit-code 1 --format table bottlecap.mainand for this branch.Result
main,469decc8)rustls0.23.43I used the local Trivy installation, not the version and database that CI uses. The CI run on this PR is the real check.
🤖 Generated with Claude Code