Merge pull request #473 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

.env.example

@@ -0,0 +1,7 @@
+FUNCTIONS_WORKER_RUNTIME='powershell'
+FUNCTIONS_WORKER_RUNTIME_VERSION='7.4'
+AzureWebJobsStorage='DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNoBnZf6KgBVU4=;BlobEndpoint=http://azurite:10000/devstoreaccount1;QueueEndpoint=http://azurite:10001/devstoreaccount1;TableEndpoint=http://azurite:10002/devstoreaccount1;'
+DEV_SKIP_BPA_TIMER='true'
+DEV_SKIP_DOMAIN_TIMER='true'
+FUNCTIONS_EXTENSION_VERSION='4'
+NonLocalHostAzurite='true'

Dockerfile

@@ -1,7 +1,7 @@
 # To enable ssh & remote debugging on app service change the base image to the one below
 # FROM mcr.microsoft.com/azure-functions/powershell:4-powershell7.2-appservice
-FROM mcr.microsoft.com/azure-functions/powershell:4-powershell7.2
+FROM mcr.microsoft.com/azure-functions/powershell:4-powershell7.4
 ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
     AzureFunctionsJobHost__Logging__Console__IsEnabled=true
 
-COPY . /home/site/wwwroot
+COPY . /home/site/wwwroot

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

@@ -0,0 +1,41 @@
+function Get-CIPPAlertRestrictedUsers {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [Alias('input')]
+        $InputValue,
+        $TenantFilter
+    )
+
+    try {
+        $BlockedUsers = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Get-BlockedSenderAddress'
+
+        if ($BlockedUsers) {
+            $AlertData = foreach ($User in $BlockedUsers) {
+                # Parse the reason to make it more readable
+                $ReasonParts = $User.Reason -split ';'
+                $LimitType = ($ReasonParts | Where-Object { $_ -like 'ExceedingLimitType=*' }) -replace 'ExceedingLimitType=', ''
+                $InternalCount = ($ReasonParts | Where-Object { $_ -like 'InternalRecipientCountToday=*' }) -replace 'InternalRecipientCountToday=', ''
+                $ExternalCount = ($ReasonParts | Where-Object { $_ -like 'ExternalRecipientCountToday=*' }) -replace 'ExternalRecipientCountToday=', ''
+
+                [PSCustomObject]@{
+                    SenderAddress   = $User.SenderAddress
+                    Message         = "User $($User.SenderAddress) is restricted from sending email. Block type: $($LimitType ?? 'Unknown'). Created: $($User.CreatedDatetime)"
+                    BlockType       = if ($LimitType) { "$LimitType recipient limit exceeded" } else { 'Email sending limit exceeded' }
+                    TemporaryBlock  = $User.TemporaryBlock
+                    InternalCount   = $InternalCount
+                    ExternalCount   = $ExternalCount
+                    CreatedDatetime = $User.CreatedDatetime
+                    Reason          = $User.Reason
+                }
+            }
+            Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $AlertData
+        }
+    } catch {
+        Write-AlertMessage -tenant $($TenantFilter) -message "Could not get restricted users for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)"
+    }
+}

Modules/CIPPCore/Public/Authentication/Test-CIPPAccess.ps1

@@ -79,7 +79,7 @@ function Test-CIPPAccess {
         }
         if ($Request.Params.CIPPEndpoint -eq 'me') {
             $Permissions = Get-CippAllowedPermissions -UserRoles $CustomRoles
-            Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            return ([HttpResponseContext]@{
                     StatusCode = [HttpStatusCode]::OK
                     Body       = (
                         @{
@@ -90,7 +90,6 @@ function Test-CIPPAccess {
                             'permissions'     = $Permissions
                         } | ConvertTo-Json -Depth 5)
                 })
-            return
         }
 
     } else {
@@ -107,7 +106,7 @@ function Test-CIPPAccess {
         if ($Request.Params.CIPPEndpoint -eq 'me') {
 
             if (!$User.userRoles) {
-                Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                return ([HttpResponseContext]@{
                         StatusCode = [HttpStatusCode]::OK
                         Body       = (
                             @{
@@ -118,15 +117,14 @@ function Test-CIPPAccess {
             }
 
             $Permissions = Get-CippAllowedPermissions -UserRoles $User.userRoles
-            Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            return ([HttpResponseContext]@{
                     StatusCode = [HttpStatusCode]::OK
                     Body       = (
                         @{
                             'clientPrincipal' = $User
                             'permissions'     = $Permissions
                         } | ConvertTo-Json -Depth 5)
                 })
-            return
         }
 
         if ($User.userRoles -contains 'admin' -or $User.userRoles -contains 'superadmin') {

Modules/CIPPCore/Public/CippQueue/Invoke-ListCippQueue.ps1

@@ -74,7 +74,7 @@ function Invoke-ListCippQueue {
     }
 
     if ($request) {
-        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+        return ([HttpResponseContext]@{
                 StatusCode = [HttpStatusCode]::OK
                 Body       = @($QueueData)
             })

Modules/CIPPCore/Public/CippQueue/Invoke-RemoveCippQueue.ps1

@@ -9,14 +9,14 @@ function Invoke-RemoveCippQueue {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $CippQueue = Get-CippTable -TableName 'CippQueue'
     Clear-AzDataTable @CippQueue
     $CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'
     Clear-AzDataTable @CippQueueTasks
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
             Body       = @{Results = @('History cleared') }
         })

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecAddAlert.ps1

@@ -12,7 +12,7 @@ function Invoke-ExecAddAlert {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $Severity = 'Alert'
 
@@ -70,7 +70,7 @@ function Invoke-ExecAddAlert {
         Write-LogMessage -headers $Headers -API 'Alerts' -message $Request.Body.text -Sev $Severity
         'Successfully generated alert.'
     }
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
             Body       = $Result
         })

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecAzBobbyTables.ps1

@@ -15,7 +15,7 @@ function Invoke-ExecAzBobbyTables {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $AllowList = @(
         'Add-AzDataTableEntity'
@@ -57,7 +57,7 @@ function Invoke-ExecAzBobbyTables {
         $StatusCode = [HttpStatusCode]::NotFound
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = @($Results)
         })

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecCPVRefresh.ps1

@@ -14,11 +14,11 @@ function Invoke-ExecCPVRefresh {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $InstanceId = Start-UpdatePermissionsOrchestrator
 
-    Push-OutputBinding -Name Response -Value @{
+    return @{
         StatusCode = [System.Net.HttpStatusCode]::OK
         Body       = @{
             Results    = 'CPV Refresh has been triggered'

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecCippFunction.ps1

@@ -14,7 +14,7 @@ function Invoke-ExecCippFunction {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
 
     $BlockList = @(
         'Get-GraphToken'
@@ -45,7 +45,7 @@ function Invoke-ExecCippFunction {
         $StatusCode = [HttpStatusCode]::NotFound
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = $Results
         })