fix: cis test 1_3_5

use correct forms settings

Author: JohnDuprey

Modules/CIPPDB/Public/DBCache/Set-CIPPDBCacheSettings.ps1

@@ -19,20 +19,66 @@ function Set-CIPPDBCacheSettings {
     try {
         Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching directory settings' -sev Debug
 
-        $Settings = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/settings?$top=999' -tenantid $TenantFilter
+        $BulkRequests = @(
+            [PSCustomObject]@{
+                id     = 'settings'
+                method = 'GET'
+                url    = '/settings?$top=999'
+            }
+            [PSCustomObject]@{
+                id     = 'appsAndServices'
+                method = 'GET'
+                url    = '/admin/appsAndServices'
+            }
+            [PSCustomObject]@{
+                id     = 'formsSettings'
+                method = 'GET'
+                url    = '/admin/forms/settings'
+            }
+        )
+
+        $BulkResults = New-GraphBulkRequest -Requests $BulkRequests -tenantid $TenantFilter
+
+        $SettingsResponse = $BulkResults | Where-Object { $_.id -eq 'settings' } | Select-Object -First 1
+        $Settings = @()
+        if ($SettingsResponse -and $SettingsResponse.status -eq 200) {
+            $Settings = @($SettingsResponse.body.value)
+        } else {
+            Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Settings request failed in bulk response (status: $($SettingsResponse.status))" -sev Warning
+        }
         if (!$Settings) { $Settings = @() }
         Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Settings' -Data $Settings -AddCount
         $Settings = $null
 
         Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching apps and services settings' -sev Debug
-        $AppsAndServices = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/admin/appsAndServices' -tenantid $TenantFilter
-        if ($AppsAndServices -and $AppsAndServices.PSObject.Properties.Name -contains 'settings') {
-            $AppsAndServices = $AppsAndServices.settings
+        $AppsAndServicesResponse = $BulkResults | Where-Object { $_.id -eq 'appsAndServices' } | Select-Object -First 1
+        $AppsAndServices = @()
+        if ($AppsAndServicesResponse -and $AppsAndServicesResponse.status -eq 200) {
+            $AppsAndServices = $AppsAndServicesResponse.body
+            if ($AppsAndServices -and $AppsAndServices.PSObject.Properties.Name -contains 'settings') {
+                $AppsAndServices = $AppsAndServices.settings
+            }
+        } else {
+            Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "AppsAndServices request failed in bulk response (status: $($AppsAndServicesResponse.status))" -sev Warning
         }
         if (!$AppsAndServices) { $AppsAndServices = @() }
         Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'AppsAndServices' -Data $AppsAndServices -AddCount
         $AppsAndServices = $null
 
+        Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching Forms settings' -sev Debug
+        $FormsSettingsResponse = $BulkResults | Where-Object { $_.id -eq 'formsSettings' } | Select-Object -First 1
+        $FormsSettings = @()
+        if ($FormsSettingsResponse -and $FormsSettingsResponse.status -eq 200) {
+            $FormsSettings = $FormsSettingsResponse.body
+        } else {
+            Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "FormsSettings request failed in bulk response (status: $($FormsSettingsResponse.status))" -sev Warning
+        }
+        if (!$FormsSettings) { $FormsSettings = @() }
+        Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'FormsSettings' -Data $FormsSettings -AddCount
+        $FormsSettings = $null
+
+        $BulkResults = $null
+
         Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Cached directory settings successfully' -sev Debug
 
     } catch {

Modules/CIPPTests/Public/Tests/CIS/Identity/Invoke-CippTestCIS_1_3_5.ps1

@@ -6,17 +6,15 @@ function Invoke-CippTestCIS_1_3_5 {
     param($Tenant)
 
     try {
-        $Settings = Get-CIPPTestData -TenantFilter $Tenant -Type 'Settings'
+        $Forms = Get-CIPPTestData -TenantFilter $Tenant -Type 'FormsSettings'
 
-        if (-not $Settings) {
-            Add-CippTestResult -TenantFilter $Tenant -TestId 'CIS_1_3_5' -TestType 'Identity' -Status 'Skipped' -ResultMarkdown 'Settings cache not found. Please refresh the cache for this tenant.' -Risk 'Medium' -Name 'Internal phishing protection for Forms is enabled' -UserImpact 'Low' -ImplementationEffort 'Low' -Category 'Phishing Protection'
-            return
+        if (-not $Forms) {
+            $Settings = Get-CIPPTestData -TenantFilter $Tenant -Type 'Settings'
+            $Forms = $Settings | Where-Object { $_.PSObject.Properties.Name -contains 'isInOrgFormsPhishingScanEnabled' } | Select-Object -First 1
         }
 
-        $Forms = $Settings | Where-Object { $_.PSObject.Properties.Name -contains 'isInOrgFormsPhishingScanEnabled' } | Select-Object -First 1
-
         if (-not $Forms) {
-            Add-CippTestResult -TenantFilter $Tenant -TestId 'CIS_1_3_5' -TestType 'Identity' -Status 'Skipped' -ResultMarkdown 'Forms phishing scan setting not in cache.' -Risk 'Medium' -Name 'Internal phishing protection for Forms is enabled' -UserImpact 'Low' -ImplementationEffort 'Low' -Category 'Phishing Protection'
+            Add-CippTestResult -TenantFilter $Tenant -TestId 'CIS_1_3_5' -TestType 'Identity' -Status 'Skipped' -ResultMarkdown 'Forms phishing scan setting not in cache. Please refresh FormsSettings cache for this tenant.' -Risk 'Medium' -Name 'Internal phishing protection for Forms is enabled' -UserImpact 'Low' -ImplementationEffort 'Low' -Category 'Phishing Protection'
             return
         }