Merge pull request #131 from KelvinTegelaar/dev

Dev to release

Author: KelvinTegelaar

AddAlert/run.ps1

@@ -6,13 +6,12 @@ param($Request, $TriggerMetadata)
 $APIName = $TriggerMetadata.FunctionName
 Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
 
-Write-Host "PowerShell HTTP trigger function processed a request."
-
 $Tenants = ($Request.body | Select-Object Select_*).psobject.properties.value
 $Results = foreach ($Tenant in $tenants) {
     try {
         $CompleteObject = [PSCustomObject]@{
             tenant          = $tenant
+            tenantid        = (get-tenants | Where-Object -Property defaultDomainName -EQ $Tenant).Customerid
             AdminPassword   = [bool]$Request.body.AdminPassword
             DefenderMalware = [bool]$Request.body.DefenderMalware
             DefenderStatus  = [bool]$Request.body.DefenderStatus

GetDashboard/run.ps1

@@ -192,10 +192,10 @@ $dash = [PSCustomObject]@{
     NextBPARun        = (Get-CronNextExecutionTime -Expression '0 3 * * *').tostring('s')
     queuedApps        = [int64](Get-ChildItem '.\ChocoApps.Cache' -ErrorAction SilentlyContinue).count
     queuedStandards   = [int64](Get-ChildItem '.\Cache_Standards' -ErrorAction SilentlyContinue).count
-    tenantCount       = (get-tenants).count
+    tenantCount       = [int64](get-tenants -ErrorAction SilentlyContinue).count
     RefreshTokenDate  = (Get-CronNextExecutionTime -Expression '0 0 * * 0').AddDays('-7').tostring('s') -split "T" | Select-Object -First 1
     ExchangeTokenDate = (Get-CronNextExecutionTime -Expression '0 0 * * 0').AddDays('-7').tostring('s') -split "T" | Select-Object -First 1
-    LastLog           = Get-Content "Logs\$((Get-Date).ToString('ddMMyyyy')).log" | ConvertFrom-Csv -Header "DateTime", "Tenant", "API", "Message", "User", "Severity" -Delimiter "|" | Select-Object -Last 10
+    LastLog           = @(Get-Content "Logs\$((Get-Date).ToString('ddMMyyyy')).log" | ConvertFrom-Csv -Header "DateTime", "Tenant", "API", "Message", "User", "Severity" -Delimiter "|" | Select-Object -Last 10)
 }
 # Write to the Azure Functions log stream.
 

Scheduler_Alert/run.ps1

@@ -1,15 +1,13 @@
 param($tenant)
-Write-Host $($Tenant.tenant)
-Write-Host $($Tenant.tag)
 Write-Host $($Tenant | ConvertTo-Json)
-#thoughts: add more delta/tracking to prevent duplicate alerts.
 if ($Tenant.tag -eq "AllTenants") {
     $Alerts = Get-Content ".\Cache_Scheduler\AllTenants.alert.json" | ConvertFrom-Json
 }
 else {
     $Alerts = Get-Content ".\Cache_Scheduler\$($tenant.tenant).alert.json" | ConvertFrom-Json
 }
 $ShippedAlerts = switch ($Alerts) {
+   
     { $Alerts."AdminPassword" -eq $true } {
         New-GraphGETRequest -uri "https://graph.microsoft.com/beta/roleManagement/directory/roleAssignments?`$filter=roleDefinitionId eq '62e90394-69f5-4237-9190-012177145e10'" -tenantid $($tenant.tenant) | ForEach-Object { 
             $LastChanges = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/users/$($_.principalId)?`$select=UserPrincipalName,lastPasswordChangeDateTime" -tenant $($tenant.tenant)
@@ -30,17 +28,17 @@ $ShippedAlerts = switch ($Alerts) {
     { $_."MFAAdmins" -eq $true } {
         $AdminIds = (New-GraphGETRequest -uri "https://graph.microsoft.com/beta/roleManagement/directory/roleAssignments?`$filter=roleDefinitionId eq '62e90394-69f5-4237-9190-012177145e10'&expand=principal" -tenantid $($tenant.tenant)).principal
         $AdminList = Get-CIPPMSolUsers -tenant $tenant.tenant | Where-Object -Property ObjectID -In $AdminIds.id
-        $MFARegistration = (New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/reports/credentialUserRegistrationDetails' -tenantid $tenant.tenant)
+        try { $MFARegistration = (New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/reports/credentialUserRegistrationDetails' -tenantid $tenant.tenant -ErrorAction) } catch {}
         $AdminList | Where-Object { $_.Usertype -eq "Member" -and $_.BlockCredential -eq $false } | ForEach-Object {
-            $CARegistered = ($MFARegistration | Where-Object -Property UserPrincipalName -EQ $_.UserPrincipalName).IsMFARegistered
+            $CARegistered = [boolean]($MFARegistration | Where-Object -Property UserPrincipalName -EQ $_.UserPrincipalName).IsMFARegistered
             if ($_.StrongAuthenticationRequirements.StrongAuthenticationRequirement.state -eq $null -and $CARegistered -eq $false) { "Admin $($_.UserPrincipalName) is enabled but does not have any form of MFA configured." }
         }
     }
     { $_."MFAAlertUsers" -eq $true } {
         $users = Get-CIPPMSolUsers -tenant $tenant.tenant
-        $MFARegistration = (New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/reports/credentialUserRegistrationDetails' -tenantid $tenant.tenant)
+        try { $MFARegistration = (New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/reports/credentialUserRegistrationDetails' -tenantid $tenant.tenant -ErrorAction) } catch {}
         $users | Where-Object { $_.Usertype -eq "Member" -and $_.BlockCredential -eq $false } | ForEach-Object {
-            $CARegistered = ($MFARegistration | Where-Object -Property UserPrincipalName -EQ $_.UserPrincipalName).IsMFARegistered
+            $CARegistered = [boolean]($MFARegistration | Where-Object -Property UserPrincipalName -EQ $_.UserPrincipalName).IsMFARegistered
             if ($_.StrongAuthenticationRequirements.StrongAuthenticationRequirement.state -eq $null -and $CARegistered -eq $false) { "User $($_.UserPrincipalName) is enabled but does not have any form of MFA configured." }
         }
     }
@@ -87,9 +85,13 @@ $ShippedAlerts = switch ($Alerts) {
     }
 }
 $currentlog = Get-Content "Logs\$((Get-Date).ToString('ddMMyyyy')).log" | ConvertFrom-Csv -Header "DateTime", "Tenant", "API", "Message", "User", "Severity" -Delimiter "|" | Where-Object -Property Tenant -EQ $tenant.tenant
+Write-Host $ShippedAlerts
 $ShippedAlerts | ForEach-Object {
     if ($_ -in $currentlog.message) {
         continue
     }
     Log-Request -message $_ -API "Alerts" -tenant $tenant.tenant -sev Alert
 }
+[PSCustomObject]@{
+    ReturnedValues = $true
+}

Scheduler_CIPPNotifications/Config.Json

@@ -11,7 +11,7 @@ else {
   exit 
 }
 
-$Settings = $Config.psobject.properties.name + "Alerts"
+$Settings = if ($Config.psobject.properties.name) { @($Config.psobject.properties.name, "Alerts") } else { @("Alerts") }
 $logdate = (Get-Date).ToString('ddMMyyyy')
 $Currentlog = Get-Content "Logs\$($logdate).log" | ConvertFrom-Csv -Header 'DateTime', 'Tenant', 'API', 'Message', 'User', 'Severity' -Delimiter '|' | Where-Object { [datetime]$_.Datetime -gt (Get-Date).AddMinutes(-16) -and $_.api -in $Settings -and $_.Severity -ne 'debug' }
 if ($Config.email -ne '' -and $null -ne $CurrentLog) {
@@ -72,4 +72,6 @@ if ($Config.webhook -ne '' -and $null -ne $CurrentLog) {
 }
 
 
- 
+[PSCustomObject]@{
+  ReturnedValues = $true
+}

Scheduler_CIPPNotifications/run.ps1

@@ -7,6 +7,7 @@ $object = foreach ($Tenant in $tenants) {
     if ($Typefile.Tenant -ne "AllTenants") {
         [pscustomobject]@{ 
             Tenant   = $Typefile.Tenant
+            Tag      = "SingleTenant"
             TenantID = $TypeFile.tenantId
             Type     = $Typefile.Type
         }

Scheduler_GetQueue/run.ps1

@@ -1 +1 @@
-1.8.0
+1.8.1