Skip to content

Allow overriding the SCA CVE catalog from a local file - #13285

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
masterfrom
flabel/sca-cve-file-override
Nov 9, 2026
Merged

gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
masterfrom
flabel/sca-cve-file-override

Conversation

@florentinl

Copy link
Copy Markdown
Contributor

What Does This Do

Add the internal _DD_APPSEC_SCA_CVE_FILE environment variable to load SCA advisories from a local JSON file instead of the bundled catalog. When unset, the agent uses its bundled catalog.

Motivation

Allow tests to supply synthetic advisories and deployments to update the catalog without modifying the agent JAR, matching the Python override.

Additional Notes

The file uses the existing Java catalog schema and replaces the bundle without merging. An unreadable or malformed override loads no targets and does not fall back to the bundle. The override does not enable SCA and is excluded from configuration telemetry.

Validation: all 103 SCA tests and 497 Config tests pass. Java formatting and configuration-registry checks pass.

@florentinl florentinl added type: feature Enhancements and improvements tag: no release notes Changes to exclude from release notes comp: asm waf Application Security Management (WAF) tag: ai generated Largely based on code generated by an AI or LLM labels Nov 6, 2026
@florentinl
florentinl marked this pull request as ready for review November 6, 2026 14:33
@florentinl
florentinl requested review from a team as code owners November 6, 2026 14:33
@florentinl
florentinl requested review from PerfectSlayer, cecile75, claponcet and dromanol and removed request for a team November 6, 2026 14:33
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-06T14:36:22.498858Z 89516cc Draft marked ready
🔒 Security Review ✅ Completed 2026-11-06T14:37:17.194929Z 89516cc Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@datadog-official datadog-official Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bits Code Review: PASS

More details

Source and test inspection supports the documented behavior: an unset override retains the bundled catalog, while unreadable or malformed overrides leave the database empty without enabling SCA.

Was this helpful? React 👍 or 👎

Open Bits AI session

🤖 Bits Code Review · Commit 89516cc

@dd-octo-sts

dd-octo-sts Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🟢 Java Benchmark SLOs — All performance SLOs passed

Suite Status
Startup 🟢 pass

SLO thresholds are defined here based on automatically generated metrics. A warning is raised when results are within 5% of the threshold.

PR vs. master results
Scenario Candidate master Δ (95% CI of mean)
startup:insecure-bank:iast:Agent 13.97 s 13.87 s [-0.1%; +1.5%] (no difference)
startup:insecure-bank:tracing:Agent 12.90 s 12.98 s [-1.3%; -0.0%] (maybe better)
startup:petclinic:appsec:Agent 17.15 s 16.90 s [+0.8%; +2.2%] (maybe worse)
startup:petclinic:iast:Agent 16.52 s 16.47 s [-5.8%; +6.4%] (unstable)
startup:petclinic:profiling:Agent 16.75 s 16.90 s [-2.0%; +0.3%] (no difference)
startup:petclinic:sca:Agent 17.19 s 17.00 s [+0.3%; +2.0%] (maybe worse)
startup:petclinic:tracing:Agent 16.12 s 16.24 s [-1.8%; +0.3%] (no difference)

Commit: 89516cc9 · CI Pipeline · Benchmarking Platform UI


Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion.

@datadog-official

datadog-official Bot commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor

🎯 Code Coverage (details)
• Patch Coverage: 58.33%
• Overall Coverage: 59.99% (+0.01%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 89516cc | Docs | Give us feedback!

@florentinl
florentinl added this pull request to the merge queue Nov 9, 2026
@dd-octo-sts

dd-octo-sts Bot commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Nov 9, 2026 •

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-11-09 11:07:08 UTC ℹ️ Start processing command /merge


2026-11-09 11:07:12 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-11-09 12:08:16 UTC ℹ️ MergeQueue: This merge request was merged

@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Nov 9, 2026
@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot merged commit 1724636 into master Nov 9, 2026
698 of 702 checks passed
@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot deleted the flabel/sca-cve-file-override branch November 9, 2026 12:08
@github-actions github-actions Bot added this to the 1.69.0 milestone Nov 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: asm waf Application Security Management (WAF) tag: ai generated Largely based on code generated by an AI or LLM tag: no release notes Changes to exclude from release notes type: feature Enhancements and improvements

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants