Merge pull request #121 from KelvinTegelaar/dev

pull[bot] · web-flow · commit f85fa2530f62 · 2025-03-07T18:41:05.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/.github/workflows/upload_dev.yml b/.github/workflows/upload_dev.yml
@@ -0,0 +1,36 @@
+name: Upload Dev zip
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  release:
+    if: github.event.repository.fork == false && github.event_name == 'push'
+    name: Upload to Azure
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout the repository
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      # Create ZIP File in a New Source Directory
+      - name: Prepare and Zip Release Files
+        run: |
+          mkdir -p src/releases
+          zip -r src/releases/dev.zip . \
+            --exclude "./src/releases/*" \
+            --exclude ".*" \
+            --exclude ".*/**"
+
+      # Upload to Azure Blob Storage
+      - name: Azure Blob Upload with Destination folder defined
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.3.0
+        with:
+          connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
+          container_name: cipp-api
+          source_folder: src/releases/
+          destination_folder: /
+          delete_if_exists: true
diff --git a/Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1 b/Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1
@@ -64,12 +64,15 @@ function Add-CIPPScheduledTask {
     if ([int64]$task.ScheduledTime -eq 0 -or [string]::IsNullOrEmpty($task.ScheduledTime)) {
         $task.ScheduledTime = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds
     }
-
+    $excludedTenants = if ($task.excludedTenants.value) {
+        $task.excludedTenants.value -join ','
+    }
     $entity = @{
         PartitionKey         = [string]'ScheduledTask'
         TaskState            = [string]'Planned'
         RowKey               = [string]$RowKey
         Tenant               = $task.TenantFilter.value ? "$($task.TenantFilter.value)" : "$($task.TenantFilter)"
+        excludedTenants      = [string]$excludedTenants
         Name                 = [string]$task.Name
         Command              = [string]$task.Command.value
         Parameters           = [string]$Parameters
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-AddScheduledItem.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-AddScheduledItem.ps1
@@ -14,7 +14,7 @@ Function Invoke-AddScheduledItem {
     } else {
         $hidden = $true
     }
-    $Result = Add-CIPPScheduledTask -Task $Request.body -Headers $Request.Headers -hidden $hidden -DisallowDuplicateName $Request.query.DisallowDuplicateName
+    $Result = Add-CIPPScheduledTask -Task $Request.body -Headers $Request.Headers -hidden $hidden -DisallowDuplicateName $Request.query.DisallowDuplicateName 
     Write-LogMessage -headers $Request.Headers -API $APINAME -message $Result -Sev 'Info'
 
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-AddAlert.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-AddAlert.ps1
@@ -14,15 +14,17 @@ Function Invoke-AddAlert {
     $Tenants = $request.body.tenantFilter
     $Conditions = $request.body.conditions | ConvertTo-Json -Compress -Depth 10 | Out-String
     $TenantsJson = $Tenants | ConvertTo-Json -Compress -Depth 10 | Out-String
+    $excludedTenantsJson = $request.body.excludedTenants | ConvertTo-Json -Compress -Depth 10 | Out-String
     $Actions = $request.body.actions | ConvertTo-Json -Compress -Depth 10 | Out-String
     $RowKey = $Request.body.RowKey ? $Request.body.RowKey : (New-Guid).ToString()
     $CompleteObject = @{
-        Tenants      = [string]$TenantsJson
-        Conditions   = [string]$Conditions
-        Actions      = [string]$Actions
-        type         = $request.body.logbook.value
-        RowKey       = $RowKey
-        PartitionKey = 'Webhookv2'
+        Tenants         = [string]$TenantsJson
+        excludedTenants = [string]$excludedTenantsJson
+        Conditions      = [string]$Conditions
+        Actions         = [string]$Actions
+        type            = $request.body.logbook.value
+        RowKey          = $RowKey
+        PartitionKey    = 'Webhookv2'
     }
     $WebhookTable = get-cipptable -TableName 'WebhookRules'
     Add-CIPPAzDataTableEntity @WebhookTable -Entity $CompleteObject -Force
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-ListAlertsQueue.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-ListAlertsQueue.ps1
@@ -31,15 +31,16 @@ Function Invoke-ListAlertsQueue {
         $TranslatedActions = ($Task.Actions | ConvertFrom-Json -Depth 10 -ErrorAction SilentlyContinue).label -join ','
         $Tenants = ($Task.Tenants | ConvertFrom-Json -Depth 10 -ErrorAction SilentlyContinue)
         $TaskEntry = [PSCustomObject]@{
-            Tenants      = @($Tenants.label)
-            Conditions   = $TranslatedConditions
-            Actions      = $TranslatedActions
-            LogType      = $Task.type
-            EventType    = 'Audit log Alert'
-            RowKey       = $Task.RowKey
-            PartitionKey = $Task.PartitionKey
-            RepeatsEvery = 'When received'
-            RawAlert     = @{
+            Tenants         = @($Tenants.label)
+            Conditions      = $TranslatedConditions
+            excludedTenants = ($Task.excludedTenants | ConvertFrom-Json -Depth 10 -ErrorAction SilentlyContinue)
+            Actions         = $TranslatedActions
+            LogType         = $Task.type
+            EventType       = 'Audit log Alert'
+            RowKey          = $Task.RowKey
+            PartitionKey    = $Task.PartitionKey
+            RepeatsEvery    = 'When received'
+            RawAlert        = @{
                 Conditions   = @($Conditions)
                 Actions      = @($($Task.Actions | ConvertFrom-Json -Depth 10 -ErrorAction SilentlyContinue))
                 Tenants      = @($Tenants)
@@ -64,15 +65,16 @@ Function Invoke-ListAlertsQueue {
 
     foreach ($Task in $ScheduledTasks) {
         $TaskEntry = [PSCustomObject]@{
-            RowKey       = $Task.RowKey
-            PartitionKey = $Task.PartitionKey
-            Tenants      = @($Task.Tenant)
-            Conditions   = $Task.Name
-            Actions      = $Task.PostExecution
-            LogType      = 'Scripted'
-            EventType    = 'Scheduled Task'
-            RepeatsEvery = $Task.Recurrence
-            RawAlert     = $Task
+            RowKey          = $Task.RowKey
+            PartitionKey    = $Task.PartitionKey
+            excludedTenants = $Task.excludedTenants
+            Tenants         = @($Task.Tenant)
+            Conditions      = $Task.Name
+            Actions         = $Task.PostExecution
+            LogType         = 'Scripted'
+            EventType       = 'Scheduled Task'
+            RepeatsEvery    = $Task.Recurrence
+            RawAlert        = $Task
         }
         if ($AllowedTenants -notcontains 'AllTenants') {
             $Tenant = $TenantList | Where-Object -Property defaultDomainName -EQ $Task.Tenant
diff --git a/Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-UserTasksOrchestrator.ps1 b/Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-UserTasksOrchestrator.ps1
@@ -35,7 +35,9 @@ function Start-UserTasksOrchestrator {
                 }
 
                 if ($task.Tenant -eq 'AllTenants') {
-                    $AllTenantCommands = foreach ($Tenant in $TenantList) {
+                    $ExcludedTenants = $task.excludedTenants -split ','
+                    Write-Host "Excluded Tenants from this task: $ExcludedTenants"
+                    $AllTenantCommands = foreach ($Tenant in $TenantList | Where-Object { $_.defaultDomainName -notin $ExcludedTenants }) {
                         $NewParams = $task.Parameters.Clone()
                         if ((Get-Command $task.Command).Parameters.TenantFilter) {
                             $NewParams.TenantFilter = $Tenant.defaultDomainName
diff --git a/Modules/CIPPCore/Public/Set-CIPPIntunePolicy.ps1 b/Modules/CIPPCore/Public/Set-CIPPIntunePolicy.ps1
@@ -17,7 +17,8 @@ function Set-CIPPIntunePolicy {
     $ReplaceMap = Get-CIPPAzDataTableEntity @ReplaceTable -Filter "PartitionKey eq '$tenantFilter'"
     if ($ReplaceMap) {
         foreach ($Replace in $ReplaceMap) {
-            $RawJSON = $RawJSON -replace $Replace.RowKey, $Replace.Value
+            $String = '%{0}%' -f $Replace.RowKey
+            $RawJSON = $RawJSON -replace $String, $Replace.Value
         }
     }
     #default replacements for all tenants: %tenantid% becomes $tenant.customerId, %tenantfilter% becomes $tenant.defaultDomainName, %tenantname% becomes $tenant.displayName
diff --git a/Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1 b/Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1
@@ -34,6 +34,7 @@ function Test-CIPPAuditLogRules {
     $Configuration = $ConfigEntries | Where-Object { ($_.Tenants -match $TenantFilter -or $_.Tenants -match 'AllTenants') } | ForEach-Object {
         [pscustomobject]@{
             Tenants    = ($_.Tenants | ConvertFrom-Json)
+            Excluded   = ($_.excludedTenants | ConvertFrom-Json -ErrorAction SilentlyContinue)
             Conditions = $_.Conditions
             Actions    = $_.Actions
             LogType    = $_.Type
@@ -180,6 +181,9 @@ function Test-CIPPAuditLogRules {
         #write-warning "Creating filters - $(($ProcessedData.operation | Sort-Object -Unique) -join ',') - $($TenantFilter)"
 
         $Where = $Configuration | ForEach-Object {
+            if ($TenantFilter -In $_.Excluded.value) {
+                return
+            }
             $conditions = $_.Conditions | ConvertFrom-Json | Where-Object { $_.Input.value -ne '' }
             $actions = $_.Actions
             $conditionStrings = [System.Collections.Generic.List[string]]::new()
diff --git a/Modules/CippExtensions/Public/Sherweb/Set-SherwebSubscription.ps1 b/Modules/CippExtensions/Public/Sherweb/Set-SherwebSubscription.ps1
@@ -35,6 +35,9 @@ function Set-SherwebSubscription {
         }
         $OrderUri = "https://api.sherweb.com/service-provider/v1/orders?customerId=$CustomerId"
         $Order = Invoke-RestMethod -Uri $OrderUri -Method POST -Headers $AuthHeader -Body $OrderBody -ContentType 'application/json'
+        if ($Order -match 'Internal Server Error' -and $Add -gt 0) {
+            throw 'An error occurred while attempting to create a new subscription. Please check the Cumulus portal to ensure this customer has been provisioned for Microsoft 365.'
+        }
         return $Order
 
     } else {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ Function Invoke-AddScheduledItem {`
`14`	`14`	`} else {`
`15`	`15`	`$hidden = $true`
`16`	`16`	`}`
`17`		`- $Result = Add-CIPPScheduledTask -Task $Request.body -Headers $Request.Headers -hidden $hidden -DisallowDuplicateName $Request.query.DisallowDuplicateName`
	`17`	`+ $Result = Add-CIPPScheduledTask -Task $Request.body -Headers $Request.Headers -hidden $hidden -DisallowDuplicateName $Request.query.DisallowDuplicateName`
`18`	`18`	`Write-LogMessage -headers $Request.Headers -API $APINAME -message $Result -Sev 'Info'`
`19`	`19`
`20`	`20`	`Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ function Set-CIPPIntunePolicy {`
`17`	`17`	`$ReplaceMap = Get-CIPPAzDataTableEntity @ReplaceTable -Filter "PartitionKey eq '$tenantFilter'"`
`18`	`18`	`if ($ReplaceMap) {`
`19`	`19`	`foreach ($Replace in $ReplaceMap) {`
`20`		`- $RawJSON = $RawJSON -replace $Replace.RowKey, $Replace.Value`
	`20`	`+ $String = '%{0}%' -f $Replace.RowKey`
	`21`	`+ $RawJSON = $RawJSON -replace $String, $Replace.Value`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`#default replacements for all tenants: %tenantid% becomes $tenant.customerId, %tenantfilter% becomes $tenant.defaultDomainName, %tenantname% becomes $tenant.displayName`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ function Set-SherwebSubscription {`
`35`	`35`	`}`
`36`	`36`	`$OrderUri = "https://api.sherweb.com/service-provider/v1/orders?customerId=$CustomerId"`
`37`	`37`	`$Order = Invoke-RestMethod -Uri $OrderUri -Method POST -Headers $AuthHeader -Body $OrderBody -ContentType 'application/json'`
	`38`	`+ if ($Order -match 'Internal Server Error' -and $Add -gt 0) {`
	`39`	`+ throw 'An error occurred while attempting to create a new subscription. Please check the Cumulus portal to ensure this customer has been provisioned for Microsoft 365.'`
	`40`	`+ }`
`38`	`41`	`return $Order`
`39`	`42`
`40`	`43`	`} else {`