fix ip whitelist all tenants

KelvinTegelaar · KelvinTegelaar · commit 9b53985b8bb3 · 2025-01-10T11:54:13.000+01:00
diff --git a/Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1 b/Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1
@@ -92,7 +92,7 @@ function Test-CIPPAuditLogRules {
                         $Data.clientip = $Data.clientip -replace ':\d+$', '' # Remove the port number if present
                     }
                     # Check if IP is on trusted IP list
-                    $TrustedIP = Get-CIPPAzDataTableEntity @TrustedIPTable -Filter "PartitionKey eq '$TenantFilter' and RowKey eq '$($Data.clientip)' and state eq 'Trusted'"
+                    $TrustedIP = Get-CIPPAzDataTableEntity @TrustedIPTable -Filter "((PartitionKey eq '$TenantFilter') or (PartitionKey eq 'AllTenants'))  and RowKey eq '$($Data.clientip)'  and state eq 'Trusted'"
                     if ($TrustedIP) {
                         #write-warning "IP $($Data.clientip) is trusted"
                         $Trusted = $true

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ function Test-CIPPAuditLogRules {`
`92`	`92`	`$Data.clientip = $Data.clientip -replace ':\d+$', '' # Remove the port number if present`
`93`	`93`	`}`
`94`	`94`	`# Check if IP is on trusted IP list`
`95`		`- $TrustedIP = Get-CIPPAzDataTableEntity @TrustedIPTable -Filter "PartitionKey eq '$TenantFilter' and RowKey eq '$($Data.clientip)' and state eq 'Trusted'"`
	`95`	`+ $TrustedIP = Get-CIPPAzDataTableEntity @TrustedIPTable -Filter "((PartitionKey eq '$TenantFilter') or (PartitionKey eq 'AllTenants')) and RowKey eq '$($Data.clientip)' and state eq 'Trusted'"`
`96`	`96`	`if ($TrustedIP) {`
`97`	`97`	`#write-warning "IP $($Data.clientip) is trusted"`
`98`	`98`	`$Trusted = $true`