Skip to content

Enforce FileVault at login when manually enrolled#31170

Merged
MagnusHJensen merged 13 commits intomainfrom
29250-force-filevault-on-login-for-manual-enrollments
Aug 1, 2025
Merged

Enforce FileVault at login when manually enrolled#31170
MagnusHJensen merged 13 commits intomainfrom
29250-force-filevault-on-login-for-manual-enrollments

Conversation

@MagnusHJensen
Copy link
Copy Markdown
Member

@MagnusHJensen MagnusHJensen commented Jul 23, 2025

Done by not allowing any deferrals as before one deferral was allowed

fixes: #29250

There is no doc change as we nowhere state that we allow one deferral, let me know if we want to write somewhere that this is now the standard behaviour.

I also investigated trying to force it directly when the profile arrived but without any luck, so still need a logout/login to get filevault enabled, but it's no longer possible to cancel/defer it.

Do verify when testing in automatic enrollment that FileVault is still enforced as I can't test Automatic enrollment yet.

Checklist for submitter

If some of the following don't apply, delete the relevant line.

  • Changes file added for user-visible changes in changes/, orbit/changes/ or ee/fleetd-chrome/changes.
    See Changes files for more information.
  • If database migrations are included, checked table schema to confirm autoupdate not relevant as it does not update any schema just modifies existing entries.
  • For database migrations:
    • Checked schema for all modified table for columns that will auto-update timestamps during migration.
    • Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects.
    • Ensured the correct collation is explicitly set for character columns (COLLATE utf8mb4_unicode_ci).
  • Added/updated automated tests
  • Manual QA for all new/changed functionality

@MagnusHJensen MagnusHJensen requested a review from a team as a code owner July 23, 2025 10:10
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Jul 23, 2025

Important

Review skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

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

✨ Finishing Touches
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch 29250-force-filevault-on-login-for-manual-enrollments

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
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 23, 2025

Codecov Report

❌ Patch coverage is 70.40816% with 29 lines in your changes missing coverage. Please review.
✅ Project coverage is 64.19%. Comparing base (87aa2d1) to head (a91587c).
⚠️ Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...s/tables/20250731151000_EnforceFileVaultAtLogin.go 70.40% 20 Missing and 9 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #31170      +/-   ##
==========================================
+ Coverage   63.73%   64.19%   +0.46%     
==========================================
  Files        1958     1914      -44     
  Lines      190652   188680    -1972     
  Branches     6179     5317     -862     
==========================================
- Hits       121504   121128     -376     
+ Misses      59625    58015    -1610     
- Partials     9523     9537      +14     
Flag Coverage Δ
backend 65.07% <70.40%> (-0.01%) ⬇️

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

☔ View full report in Codecov by Sentry.
📢 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.

@MagnusHJensen MagnusHJensen force-pushed the 29250-force-filevault-on-login-for-manual-enrollments branch from c85d0c2 to f4079e3 Compare July 23, 2025 11:28
@MagnusHJensen MagnusHJensen force-pushed the 29250-force-filevault-on-login-for-manual-enrollments branch from f4079e3 to f438795 Compare July 23, 2025 11:30
@MagnusHJensen
Copy link
Copy Markdown
Member Author

Marked as Draft as we want to potentially do load testing for it.
#29250 (comment)

Another option, not sure if that is too hacky is to avoid updating the Checksum on the new filevault profile and instead just update the contents of the profile which would result in new hosts getting the new value but not resending the profile to all old hosts.

@MagnusHJensen MagnusHJensen marked this pull request as ready for review July 29, 2025 15:00
@MagnusHJensen
Copy link
Copy Markdown
Member Author

Marked as Draft as we want to potentially do load testing for it. #29250 (comment)

Another option, not sure if that is too hacky is to avoid updating the Checksum on the new filevault profile and instead just update the contents of the profile which would result in new hosts getting the new value but not resending the profile to all old hosts.

Agreed to not update the checksum for existing filevault profiles, to avoid resending the profile to all hosts.
https://fleetdm.slack.com/archives/C03C41L5YEL/p1753800098554659

@MagnusHJensen MagnusHJensen marked this pull request as draft July 29, 2025 15:06
@MagnusHJensen MagnusHJensen marked this pull request as ready for review July 30, 2025 09:13
Copy link
Copy Markdown
Contributor

@gillespi314 gillespi314 left a comment

Choose a reason for hiding this comment

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

LGTM, suggestions for a handful of small changes then good to go!

gillespi314
gillespi314 previously approved these changes Jul 30, 2025
@MagnusHJensen MagnusHJensen merged commit c7c87fc into main Aug 1, 2025
39 checks passed
@MagnusHJensen MagnusHJensen deleted the 29250-force-filevault-on-login-for-manual-enrollments branch August 1, 2025 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update default disk encryption settings on macOS

3 participants