Fix: Add required EmailAccountType key to com.apple.mail.managed rules#654
Open
nancysangani wants to merge 1 commit intousnistgov:ios_18from
Open
Fix: Add required EmailAccountType key to com.apple.mail.managed rules#654nancysangani wants to merge 1 commit intousnistgov:ios_18from
nancysangani wants to merge 1 commit intousnistgov:ios_18from
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the iOS rule YAMLs that generate com.apple.mail.managed configuration profiles to include Apple’s required EmailAccountType key, preventing silent deployment failures when profiles are pushed via MDM (per issue #481).
Changes:
- Added
EmailAccountType: EmailTypeIMAPundermobileconfig_info.com.apple.mail.managedfor all affected rules. - Normalized minor YAML formatting in the touched
com.apple.mail.managedblocks (e.g., removing trailing whitespace). - Converted one
fix:field to the block (|) style consistent with other rules in this area.
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| rules/os/os_mail_move_messages_disable.yaml | Adds required EmailAccountType to the com.apple.mail.managed payload. |
| rules/os/os_mail_maildrop_disable.yaml | Adds required EmailAccountType to the com.apple.mail.managed payload. |
| rules/os/os_exchange_SMIME_signing_overwrite_disable.yaml | Adds required EmailAccountType and normalizes the com.apple.mail.managed block formatting. |
| rules/os/os_exchange_SMIME_signing_enabled.yaml | Adds required EmailAccountType and normalizes the com.apple.mail.managed block formatting. |
| rules/os/os_exchange_SMIME_signing_certificate_overwrite_disable.yaml | Adds required EmailAccountType and normalizes the com.apple.mail.managed block formatting. |
| rules/os/os_exchange_SMIME_encryption_per_message_disable.yaml | Adds required EmailAccountType; also adjusts fix: to a block style. |
| rules/os/os_exchange_SMIME_encryption_default_certificate_overwrite_enable.yaml | Adds required EmailAccountType to the com.apple.mail.managed payload. |
| rules/os/os_exchange_SMIME_encryption_certificate_overwrite_disable.yaml | Adds required EmailAccountType and normalizes the com.apple.mail.managed block formatting. |
| rules/os/os_exchange_prevent_move_enforce.yaml | Adds required EmailAccountType and normalizes the com.apple.mail.managed block formatting. |
| rules/os/os_exchange_peraccountVPN.yaml | Adds required EmailAccountType and normalizes the com.apple.mail.managed block formatting. |
| rules/os/os_exchange_mail_recents_sync_disable.yaml | Adds required EmailAccountType to the com.apple.mail.managed payload. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Collaborator
|
Tagging @headmin for review as most of these fall into the BSI Indigo benchmark. |
This file contains hidden or 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
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.
Resolves #481
All 11 rules using the
com.apple.mail.managedpayload domain were missing theEmailAccountTypekey, which Apple's device management spec marks as required. Without it, these profiles silently fail to deploy when pushed from an MDM server.Added
EmailAccountType: EmailTypeIMAPto all affected rules. IMAP is used as the account type since POP3 does not support S/MIME signing, encryption, or folder-level operations enforced by several of these rules.Note: cspell CI failures will be resolved once PR #656 is merged into main, as it adds the required project-specific identifiers to project-words.txt.