Merge pull request #959 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecRestoreBackup.ps1

@@ -14,7 +14,7 @@ function Invoke-ExecRestoreBackup {
     $AzureTableTypes = @(
         [string], [int], [long], [double], [bool], [datetime], [guid], [byte[]]
     )
-    $RestrictedTables = @('AccessRoleGroups', 'CustomRoles') # tables that require superadmin to restore
+    $RestrictedTables = @('AccessRoleGroups', 'AccessIPRanges', 'CustomRoles') # tables that require superadmin to restore
 
     # Resolve the calling user's roles, including Entra group-based roles
     $CallingUser = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($Request.Headers.'x-ms-client-principal')) | ConvertFrom-Json

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ExecCAExclusion.ps1

@@ -37,7 +37,9 @@ function Invoke-ExecCAExclusion {
 
         $VacationGroupName = "Vacation Exclusion - $($Policy.displayName)"
         $escapedGroupName = $VacationGroupName -replace "'", "''"
-        $VacationGroups = @(New-GraphGetRequest -uri "https://graph.microsoft.com/beta/groups?`$select=id,displayName&`$filter=displayName eq '$escapedGroupName' and mailEnabled eq false and securityEnabled eq true" -tenantid $TenantFilter)
+        $groupFilter = "displayName eq '$escapedGroupName' and mailEnabled eq false and securityEnabled eq true"
+        $encodedGroupFilter = [System.Uri]::EscapeDataString($groupFilter)
+        $VacationGroups = @(New-GraphGetRequest -uri "https://graph.microsoft.com/beta/groups?`$select=id,displayName&`$filter=$encodedGroupFilter" -tenantid $TenantFilter)
 
         $DuplicateGroupWarning = $null
         if ($VacationGroups.Count -eq 0) {