Add exclaimer domain exclusion and change DA to use TenantGUID

kris6673 · Apr 9, 2024 · cf9e895 · cf9e895
1 parent 2b0187d
commit cf9e895
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/DomainAnalyser_All/run.ps1 b/DomainAnalyser_All/run.ps1
@@ -36,6 +36,7 @@ try {
 
 $Result = [PSCustomObject]@{
     Tenant               = $Tenant.Tenant
+    TenantID             = $Tenant.TenantGUID
     GUID                 = $($Domain.Replace('.', ''))
     LastRefresh          = $(Get-Date (Get-Date).ToUniversalTime() -UFormat '+%Y-%m-%dT%H:%M:%S.000Z')
     Domain               = $Domain

diff --git a/DomainAnalyser_GetTenantDomains/run.ps1 b/DomainAnalyser_GetTenantDomains/run.ps1
@@ -9,10 +9,13 @@ $TenantDomains = $Tenants | ForEach-Object -Parallel {
     $Tenant = $_
     # Get Domains to Lookup
     try {
-        $Domains = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/domains' -tenantid $Tenant.defaultDomainName | Where-Object { ($_.id -notlike '*.microsoftonline.com' -and $_.id -NotLike '*.exclaimer.cloud' -and $_.id -NotLike '*.codetwo.online' -and $_.id -NotLike '*.call2teams.com' -and $_.isVerified) }
+        $Domains = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/domains' -tenantid $Tenant.defaultDomainName | Where-Object { ($_.id -notlike '*.microsoftonline.com' -and $_.id -NotLike '*.exclaimer.cloud' -and $_.id -Notlike '*.excl.cloud' -and $_.id -NotLike '*.codetwo.online' -and $_.id -NotLike '*.call2teams.com' -and $_.isVerified) }
+
         foreach ($d in $domains) {
             [PSCustomObject]@{
                 Tenant             = $Tenant.defaultDomainName
+                TenantGUID         = $Tenant.customerId
+                InitialDomainName  = $Tenant.initialDomainName
                 Domain             = $d.id
                 AuthenticationType = $d.authenticationType
                 IsAdminManaged     = $d.isAdminManaged
@@ -57,11 +60,12 @@ if ($TenantCount -gt 0) {
             $Filter = "PartitionKey eq 'TenantDomains' and RowKey eq '{0}'" -f $Tenant.Domain
             $Domain = Get-CIPPAzDataTableEntity @DomainTable -Filter $Filter
 
-            if (!$Domain) {
+            if (!$Domain -or $null -eq $Domain.TenantGUID) {
                 $DomainObject = [pscustomobject]@{
                     DomainAnalyser = ''
                     TenantDetails  = $TenantDetails
                     TenantId       = $Tenant.Tenant
+                    TenantGUID     = $Tenant.TenantGUID
                     DkimSelectors  = ''
                     MailProviders  = ''
                     RowKey         = $Tenant.Domain

diff --git a/Modules/CIPPCore/Public/Get-CIPPDomainAnalyser.ps1 b/Modules/CIPPCore/Public/Get-CIPPDomainAnalyser.ps1
@@ -6,7 +6,7 @@ function Get-CIPPDomainAnalyser {
     # Get all the things
 
     if ($TenantFilter -ne 'AllTenants') {
-        $DomainTable.Filter = "TenantId eq '{0}'" -f $TenantFilter
+        $DomainTable.Filter = "TenantGUID eq '{0}'" -f $TenantFilter
     }
 
     try {