Incorrect MacBook detection logic in os_sleep_and_display_sleep_apple_silicon_enable check script on Apple Silicon

[phaninder-scalefusion]

Summary

The rule os_sleep_and_display_sleep_apple_silicon_enable for macOS benchmark fails due to an incorrect check condition in the script. The current logic does not properly identify Apple Silicon Macs and fails to correctly detect MacBook systems on some Apple Silicon devices.

Steps to reproduce

1. Run the os_sleep_and_display_sleep_apple_silicon_enable check script on an Apple Silicon MacBook.
2. Observe that the condition '/usr/sbin/ioreg -rd1 -c IOPlatformExpertDevice | grep -q "MacBook"' fails even though the device is a MacBook.
3. Check that the rest of the logic executes incorrectly or produces unexpected results due to the failed condition.

Operating System version

macOS Sonoma / macOS Sequoia (any Apple Silicon MacBook)

Intel or Apple Silicon

Apple Silicon

What is the current bug behavior?

The /usr/sbin/ioreg -rd1 -c IOPlatformExpertDevice | grep -q "MacBook" check fails to detect Apple Silicon MacBooks correctly. As a result, the script does not proceed with evaluating sleepMode and displaysleepMode, leading to inaccurate benchmark results.

What is the expected correct behavior?

The script should correctly identify Apple Silicon MacBooks and validate both system type and CPU architecture as per CIS documentation.

Relevant logs and/or screenshots

$ /usr/sbin/ioreg -rd1 -c IOPlatformExpertDevice | grep -q "MacBook"
# Returns non-zero exit code on Apple Silicon MacBook

$ /usr/bin/sudo /usr/sbin/system_profiler SPHardwareDataType | grep -e MacBook
# Correctly detects MacBook on Apple Silicon

$ /usr/bin/sudo /usr/sbin/sysctl -n machdep.cpu.brand_string
# Returns: "Apple M3 Pro" or similar

Output of checks

The script returns 0 (no errors) even though the conditions for sleep and display sleep might not be correctly enforced, due to skipping the main check logic.

Possible fixes

Update the detection logic to align with CIS documentation:

# Replace:
if /usr/sbin/ioreg -rd1 -c IOPlatformExpertDevice 2>&1 | /usr/bin/grep -q "MacBook"; then

# With:
if /usr/bin/sudo /usr/sbin/system_profiler SPHardwareDataType | /usr/bin/grep -q "MacBook"; then

# And add CPU architecture check:
cpuType=$(/usr/bin/sudo /usr/sbin/sysctl -n machdep.cpu.brand_string)
if echo "$cpuType" | grep -q "Apple"; then
  # Apple Silicon logic
fi