Merge pull request #33 from KelvinTegelaar/master

[pull] master from KelvinTegelaar:master
advania · May 25, 2024 · fe260b3 · fe260b3
2 parents 8a3aa50 + 494ca06
commit fe260b3
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 18 deletions.
diff --git a/DomainAnalyser_OrchestrationStarter/run.ps1 b/DomainAnalyser_OrchestrationStarter/run.ps1
@@ -16,7 +16,6 @@ $InputObject = [PSCustomObject]@{
     }
     OrchestratorName = 'DomainAnalyser_Tenants'
     SkipLog          = $true
-    DurableMode      = 'Sequence'
 }
 Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Compress -Depth 5)
 

diff --git a/...PPCore/Public/Entrypoints/Activity Triggers/Domain Analyser/Push-DomainAnalyserDomain.ps1 b/...PPCore/Public/Entrypoints/Activity Triggers/Domain Analyser/Push-DomainAnalyserDomain.ps1
@@ -122,8 +122,8 @@ function Push-DomainAnalyserDomain {
         }
     } catch {
         $Message = 'SPF Error'
-        Write-LogMessage -API 'DomainAnalyser' -tenant $tenant.tenant -message $Message -LogData (Get-CippException -Exception $_) -sev Error
-        throw $Message
+        Write-LogMessage -API 'DomainAnalyser' -tenant $DomainObject.TenantId -message $Message -LogData (Get-CippException -Exception $_) -sev Error
+        return $Message
     }
 
     # Check SPF Record
@@ -185,8 +185,8 @@ function Push-DomainAnalyserDomain {
         }
     } catch {
         $Message = 'DMARC Error'
-        Write-LogMessage -API 'DomainAnalyser' -tenant $tenant.tenant -message $Message -LogData (Get-CippException -Exception $_) -sev Error
-        throw $Message
+        Write-LogMessage -API 'DomainAnalyser' -tenant $DomainObject.TenantId -message $Message -LogData (Get-CippException -Exception $_) -sev Error
+        return $Message
     }
 
     # DNS Sec Check
@@ -203,8 +203,8 @@ function Push-DomainAnalyserDomain {
         }
     } catch {
         $Message = 'DNSSEC Error'
-        Write-LogMessage -API 'DomainAnalyser' -tenant $tenant.tenant -message $Message -LogData (Get-CippException -Exception $_) -sev Error
-        throw $Message
+        Write-LogMessage -API 'DomainAnalyser' -tenant $DomainObject.TenantId -message $Message -LogData (Get-CippException -Exception $_) -sev Error
+        return $Message
     }
 
     # DKIM Check
@@ -232,8 +232,8 @@ function Push-DomainAnalyserDomain {
         }
     } catch {
         $Message = 'DKIM Exception'
-        Write-LogMessage -API 'DomainAnalyser' -tenant $tenant.tenant -message $Message -LogData (Get-CippException -Exception $_) -sev Error
-        throw $Message
+        Write-LogMessage -API 'DomainAnalyser' -tenant $DomainObject.TenantId -message $Message -LogData (Get-CippException -Exception $_) -sev Error
+        return $Message
     }
     # Final Score
     $Result.Score = $ScoreDomain
@@ -248,9 +248,9 @@ function Push-DomainAnalyserDomain {
         Add-CIPPAzDataTableEntity @DomainTable -Entity $DomainObject -Force
 
         # Final Write to Output
-        Write-LogMessage -API 'DomainAnalyser' -tenant $tenant.tenant -message "DNS Analyser Finished For $Domain" -sev Info
+        Write-LogMessage -API 'DomainAnalyser' -tenant $DomainObject.TenantId -message "DNS Analyser Finished For $Domain" -sev Info
     } catch {
-        Write-LogMessage -API -API 'DomainAnalyser' -tenant $tenant.tenant -message "Error saving domain $Domain to table " -sev Error -LogData (Get-CippException -Exception $_)
+        Write-LogMessage -API -API 'DomainAnalyser' -tenant $DomainObject.TenantId -message "Error saving domain $Domain to table " -sev Error -LogData (Get-CippException -Exception $_)
     }
     return $null
 }
diff --git a/...PPCore/Public/Entrypoints/Activity Triggers/Domain Analyser/Push-DomainAnalyserTenant.ps1 b/...PPCore/Public/Entrypoints/Activity Triggers/Domain Analyser/Push-DomainAnalyserTenant.ps1
@@ -41,8 +41,9 @@ function Push-DomainAnalyserTenant {
             $DomainCount = ($TenantDomains | Measure-Object).Count
             if ($DomainCount -gt 0) {
                 Write-Host "$DomainCount tenant Domains"
+                $TenantDomainObjects = [System.Collections.Generic.List[object]]::new()
                 try {
-                    $TenantDomainObjects = foreach ($TenantDomain in $TenantDomains) {
+                    foreach ($TenantDomain in $TenantDomains) {
                         $TenantDetails = ($TenantDomain | ConvertTo-Json -Compress).ToString()
                         $Filter = "PartitionKey eq '{0}' and RowKey eq '{1}'" -f $TenantDomain.Tenant, $TenantDomain.Domain
                         $OldDomain = Get-CIPPAzDataTableEntity @DomainTable -Filter $Filter
@@ -78,19 +79,23 @@ function Push-DomainAnalyserTenant {
                             }
                         }
                         # Return domain object to list
-                        $Domain
+                        $TenantDomainObjects.Add($Domain)
                     }
 
                     # Batch insert tenant domains
                     try {
                         Add-CIPPAzDataTableEntity @DomainTable -Entity $TenantDomainObjects -Force
                         $InputObject = [PSCustomObject]@{
-                            Batch            = $TenantDomainObjects | Select-Object RowKey, @{n = 'FunctionName'; exp = { 'DomainAnalyserDomain' } }
+                            QueueFunction    = @{
+                                FunctionName = 'GetTenantDomains'
+                                TenantGUID   = $Tenant.customerId
+                            }
                             OrchestratorName = "DomainAnalyser_$($Tenant.defaultDomainName)"
                             SkipLog          = $true
-                            DurableMode      = 'Sequence'
                         }
                         Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Compress -Depth 5)
+                        Write-Host "Started analysis for $DomainCount tenant domains in $($Tenant.defaultDomainName)"
+                        Write-LogMessage -API 'DomainAnalyser' -tenant $Tenant.defaultDomainName -message "Started analysis for $DomainCount tenant domains" -sev Info
                     } catch {
                         Write-LogMessage -API 'DomainAnalyser' -message 'Domain Analyser GetTenantDomains error' -sev info -LogData (Get-CippException -Exception $_)
                     }
@@ -99,7 +104,7 @@ function Push-DomainAnalyserTenant {
                 }
             }
         } catch {
-            Write-Host (Get-CippException -Exception $_ | ConvertTo-Json)
+            #Write-Host (Get-CippException -Exception $_ | ConvertTo-Json)
             Write-LogMessage -API 'DomainAnalyser' -tenant $tenant.defaultDomainName -message 'DNS Analyser GraphGetRequest' -LogData (Get-CippException -Exception $_) -sev Error
         }
     }

diff --git a/...s/CIPPCore/Public/Entrypoints/Activity Triggers/Domain Analyser/Push-GetTenantDomains.ps1 b/...s/CIPPCore/Public/Entrypoints/Activity Triggers/Domain Analyser/Push-GetTenantDomains.ps1
@@ -0,0 +1,7 @@
+function Push-GetTenantDomains {
+    Param($Item)
+    $DomainTable = Get-CippTable -tablename 'Domains'
+    $Filter = "PartitionKey eq 'TenantDomains' and TenantGUID eq '{0}'" -f $Item.TenantGUID
+    $Domains = Get-CIPPAzDataTableEntity @DomainTable -Filter $Filter -Property RowKey | Select-Object RowKey, @{n = 'FunctionName'; exp = { 'DomainAnalyserDomain' } }
+    return @($Domains)
+}
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1
@@ -107,5 +107,7 @@ function Push-ExecScheduledCommand {
             ScheduledTime = "$nextRunUnixTime"
         }
     }
-    Write-LogMessage -API 'Scheduler_UserTasks' -tenant $tenant -message "Successfully executed task: $($task.Name)" -sev Info
+    if ($TaskType -ne 'Alert') {
+        Write-LogMessage -API 'Scheduler_UserTasks' -tenant $tenant -message "Successfully executed task: $($task.Name)" -sev Info
+    }
 }
diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-5.7.2
+5.7.3