-
Notifications
You must be signed in to change notification settings - Fork 402
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix last_enrolled_at
for macOS devices when re-enrolling to MDM
#20173
Merged
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8927af9
fix last_enrolled_at for macOS devices when re-enrolling to MDM
lucasmrod 56ace10
Fix tests
lucasmrod b2ab3fd
Merge branch 'main' into 20059-fix-last_enrolled_at
lucasmrod 63db14c
Add migration to fix last_enrolled_at issue
lucasmrod d9e5e7c
Merge branch 'main' into 20059-fix-last_enrolled_at
lucasmrod 1e4a825
Fix error string
lucasmrod 28df767
Merge branch 'main' into 20059-fix-last_enrolled_at
lucasmrod File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
* Fixed bug that set `Added to Fleet` to `Never` after macOS hosts re-enrolled to Fleet via MDM. | ||
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -770,30 +770,37 @@ func updateMDMAppleHostDB( | |
) error { | ||
refetchRequested, lastEnrolledAt := mdmHostEnrollFields(mdmHost) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if it would make things easier to maintain to split up this abstraction and calculate these two values separately when needed? |
||
|
||
updateStmt := ` | ||
UPDATE hosts SET | ||
hardware_serial = ?, | ||
uuid = ?, | ||
hardware_model = ?, | ||
platform = ?, | ||
refetch_requested = ?, | ||
last_enrolled_at = ?, | ||
osquery_host_id = COALESCE(NULLIF(osquery_host_id, ''), ?) | ||
WHERE id = ?` | ||
|
||
if _, err := tx.ExecContext( | ||
ctx, | ||
updateStmt, | ||
args := []interface{}{ | ||
mdmHost.HardwareSerial, | ||
mdmHost.UUID, | ||
mdmHost.HardwareModel, | ||
mdmHost.Platform, | ||
refetchRequested, | ||
lastEnrolledAt, | ||
// Set osquery_host_id to the device UUID only if it is not already set. | ||
mdmHost.UUID, | ||
hostID, | ||
); err != nil { | ||
} | ||
|
||
// Only update last_enrolled_at if this is a iOS/iPadOS device. | ||
// macOS should not update last_enrolled_at as it is set when osquery enrolls. | ||
lastEnrolledAtColumn := "" | ||
if mdmHost.Platform == "ios" || mdmHost.Platform == "ipados" { | ||
lastEnrolledAtColumn = "last_enrolled_at = ?," | ||
args = append([]interface{}{lastEnrolledAt}, args...) | ||
} | ||
|
||
updateStmt := fmt.Sprintf(` | ||
UPDATE hosts SET | ||
%s | ||
hardware_serial = ?, | ||
uuid = ?, | ||
hardware_model = ?, | ||
platform = ?, | ||
refetch_requested = ?, | ||
osquery_host_id = COALESCE(NULLIF(osquery_host_id, ''), ?) | ||
WHERE id = ?`, lastEnrolledAtColumn) | ||
|
||
if _, err := tx.ExecContext(ctx, updateStmt, args...); err != nil { | ||
return ctxerr.Wrap(ctx, err, "update mdm apple host") | ||
} | ||
|
||
|
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ℹ️ info: Documented the fix for the
last_enrolled_at
field issue for macOS re-enrollment.