diff --git a/docs/Using-Fleet/CIS-Benchmarks.md b/docs/Using-Fleet/CIS-Benchmarks.md index 7353271990..fbd887d719 100644 --- a/docs/Using-Fleet/CIS-Benchmarks.md +++ b/docs/Using-Fleet/CIS-Benchmarks.md @@ -77,6 +77,21 @@ fleetctl apply -f cis-policy-queries.yml The above will add all the automated CIS Benchmark checks as Fleet policies. +### macOS 13.0 Ventura Benchmark manual checks that require customer decision + +- 2.1.1.1 Audit iCloud Keychain (Level 2): Ensure that the iCloud keychain is used consistently with organizational requirements. + The customer will decide whether iCloud keychain should be enabled or disabled and use only the relevant query + 2.1.1.1-enabled OR 2.1.1.1-disabled +- 2.1.1.2 Audit iCloud Drive (Level 2): Ensure that the iCloud Drive is used consistently with organizational requirements. + The customer will decide whether iCloud Drive should be enabled or disabled and use only the relevant query + 2.1.1.2-enabled OR 2.1.1.2-disabled +- 2.5.1 Audit Siri (Level 1): Ensure that the Siri is used consistently with organizational requirements. + The customer will decide whether Siri should be enabled or disabled and use only the relevant query + 2.5.1-enabled OR 2.5.1-disabled +- 2.8.1 Audit Universal Control (Level 1): Ensure that the Universal Control is used consistently with organizational requirements. + The customer will decide whether Universal Control should be enabled or disabled and use only the relevant query + 2.8.1-enabled OR 2.8.1-disabled + ### macOS 13.0 Ventura Benchmark manual checks The following CIS benchmark checks cannot be automated and must be addressed manually (they are flagged as "Manual"): @@ -102,4 +117,4 @@ The following CIS benchmark checks cannot be automated and must be addressed man Please refer to the "CIS Apple macOS 13.0 Ventura Benchmark v1.0.0 - 11-14-2022" PDF for descriptions and instructions on how to remediate. - \ No newline at end of file + diff --git a/ee/cis/macos-13/cis-policy-queries.yml b/ee/cis/macos-13/cis-policy-queries.yml index 18299634ec..461df3e71c 100644 --- a/ee/cis/macos-13/cis-policy-queries.yml +++ b/ee/cis/macos-13/cis-policy-queries.yml @@ -103,6 +103,68 @@ spec: --- apiVersion: v1 kind: policy +spec: + name: CIS - Ensure iCloud Keychain is disabled (if your org policy is to disable it) (MDM Required) + platforms: macOS + platform: darwin + description: | + The iCloud keychain is Apple's password manager that works with macOS and iOS. The capability allows users to store passwords in either iOS or macOS for use in Safari on both platforms and other iOS-integrated applications. The most pervasive use is driven by iOS use rather than macOS. The passwords stored in a macOS keychain on an Enterprise-managed computer could be stored in Apple's cloud and then be available on a personal computer using the same account. The stored passwords could be for organizational as well as for personal accounts. + If passwords are no longer being used as organizational tokens, they are not in scope for iCloud keychain storage. + Rationale: + Ensure that the iCloud keychain is used consistently with organizational requirements. + resolution: | + The administrator should configure this via MDM profile. + Create or edit a configuration profile with the following information: + 1. The PayloadType string is com.apple.applicationaccess. + 2. The key to include is allowCloudKeychainSync. + 3. The key must be set to . + query: | + SELECT 1 WHERE NOT EXISTS ( + SELECT 1 FROM managed_policies WHERE + domain='com.apple.applicationaccess' + AND + name='allowCloudKeychainSync' + AND (value = '1' OR value = 'true') + ); + /*CIS does not make a hard recommendation for this policy. Fleet has provided two policies (one failing, one succeeding). + Depending on your organization's decision, you can delete this policy or its counterpart.*/ + purpose: Informational + tags: compliance, CIS, CIS_Level2, CIS-macos-13-2.1.1.1-disable, decision-needed + contributors: sharon-fdm +--- +apiVersion: v1 +kind: policy +spec: + name: CIS - Ensure iCloud Keychain is enabled (if your org policy is to enable it) (MDM Required) + platforms: macOS + platform: darwin + description: | + The iCloud keychain is Apple's password manager that works with macOS and iOS. The capability allows users to store passwords in either iOS or macOS for use in Safari on both platforms and other iOS-integrated applications. The most pervasive use is driven by iOS use rather than macOS. The passwords stored in a macOS keychain on an Enterprise-managed computer could be stored in Apple's cloud and then be available on a personal computer using the same account. The stored passwords could be for organizational as well as for personal accounts. + If passwords are no longer being used as organizational tokens, they are not in scope for iCloud keychain storage. + Rationale: + Ensure that the iCloud keychain is used consistently with organizational requirements. + resolution: | + The administrator should configure this via MDM profile. + Create or edit a configuration profile with the following information: + 1. The PayloadType string is com.apple.applicationaccess. + 2. The key to include is allowCloudKeychainSync. + 3. The key must be set to . + query: | + SELECT 1 WHERE NOT EXISTS ( + SELECT 1 FROM managed_policies WHERE + domain='com.apple.applicationaccess' + AND + name='allowCloudKeychainSync' + AND (value = '0' OR value = 'false') + ); + /*CIS does not make a hard recommendation for this policy. Fleet has provided two policies (one failing, one succeeding). + Depending on your organization's decision, you can delete this policy or its counterpart.*/ + purpose: Informational + tags: compliance, CIS, CIS_Level2, CIS-macos-13-2.1.1.1-enable, decision-needed + contributors: sharon-fdm +--- +apiVersion: v1 +kind: policy spec: name: CIS - Ensure iCloud Drive Document and Desktop Sync Is Disabled (MDM Required) platforms: macOS diff --git a/ee/cis/macos-13/cis-policy-query-verify-iCloud-Keychain-disabled.yml b/ee/cis/macos-13/cis-policy-query-verify-iCloud-Keychain-disabled.yml new file mode 100644 index 0000000000..8a6868def4 --- /dev/null +++ b/ee/cis/macos-13/cis-policy-query-verify-iCloud-Keychain-disabled.yml @@ -0,0 +1,29 @@ +--- +apiVersion: v1 +kind: policy +spec: + name: CIS - Ensure iCloud Keychain is disabled (if your org policy is to disable it) (MDM Required) + platforms: macOS + platform: darwin + description: | + The iCloud keychain is Apple's password manager that works with macOS and iOS. The capability allows users to store passwords in either iOS or macOS for use in Safari on both platforms and other iOS-integrated applications. The most pervasive use is driven by iOS use rather than macOS. The passwords stored in a macOS keychain on an Enterprise-managed computer could be stored in Apple's cloud and then be available on a personal computer using the same account. The stored passwords could be for organizational as well as for personal accounts. + If passwords are no longer being used as organizational tokens, they are not in scope for iCloud keychain storage. + Rationale: + Ensure that the iCloud keychain is used consistently with organizational requirements. + resolution: | + The administrator should configure this via MDM profile. + Create or edit a configuration profile with the following information: + 1. The PayloadType string is com.apple.applicationaccess. + 2. The key to include is allowCloudKeychainSync. + 3. The key must be set to . + query: | + SELECT 1 WHERE NOT EXISTS ( + SELECT 1 FROM managed_policies WHERE + domain='com.apple.applicationaccess' + AND + name='allowCloudKeychainSync' + AND (value = '1' OR value = 'true') + ); + purpose: Informational + tags: compliance, CIS, CIS_Level2, CIS-macos-13-2.1.1.1-disable + contributors: sharon-fdm diff --git a/ee/cis/macos-13/test/profiles/2.1.1.1-enable.mobileconfig b/ee/cis/macos-13/test/profiles/2.1.1.1-enable.mobileconfig new file mode 100644 index 0000000000..9a8bc0992f --- /dev/null +++ b/ee/cis/macos-13/test/profiles/2.1.1.1-enable.mobileconfig @@ -0,0 +1,37 @@ + + + + + PayloadContent + + + PayloadDisplayName + test + PayloadType + com.apple.applicationaccess + PayloadIdentifier + com.fleetdm.cis-2.1.1.1.check-enable + PayloadUUID + 68D8C498-FB81-4262-9EF4-E689B5A6B40F + allowCloudKeychainSync + + + + PayloadDescription + test + PayloadDisplayName + Ensure iCloud Keychain is enabled + PayloadIdentifier + com.fleetdm.cis-2.1.1.1-enable + PayloadRemovalDisallowed + + PayloadScope + System + PayloadType + Configuration + PayloadUUID + EE1BA83A-E145-4F5B-9597-836DC357BBE7 + PayloadVersion + 1 + +