Feat: AllTenants stupport for ListTenantAllowBlockList

Author: kris6673

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ListTenantAllowBlockListAllTenants.ps1

@@ -0,0 +1,46 @@
+function Push-ListTenantAllowBlockListAllTenants {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    #>
+    [CmdletBinding()]
+    param($Item)
+
+    $Tenant = Get-Tenants -TenantFilter $Item.customerId
+    $domainName = $Tenant.defaultDomainName
+    $Table = Get-CIPPTable -TableName 'cacheTenantAllowBlockList'
+    $ListTypes = 'Sender', 'Url', 'FileHash', 'IP'
+
+    try {
+        foreach ($ListType in $ListTypes) {
+            $Entries = New-ExoRequest -tenantid $domainName -cmdlet 'Get-TenantAllowBlockListItems' -cmdParams @{ ListType = $ListType }
+            foreach ($Entry in $Entries) {
+                $CleanEntry = $Entry | Select-Object -ExcludeProperty *'@data.type'*, *'(DateTime])'*
+                $CleanEntry | Add-Member -MemberType NoteProperty -Name Tenant -Value $domainName -Force
+                $CleanEntry | Add-Member -MemberType NoteProperty -Name ListType -Value $ListType -Force
+                $Entity = @{
+                    Entry        = [string]($CleanEntry | ConvertTo-Json -Depth 10 -Compress)
+                    RowKey       = [string](New-Guid).Guid
+                    PartitionKey = 'TenantAllowBlockList'
+                    Tenant       = [string]$domainName
+                }
+                Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force | Out-Null
+            }
+        }
+    } catch {
+        $ErrorEntry = [pscustomobject]@{
+            Tenant      = $domainName
+            ListType    = 'Error'
+            Identity    = 'Error'
+            DisplayName = "Could not retrieve tenant allow/block list: $($_.Exception.Message)"
+            Timestamp   = (Get-Date).ToString('s')
+        }
+        $Entity = @{
+            Entry        = [string]($ErrorEntry | ConvertTo-Json -Depth 10 -Compress)
+            RowKey       = [string](New-Guid).Guid
+            PartitionKey = 'TenantAllowBlockList'
+            Tenant       = [string]$domainName
+        }
+        Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force | Out-Null
+    }
+}

Modules/CIPPCore/Public/Entrypoints/Invoke-ListTenantAllowBlockList.ps1

@@ -11,21 +11,74 @@ function Invoke-ListTenantAllowBlockList {
     $TenantFilter = $Request.Query.tenantFilter
     $ListTypes = 'Sender', 'Url', 'FileHash', 'IP'
     try {
-        $Results = $ListTypes | ForEach-Object -Parallel {
-            Import-Module CIPPCore
-            $TempResults = New-ExoRequest -tenantid $using:TenantFilter -cmdlet 'Get-TenantAllowBlockListItems' -cmdParams @{ListType = $_ }
-            $TempResults | Add-Member -MemberType NoteProperty -Name ListType -Value $_
-            $TempResults | Select-Object -ExcludeProperty *'@data.type'*, *'(DateTime])'*
-        } -ThrottleLimit 5
-
+        if ($TenantFilter -ne 'AllTenants') {
+            $Results = $ListTypes | ForEach-Object -Parallel {
+                Import-Module CIPPCore
+                $TempResults = New-ExoRequest -tenantid $using:TenantFilter -cmdlet 'Get-TenantAllowBlockListItems' -cmdParams @{ ListType = $_ }
+                $TempResults | Add-Member -MemberType NoteProperty -Name ListType -Value $_ -Force
+                $TempResults | Add-Member -MemberType NoteProperty -Name Tenant -Value $using:TenantFilter -Force
+                $TempResults | Select-Object -ExcludeProperty *'@data.type'*, *'(DateTime])'*
+            } -ThrottleLimit 5
+            $Metadata = [PSCustomObject]@{}
+        } else {
+            $Table = Get-CIPPTable -TableName 'cacheTenantAllowBlockList'
+            $PartitionKey = 'TenantAllowBlockList'
+            $Filter = "PartitionKey eq '$PartitionKey'"
+            $Rows = Get-CIPPAzDataTableEntity @Table -filter $Filter | Where-Object -Property Timestamp -GT (Get-Date).AddMinutes(-60)
+            $QueueReference = '{0}-{1}' -f $TenantFilter, $PartitionKey
+            $RunningQueue = Invoke-ListCippQueue -Reference $QueueReference | Where-Object { $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
+            if ($RunningQueue) {
+                $Metadata = [PSCustomObject]@{
+                    QueueMessage = 'Still loading data for all tenants. Please check back in a few more minutes'
+                    QueueId      = $RunningQueue.RowKey
+                }
+                $Results = @()
+            } elseif (!$Rows -and !$RunningQueue) {
+                $TenantList = Get-Tenants -IncludeErrors
+                $Queue = New-CippQueueEntry -Name 'Tenant Allow/Block List - All Tenants' -Link '/tenant/administration/allow-block-list?customerId=AllTenants' -Reference $QueueReference -TotalTasks ($TenantList | Measure-Object).Count
+                $Metadata = [PSCustomObject]@{
+                    QueueMessage = 'Loading data for all tenants. Please check back in a few minutes'
+                    QueueId      = $Queue.RowKey
+                }
+                $InputObject = [PSCustomObject]@{
+                    OrchestratorName = 'TenantAllowBlockListOrchestrator'
+                    QueueFunction    = @{
+                        FunctionName = 'GetTenants'
+                        QueueId      = $Queue.RowKey
+                        TenantParams = @{
+                            IncludeErrors = $true
+                        }
+                        DurableName  = 'ListTenantAllowBlockListAllTenants'
+                    }
+                    SkipLog          = $true
+                }
+                Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5 -Compress) | Out-Null
+                $Results = @()
+            } else {
+                $Metadata = [PSCustomObject]@{
+                    QueueId = $RunningQueue.RowKey ?? $null
+                }
+                $Results = foreach ($Row in $Rows) {
+                    $Row.Entry | ConvertFrom-Json
+                }
+            }
+        }
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
         $StatusCode = [HttpStatusCode]::Forbidden
         $Results = $ErrorMessage
     }
+
+    if (!$Body) {
+        $Body = [PSCustomObject]@{
+            Results  = @($Results)
+            Metadata = $Metadata
+        }
+    }
+
     return [HttpResponseContext]@{
         StatusCode = $StatusCode
-        Body       = @($Results)
+        Body       = $Body
     }
 }