Merge pull request #501 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1

@@ -184,6 +184,7 @@ function Add-CIPPScheduledTask {
                 AdditionalProperties = [string]$AdditionalProperties
                 Hidden               = [bool]$Hidden
                 Results              = 'Planned'
+                AlertComment         = [string]$task.AlertComment
             }
             # Always store DesiredStartTime if provided
             if ($DesiredStartTime) {

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertMXRecordChanged.ps1

@@ -0,0 +1,45 @@
+function Get-CIPPAlertMXRecordChanged {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        $TenantFilter,
+        [Alias('input')]
+        $InputValue
+    )
+
+    try {
+        $DomainData = Get-CIPPDomainAnalyser -TenantFilter $TenantFilter
+        $CacheTable = Get-CippTable -tablename 'CacheMxRecords'
+        $PreviousResults = Get-CIPPAzDataTableEntity @CacheTable -Filter "PartitionKey eq '$TenantFilter'"
+
+        $ChangedDomains = foreach ($Domain in $DomainData) {
+            $PreviousDomain = $PreviousResults | Where-Object { $_.Domain -eq $Domain.Domain }
+            if ($PreviousDomain -and $PreviousDomain.ActualMXRecords -ne $Domain.ActualMXRecords) {
+                "$($Domain.Domain): MX records changed from [$($PreviousDomain.ActualMXRecords -join ', ')] to [$($Domain.ActualMXRecords -join ', ')]"
+            }
+        }
+
+        if ($ChangedDomains) {
+            Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $ChangedDomains
+        }
+
+        # Update cache with current data
+        foreach ($Domain in $DomainData) {
+            $CacheEntity = @{
+                PartitionKey    = $TenantFilter
+                RowKey          = $Domain.Domain
+                Domain          = $Domain.Domain
+                ActualMXRecords = $Domain.ActualMXRecords
+                LastRefresh     = $Domain.LastRefresh
+                MailProvider    = $Domain.MailProvider
+            }
+            Add-CIPPAzDataTableEntity @CacheTable -Entity $CacheEntity -Force
+        }
+    } catch {
+        Write-LogMessage -message "Failed to check MX record changes: $($_.Exception.Message)" -API 'MX Record Alert' -tenant $TenantFilter -sev Error
+    }
+}

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Applications/Push-UploadApplication.ps1

@@ -64,7 +64,7 @@ function Push-UploadApplication {
 
         foreach ($tenant in $tenants) {
             try {
-                $ApplicationList = (New-GraphGetRequest -Uri $baseuri -tenantid $tenant) | Where-Object { $_.DisplayName -eq $ChocoApp.Applicationname }
+                $ApplicationList = New-GraphGetRequest -Uri $baseuri -tenantid $tenant | Where-Object { $_.DisplayName -eq $ChocoApp.Applicationname -and ($_.'@odata.type' -eq '#microsoft.graph.win32LobApp' -or $_.'@odata.type' -eq '#microsoft.graph.winGetApp') }
                 if ($ApplicationList.displayname.count -ge 1) {
                     Write-LogMessage -api 'AppUpload' -tenant $tenant -message "$($ChocoApp.Applicationname) exists. Skipping this application" -Sev 'Info'
                     continue

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

@@ -147,6 +147,12 @@ function Push-ExecScheduledCommand {
         $TableDesign = '<style>table.blueTable{border:1px solid #1C6EA4;background-color:#EEE;width:100%;text-align:left;border-collapse:collapse}table.blueTable td,table.blueTable th{border:1px solid #AAA;padding:3px 2px}table.blueTable tbody td{font-size:13px}table.blueTable tr:nth-child(even){background:#D0E4F5}table.blueTable thead{background:#1C6EA4;background:-moz-linear-gradient(top,#5592bb 0,#327cad 66%,#1C6EA4 100%);background:-webkit-linear-gradient(top,#5592bb 0,#327cad 66%,#1C6EA4 100%);background:linear-gradient(to bottom,#5592bb 0,#327cad 66%,#1C6EA4 100%);border-bottom:2px solid #444}table.blueTable thead th{font-size:15px;font-weight:700;color:#FFF;border-left:2px solid #D0E4F5}table.blueTable thead th:first-child{border-left:none}table.blueTable tfoot{font-size:14px;font-weight:700;color:#FFF;background:#D0E4F5;background:-moz-linear-gradient(top,#dcebf7 0,#d4e6f6 66%,#D0E4F5 100%);background:-webkit-linear-gradient(top,#dcebf7 0,#d4e6f6 66%,#D0E4F5 100%);background:linear-gradient(to bottom,#dcebf7 0,#d4e6f6 66%,#D0E4F5 100%);border-top:2px solid #444}table.blueTable tfoot td{font-size:14px}table.blueTable tfoot .links{text-align:right}table.blueTable tfoot .links a{display:inline-block;background:#1C6EA4;color:#FFF;padding:2px 8px;border-radius:5px}</style>'
         $FinalResults = if ($results -is [array] -and $results[0] -is [string]) { $Results | ConvertTo-Html -Fragment -Property @{ l = 'Text'; e = { $_ } } } else { $Results | ConvertTo-Html -Fragment }
         $HTML = $FinalResults -replace '<table>', "This alert is for tenant $Tenant. <br /><br /> $TableDesign<table class=blueTable>" | Out-String
+
+        # Add alert comment if available
+        if ($task.AlertComment) {
+            $HTML += "<div style='background-color: #f8f9fa; border-left: 4px solid #007bff; padding: 15px; margin: 15px 0;'><h4 style='margin-top: 0; color: #007bff;'>Alert Information</h4><p style='margin-bottom: 0;'>$($task.AlertComment)</p></div>"
+        }
+
         $title = "$TaskType - $Tenant - $($task.Name)"
         Write-Information 'Scheduler: Sending the results to the target.'
         Write-Information "The content of results is: $Results"
@@ -155,10 +161,11 @@ function Push-ExecScheduledCommand {
             '*email*' { Send-CIPPAlert -Type 'email' -Title $title -HTMLContent $HTML -TenantFilter $Tenant }
             '*webhook*' {
                 $Webhook = [PSCustomObject]@{
-                    'tenantId' = $TenantInfo.customerId
-                    'Tenant'   = $Tenant
-                    'TaskInfo' = $Item.TaskInfo
-                    'Results'  = $Results
+                    'tenantId'     = $TenantInfo.customerId
+                    'Tenant'       = $Tenant
+                    'TaskInfo'     = $Item.TaskInfo
+                    'Results'      = $Results
+                    'AlertComment' = $task.AlertComment
                 }
                 Send-CIPPAlert -Type 'webhook' -Title $title -TenantFilter $Tenant -JSONContent $($Webhook | ConvertTo-Json -Depth 20)
             }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-AddAlert.ps1

@@ -22,6 +22,7 @@ Function Invoke-AddAlert {
         type            = $Request.Body.logbook.value
         RowKey          = $RowKey
         PartitionKey    = 'Webhookv2'
+        AlertComment    = [string]$Request.Body.AlertComment
     }
     $WebhookTable = Get-CippTable -TableName 'WebhookRules'
     Add-CIPPAzDataTableEntity @WebhookTable -Entity $CompleteObject -Force

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-ListAlertsQueue.ps1

@@ -32,14 +32,15 @@ function Invoke-ListAlertsQueue {
             RowKey          = $Task.RowKey
             PartitionKey    = $Task.PartitionKey
             RepeatsEvery    = 'When received'
+            AlertComment    = $Task.AlertComment
             RawAlert        = @{
                 Conditions   = @($Conditions)
                 Actions      = @($($Task.Actions | ConvertFrom-Json -Depth 10 -ErrorAction SilentlyContinue))
                 Tenants      = @($Tenants)
                 type         = $Task.type
                 RowKey       = $Task.RowKey
                 PartitionKey = $Task.PartitionKey
-
+                AlertComment = $Task.AlertComment
             }
         }
 
@@ -101,6 +102,7 @@ function Invoke-ListAlertsQueue {
             LogType         = 'Scripted'
             EventType       = 'Scheduled Task'
             RepeatsEvery    = $Task.Recurrence
+            AlertComment    = $Task.AlertComment
             RawAlert        = $Task
         }
 

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ExecNamedLocation.ps1

@@ -18,6 +18,7 @@ function Invoke-ExecNamedLocation {
     $NamedLocationId = $Request.Body.namedLocationId ?? $Request.Query.namedLocationId
     $Change = $Request.Body.change ?? $Request.Query.change
     $Content = $Request.Body.input ?? $Request.Query.input
+    if ($content.value) { $content = $content.value }
 
     try {
         $results = Set-CIPPNamedLocation -NamedLocationId $NamedLocationId -TenantFilter $TenantFilter -Change $Change -Content $Content -Headers $Headers

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-AddStandardsTemplate.ps1

@@ -10,7 +10,9 @@ function Invoke-AddStandardsTemplate {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-
+    if ($Request.Body.tenantFilter -eq 'tenantFilter') {
+        throw 'Invalid Tenant Selection. A standard must be assigned to at least 1 tenant.'
+    }
 
     $GUID = $Request.body.GUID ? $request.body.GUID : (New-Guid).GUID
     #updatedBy    = $request.headers.'x-ms-client-principal'

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ExecUpdateDriftDeviation.ps1

@@ -42,11 +42,19 @@ function Invoke-ExecUpdateDriftDeviation {
                     if ($Deviation.status -eq 'DeniedRemediate') {
                         $Setting = $Deviation.standardName -replace 'standards.', ''
                         $StandardTemplate = Get-CIPPTenantAlignment -TenantFilter $TenantFilter | Where-Object -Property standardType -EQ 'drift'
-                        $StandardTemplate = $StandardTemplate.standardSettings.$Setting
-
-                        $StandardTemplate.standards.$Setting | Add-Member -MemberType NoteProperty -Name 'remediate' -Value $true -Force
-                        $StandardTemplate.standards.$Setting | Add-Member -MemberType NoteProperty -Name 'report' -Value $true -Force
-
+                        if ($Setting -like '*IntuneTemplate*') {
+                            $Setting = 'IntuneTemplate'
+                            $TemplateId = $Deviation.standardName.split('.') | Select-Object -Last 1
+                            $StandardTemplate = $StandardTemplate.standardSettings.IntuneTemplate | Where-Object { $_.TemplateList.value -eq $TemplateId }
+                            $StandardTemplate | Add-Member -MemberType NoteProperty -Name 'remediate' -Value $true -Force
+                            $StandardTemplate | Add-Member -MemberType NoteProperty -Name 'report' -Value $true -Force
+                            $Settings = $StandardTemplate
+                        } else {
+                            $StandardTemplate = $StandardTemplate.standardSettings.$Setting
+                            $StandardTemplate.standards.$Setting | Add-Member -MemberType NoteProperty -Name 'remediate' -Value $true -Force
+                            $StandardTemplate.standards.$Setting | Add-Member -MemberType NoteProperty -Name 'report' -Value $true -Force
+                            $Settings = $StandardTemplate.standards.$Setting
+                        }
                         $TaskBody = @{
                             TenantFilter  = $TenantFilter
                             Name          = "One Off Drift Remediation: $Setting - $TenantFilter"
@@ -57,7 +65,7 @@ function Invoke-ExecUpdateDriftDeviation {
 
                             Parameters    = [pscustomobject]@{
                                 Tenant   = $TenantFilter
-                                Settings = $StandardTemplate.standards.$Setting
+                                Settings = $Settings
                             }
                             ScheduledTime = '0'
                             PostExecution = @{

Modules/CIPPCore/Public/GraphHelper/Write-AlertTrace.ps1

@@ -7,7 +7,8 @@ function Write-AlertTrace {
         $cmdletName,
         $data,
         $tenantFilter,
-        [string]$PartitionKey = (Get-Date -UFormat '%Y%m%d').ToString()
+        [string]$PartitionKey = (Get-Date -UFormat '%Y%m%d').ToString(),
+        [string]$AlertComment = $null
     )
     $Table = Get-CIPPTable -tablename AlertLastRun
     #Get current row and compare the $logData object. If it's the same, don't write it.
@@ -23,6 +24,7 @@ function Write-AlertTrace {
                 'CmdletName'   = "$cmdletName"
                 'Tenant'       = "$tenantFilter"
                 'LogData'      = [string]$LogData
+                'AlertComment' = [string]$AlertComment
             }
             $Table.Entity = $TableRow
             Add-CIPPAzDataTableEntity @Table -Force | Out-Null
@@ -36,6 +38,7 @@ function Write-AlertTrace {
             'CmdletName'   = "$cmdletName"
             'Tenant'       = "$tenantFilter"
             'LogData'      = [string]$LogData
+            'AlertComment' = [string]$AlertComment
         }
         $Table.Entity = $TableRow
         Add-CIPPAzDataTableEntity @Table -Force | Out-Null