镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
Skip to content

Treat trailing zero version parts as equal in SmartVerCmp - #55056

Merged
juan-fdz-hawa merged 4 commits into
fleetdm:mainfrom
aliaska-varieva:fix-smartvercmp-trailing-zeros
Oct 12, 2026
Merged

juan-fdz-hawa merged 4 commits into
fleetdm:mainfrom
aliaska-varieva:fix-smartvercmp-trailing-zeros

Conversation

@aliaska-varieva

@aliaska-varieva aliaska-varieva commented Oct 7, 2026 •

Copy link
Copy Markdown
Contributor

Related issue: Resolves #55051

SmartVerCmp broke ties with "the longest wins", so SmartVerCmp("157.0", "157.0.0") == -1. With NVD ranges like versionEndExcluding: 157.0.0, hosts on Firefox 157.0 matched and were reported vulnerable to the MFSA 2026-97 CVEs fixed in 157. At the other end, 154.0 fell below versionStartIncluding: 154.0.0 and missed CVEs.

After the shared parts compare equal, the remaining suffixes are now checked: if both consist only of zero parts ("", 0, 0.0, …) the versions are equal. Any other suffix keeps the existing "longest wins" rule, so 1.0 < 1.0.0.1 and 1.0 < 1.0.0a are unchanged.

Checklist for submitter

  • Changes file added for user-visible changes in changes/, orbit/changes/ or ee/fleetd-chrome/changes.
    See Changes files for more information.

Testing

  • Added/updated automated tests
  • QA'd all new/changed functionality manually

Added TestSmartVerCmp cases for trailing zeros in both directions and for non-zero suffixes. go test ./server/vulnerabilities/nvd/tools/cvefeed/... and go test -tags fts5 ./server/vulnerabilities/nvd/ pass. We found this in our Fleet-based environment, where 157.0 hosts were reporting 36 MFSA 2026-97 CVEs.

Summary by CodeRabbit

  • Bug Fixes
    • Corrected vulnerability matching for versions with trailing zero components, reducing false reports for fixed versions and missed matches at the start of affected ranges.

SmartVerCmp ranked "157.0" below "157.0.0" because the longest version
won ties, so a version equal to a versionEndExcluding bound matched the
range and a version equal to a versionStartIncluding bound fell outside
it. Trailing zero parts no longer affect ordering.

Resolves fleetdm#55051
@aliaska-varieva
aliaska-varieva requested a review from a team as a code owner October 7, 2026 21:53
@coderabbitai

coderabbitai Bot commented Oct 7, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Important

Review skipped

Review was skipped as selected files did not have any reviewable changes.

⚙️ Run configuration
  • Configuration used: Repository: fleetdm/fleet/.coderabbit.yaml
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: b361c90f-3530-4a38-a523-0a6da65bdd28

📥 Commits

Reviewing files that changed from the base of the PR and between b7dbc54 and 21b2991.


You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Repository: fleetdm/fleet/.coderabbit.yaml
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 61d3553b-3ac1-4191-9fda-b77115327aa4

📥 Commits

Reviewing files that changed from the base of the PR and between 18c3a8b and b7dbc54.


📒 Files selected for processing (2)
  • server/vulnerabilities/nvd/cve_test.go
  • server/vulnerabilities/nvd/tools/cvefeed/nvd/match_cpe_test.go

Included review availability: This review used your included allowance. Your plan provides up to 8 included reviews per hour; 7 remain after this review.



Walkthrough

SmartVerCmp now treats versions as equal when their remaining components contain only numeric zeroes. Tests cover trailing-zero equality and ordering when a remaining component is nonzero or contains a suffix. Additional tests cover CVE version-range boundaries. The changelog describes the effect of the previous comparison behavior on CVE matching.

Priority: ⬆️ High

Severity of issue fixed: Medium

Merge Risk: ⚪ Minimal · up to b7dbc

No actionable merge-blocking issue is identified; merge after normal checks.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 55.56% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 9 functions across 4 files. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely describes the primary change: treating trailing zero version parts as equal in SmartVerCmp.
Description check ✅ Passed The description identifies the related issue, explains the bug and fix, records automated testing, and includes the required changes file checklist. Manual QA remains unchecked, but the description is…
Linked Issues check ✅ Passed Issue #55051 requires trailing zero version parts to compare equally and requires non-zero suffix ordering to remain unchanged. SmartVerCmp now treats zero-only remaining suffixes as equal. Tests co…
Out of Scope Changes check ✅ Passed The changes modify SmartVerCmp, add related automated tests, and add the required changes file. These changes directly support issue #55051. No unrelated changes are identified.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create a new PR

  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@codecov

codecov Bot commented Oct 8, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 74.42%. Comparing base (cf1217b) to head (21b2991).

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #55056   +/-   ##
=======================================
  Coverage   74.42%   74.42%           
=======================================
  Files        4297     4297           
  Lines      266321   266329    +8     
  Branches    15641    15641           
=======================================
+ Hits       198209   198215    +6     
- Misses      67932    67933    +1     
- Partials      180      181    +1     
Flag Coverage Δ
backend 75.21% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Prajwal2246

Copy link
Copy Markdown
Contributor

Tested this locally. The PR tests pass, and I ran some extra edge cases through SmartVerCmp, all consistent both ways:

  • 10.0.19045 == 10.0.19045.0, 1 == 1.0.0.0
  • 1.0 == 1.0..0 / 1.0-0 / 1.0_0 / 1.0.
  • pre-release suffixes still sort higher like before: 1.0 < 1.0.0-rc1, 157.0 < 157.0.0esr

I also went through the callers (nvd checkVersion, osv analyzer, oval, customcve, winget ingester) and didn't see anything that breaks. "0" vs "" is now 0 instead of 1, but that only matters for a range with no end version, and the result stays "not vulnerable".

One suggestion: there's no test for checkVersion in nvd/cve.go, where the false positive actually showed up. A case with versionEndExcluding: "157.0.0" and host version 157.0 would lock in the real-world fix.

Small nit: the winget ingester sorts version dirs with this, so 1.0 and 1.0.0 would now tie and their order is arbitrary. Probably never happens in practice.

The failing check is test-go-no-db (scripts) being cancelled, which looks unrelated.

Cover the paths where the false positive showed up: a cpeMatch range
written as 154.0.0..157.0.0 against two-part Firefox versions, and
checkVersion's resolved-in calculation.
@aliaska-varieva

aliaska-varieva commented Oct 8, 2026 •

Copy link
Copy Markdown
Contributor Author

Thanks for testing this so thoroughly, @Prajwal2246!

Added tests in c78a4bf and b7dbc54:

  • TestCheckVersionTrailingZeros (nvd/cve_test.go), as you suggested.
  • TestCPEMatchVersionRangeTrailingZeros (cvefeed/nvd/match_cpe_test.go). checkVersion works out the resolved-in version, but the vulnerable/not-vulnerable decision is made in cpeMatch.match. This test runs the real Firefox range (154.0.0 to 157.0.0) against two-part versions: 157.0 no longer matches and 154.0 now does.

Both fail without the fix and pass with it.

On the winget nit: agreed. 1.0 and 1.0.0 are the same version, so tying them seems right.

The file was left out of the previous commit: the bare "cvefeed" entry
in .gitignore matches this directory, so new files need git add -f.
aliaska-varieva added a commit to flamingo-stack/fleetmdm that referenced this pull request Oct 8, 2026
…heckVersion

Run the real Firefox range (154.0.0..157.0.0) through cpeMatch and
checkVersion with two-part versions. match_cpe_test.go is force-added:
the bare "cvefeed" entry in .gitignore matches this directory.

Upstream: fleetdm#55056

@juan-fdz-hawa juan-fdz-hawa 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.

Thanks for the contrib.

@juan-fdz-hawa
juan-fdz-hawa merged commit 0c95436 into fleetdm:main Oct 12, 2026
35 of 39 checks passed
allenhouchins added a commit that referenced this pull request Nov 6, 2026
**Related issue:** NA

Adds Fleet's November 2026 newsletter
(`articles/newsletter-2026-11.md`), which covers October 2026. It
publishes at `fleetdm.com/newsletters/newsletter-2026-11`.

- **Email subject line:** `Fleet news: November 2026`
- **Category:** `newsletter`, singular, which the website build accepts
(#52120). No website changes are needed.
- **Author:** Aube Paul (`robinedev`), matching the September and
October issues.

## Open questions for reviewers

- **New "📺 Fleet Virtual Summit" section** for the November 10 LinkedIn
Live event, placed before workshops. Keep it or fold it into the
workshops section. If it stays, it's a new entry in the newsletter's
section emoji table.
- **The roadmap preview is linked even though November isn't a quarter's
first month.** The October preview published October 13, after the
October issue went out, so readers haven't seen it in the newsletter
yet.
- **Article and guide picks are editorial**, not based on traffic
numbers. Reorder them if you have analytics. There were no case studies
in October.
- **The community section has one post, and it's personal.** Henry
Stamerjohann's MacSysAdmin talk. Fleet's company-page post about the
"Apple in the enterprise" research is another option, but it repeats the
research article in "Worth reading." No engagement numbers were
available.
- **Community contributors with five or more merged PRs in October:**
Prajwal Janbandhu (8, in the thank-you line), Michael Alt (6,
highlighted), Dhvanit (6, returning, not named), and Shreyash Agare (5,
returning, not named). Confirm none of them is a contractor whose
account isn't in the org.
- **Several first-time contributors only edited the handbook.** None
appear in Fleet's Slack, so they stay in the thank-you line.

## How each section was sourced

- **Shipped:** the Fleet 4.93.0 and 4.94.0 release articles,
cross-checked against tagged releases. The three highlights are macOS
patch notifications (Premium), Android zero-touch enrollment (Premium),
and self-service configuration profiles (not Premium), so the section
isn't all Premium. Patch releases 4.93.1 and 4.93.2 are covered by the
"See every release" link.
- **Planned:** the release planning board (view 10, filtered to
milestone 4.95.0), not the milestone fallback. There are 22 stories, all
assigned. 5.0.0 is due December 4, so November holds one release.
- **Workshops:** fleetdm.com/workshops, with the next five after the
send date.
- **Community contributions:** PRs merged in public `fleetdm` repos in
October by authors outside the `fleetdm` org, minus bots.

## Left out on purpose

- **"Windows: force standard account"** was in the planned section in
both September and October and hasn't shipped. It's not on the 4.95.0
board, so it isn't mentioned a third time.
- **Multiple versions of the same App Store app** is named in the 4.94.0
release article's title, but the article marks it as moved to 4.95. It's
listed under "Also on deck" instead of "shipped."
- **Amsterdam workshop (November 3):** past by the time this sends.
- **Fleet staff or contractors whose accounts aren't in the org:**
@TraiLynne and @thomcrowe. Both are confirmed in Fleet's Slack.
- **Other October content:** the warehouse inventory article and
Retriever guide, the PHP2Shell and eMudhra pieces, and every `industry
news` article. The routine doesn't feature that category.

<details>
<summary>Suggested <code>~/fleet-newsletters/contributors.tsv</code>
lines (append once confirmed)</summary>

```
TraiLynne	fleet	Trai Lynne Compton, Fleet staff (Slack); not an org member
thomcrowe	fleet	Thom Crowe, Fleet contractor (website); not an org member
```

</details>

<details>
<summary>Ledger append block: run only after this issue is
sent</summary>

`~/fleet-newsletters/ledger.jsonl` didn't exist before this issue.
Repeats were checked against the September and October issues in the
repo instead. This block creates the ledger and records every item in
this issue.

```bash
mkdir -p ~/fleet-newsletters && cat >> ~/fleet-newsletters/ledger.jsonl <<'EOF'
{"issue":"2026-11","section":"shipped","id":"4.93.0"}
{"issue":"2026-11","section":"shipped","id":"4.94.0"}
{"issue":"2026-11","section":"planned","id":"51599"}
{"issue":"2026-11","section":"planned","id":"39176"}
{"issue":"2026-11","section":"planned","id":"51979"}
{"issue":"2026-11","section":"planned","id":"53284"}
{"issue":"2026-11","section":"planned","id":"33062"}
{"issue":"2026-11","section":"planned","id":"52534"}
{"issue":"2026-11","section":"planned","id":"47904"}
{"issue":"2026-11","section":"events","id":"fleet-virtual-summit-2026"}
{"issue":"2026-11","section":"events","id":"2003719976388"}
{"issue":"2026-11","section":"events","id":"2003716644422"}
{"issue":"2026-11","section":"events","id":"2002266719658"}
{"issue":"2026-11","section":"events","id":"2002266872114"}
{"issue":"2026-11","section":"events","id":"2002267524064"}
{"issue":"2026-11","section":"articles","id":"apple-in-the-enterprise-2026"}
{"issue":"2026-11","section":"articles","id":"nvidia-gtc-2026"}
{"issue":"2026-11","section":"articles","id":"tailworm-what-to-do-about-tailscale-ssh-before-the-fix-ships"}
{"issue":"2026-11","section":"articles","id":"revert-a-bad-change-in-gitops"}
{"issue":"2026-11","section":"articles","id":"block-chrome-extensions"}
{"issue":"2026-11","section":"articles","id":"block-edge-extensions"}
{"issue":"2026-11","section":"articles","id":"block-firefox-extensions"}
{"issue":"2026-11","section":"articles","id":"block-safari-extensions"}
{"issue":"2026-11","section":"articles","id":"use-claude-code-with-fleet"}
{"issue":"2026-11","section":"articles","id":"roadmap-preview-october-2026"}
{"issue":"2026-11","section":"social","id":"7513481631123394560"}
{"issue":"2026-11","section":"community","id":"#50836"}
{"issue":"2026-11","section":"community","id":"#53407"}
{"issue":"2026-11","section":"community","id":"#53670"}
{"issue":"2026-11","section":"community","id":"#53768"}
{"issue":"2026-11","section":"community","id":"#53810"}
{"issue":"2026-11","section":"community","id":"#53824"}
{"issue":"2026-11","section":"community","id":"#54019"}
{"issue":"2026-11","section":"community","id":"#54181"}
{"issue":"2026-11","section":"community","id":"#54296"}
{"issue":"2026-11","section":"community","id":"#54411"}
{"issue":"2026-11","section":"community","id":"#54502"}
{"issue":"2026-11","section":"community","id":"#54509"}
{"issue":"2026-11","section":"community","id":"#54592"}
{"issue":"2026-11","section":"community","id":"#54685"}
{"issue":"2026-11","section":"community","id":"#54708"}
{"issue":"2026-11","section":"community","id":"#54726"}
{"issue":"2026-11","section":"community","id":"#54785"}
{"issue":"2026-11","section":"community","id":"#55056"}
{"issue":"2026-11","section":"community","id":"#55058"}
{"issue":"2026-11","section":"community","id":"#55072"}
{"issue":"2026-11","section":"community","id":"#55089"}
{"issue":"2026-11","section":"community","id":"#55097"}
{"issue":"2026-11","section":"community","id":"#55127"}
{"issue":"2026-11","section":"community","id":"#55249"}
{"issue":"2026-11","section":"community","id":"#55266"}
{"issue":"2026-11","section":"community","id":"#55353"}
{"issue":"2026-11","section":"community","id":"#55471"}
{"issue":"2026-11","section":"community","id":"#55492"}
{"issue":"2026-11","section":"community","id":"#55547"}
{"issue":"2026-11","section":"community","id":"#55841"}
{"issue":"2026-11","section":"community","id":"#55900"}
{"issue":"2026-11","section":"community","id":"#55903"}
{"issue":"2026-11","section":"community","id":"#55946"}
{"issue":"2026-11","section":"community","id":"#56072"}
{"issue":"2026-11","section":"community","id":"#56085"}
{"issue":"2026-11","section":"community","id":"#56148"}
{"issue":"2026-11","section":"community","id":"#56214"}
{"issue":"2026-11","section":"community","id":"#56266"}
{"issue":"2026-11","section":"community","id":"#56287"}
{"issue":"2026-11","section":"community","id":"#56376"}
{"issue":"2026-11","section":"community","id":"#56403"}
{"issue":"2026-11","section":"community","id":"#56486"}
{"issue":"2026-11","section":"community","id":"#56498"}
{"issue":"2026-11","section":"community","id":"#56575"}
{"issue":"2026-11","section":"community","id":"#56596"}
{"issue":"2026-11","section":"community","id":"#56609"}
{"issue":"2026-11","section":"community","id":"#56657"}
{"issue":"2026-11","section":"community","id":"#56708"}
{"issue":"2026-11","section":"community","id":"#56719"}
{"issue":"2026-11","section":"community","id":"#56983"}
{"issue":"2026-11","section":"community","id":"#56984"}
{"issue":"2026-11","section":"community","id":"#56985"}
EOF
```

</details>

## Testing

- [x] Confirmed the markdown passes the website build's metadata checks:
required meta tags, ISO `publishedOn`, description at 139 of 150
characters, `category` set to `newsletter`, H1 matching `articleTitle`,
and no Vue-template braces.
- [x] Verified all 54 fleetdm.com, GitHub, and Eventbrite links return
200. LinkedIn returns 999 to automated requests, so the profile links
come from the handbook and the post link was opened in a browser.
- [x] Checked the copy against Fleet's content style: no em dashes,
sentence-case headings, Oxford commas, and Fleet Premium labels carried
through from the release articles.
- [ ] QA'd all new/changed functionality manually

## AI

**AI:** Claude Code (claude-opus-5-5)

---------

Co-authored-by: robinedev <aubedev@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants