Strip RSR suffixes prior to handing off OS version from Nudge check to Semver comparison #22830
Conversation
This file contains 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
…o Semver comparison Fixes 500s in config endpoint when a machine with an RSR version installed is in a team with enforced macOS updates
gillespi314
approved these changes
Oct 10, 2024
mostlikelee
reviewed
Oct 10, 2024
| @@ -43,7 +45,8 @@ func (os *OperatingSystem) RequiresNudge() (bool, error) { | |||
| return false, nil | |||
| } | |||
|
|
|||
| version, err := semver.NewVersion(os.Version) | |||
| // strip Rapid Security Response suffix (e.g. version 13.3.7 (a)) if any | |||
| version, err := semver.NewVersion(macOSRapidSecurityResponseVersionSuffix.ReplaceAllString(os.Version, ``)) | |||
| if err != nil { | |||
| return false, fmt.Errorf("parsing macos version \"%s\": %w", os.Version, err) | |||
There was a problem hiding this comment.
nit: can we wrap this error in the calling func so we know it's coming from RequiresNudge()?
There was a problem hiding this comment.
Can fast-follow that after this gets merged (to avoid needing to rerun CI on this, given that luckily the error message in L48/51 is unique anyway).
mostlikelee
approved these changes
Oct 10, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #22830 +/- ##
=======================================
Coverage 65.29% 65.29%
=======================================
Files 1524 1524
Lines 118742 118755 +13
Branches 3551 3551
=======================================
+ Hits 77533 77546 +13
+ Misses 34019 34013 -6
- Partials 7190 7196 +6
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
iansltx
added a commit
that referenced
this pull request
Oct 10, 2024
…o Semver comparison (#22830) #22829 Fixes 500s in config endpoint when a machine with an RSR version installed is in a team with enforced macOS updates # Checklist for submitter If some of the following don't apply, delete the relevant line. <!-- Note that API documentation changes are now addressed by the product design team. --> - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. - [x] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements) - [x] Added/updated tests - [ ] Manual QA for all new/changed functionality
iansltx
added a commit
that referenced
this pull request
Oct 10, 2024
…o Semver comparison (#22830) #22829 Fixes 500s in config endpoint when a machine with an RSR version installed is in a team with enforced macOS updates # Checklist for submitter If some of the following don't apply, delete the relevant line. <!-- Note that API documentation changes are now addressed by the product design team. --> - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. - [x] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements) - [x] Added/updated tests - [ ] Manual QA for all new/changed functionality
iansltx
added a commit
that referenced
this pull request
Oct 10, 2024
…from Nudge check to Semver comparison (#22842) Cherry-pick for patch release of #22830, for #22829 Fixes 500s in config endpoint when a machine with an RSR version installed is in a team with enforced macOS updates --------- Co-authored-by: Tim Lee <[email protected]>
Closed
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.
#22829
Fixes 500s in config endpoint when a machine with an RSR version installed is in a team with enforced macOS updates
Checklist for submitter
If some of the following don't apply, delete the relevant line.
changes/,orbit/changes/oree/fleetd-chrome/changes.See Changes files for more information.
SELECT *is avoided, SQL injection is prevented (using placeholders for values in statements)