Merge branch 'KelvinTegelaar:master' into master

.github/workflows/dev_cippckdtz.yml

@@ -0,0 +1,30 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cippckdtz
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: windows-latest
+
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cippckdtz'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_2101C7175BFB47E58240ABD1E72E81C2 }}

BestPracticeAnalyser_Orchestration/run.ps1

@@ -2,7 +2,7 @@ param($Context)
 
 $DurableRetryOptions = @{
     FirstRetryInterval  = (New-TimeSpan -Seconds 5)
-    MaxNumberOfAttempts = 3
+    MaxNumberOfAttempts = 1
     BackoffCoefficient  = 2
 }
 $RetryOptions = New-DurableRetryOptions @DurableRetryOptions

CIPPActivityFunction/function.json

@@ -0,0 +1,16 @@
+{
+  "scriptFile": "../Modules/CippEntryPoints/CippEntryPoints.psm1",
+  "entryPoint": "Receive-CippActivityTrigger",
+  "bindings": [
+    {
+      "name": "Item",
+      "type": "activityTrigger",
+      "direction": "in"
+    },
+    {
+      "name": "starter",
+      "type": "durableClient",
+      "direction": "in"
+    }
+  ]
+}

CIPPOrchestrator/function.json

@@ -0,0 +1,11 @@
+{
+  "scriptFile": "../Modules/CippEntryPoints/CippEntryPoints.psm1",
+  "entryPoint": "Receive-CippOrchestrationTrigger",
+  "bindings": [
+    {
+      "name": "Context",
+      "type": "orchestrationTrigger",
+      "direction": "in"
+    }
+  ]
+}

DomainAnalyser_All/run.ps1

@@ -39,6 +39,7 @@ $Result = [PSCustomObject]@{
     GUID                 = $($Domain.Replace('.', ''))
     LastRefresh          = $(Get-Date (Get-Date).ToUniversalTime() -UFormat '+%Y-%m-%dT%H:%M:%S.000Z')
     Domain               = $Domain
+    NSRecords            = (Read-NSRecord -Domain $Domain).Records
     ExpectedSPFRecord    = ''
     ActualSPFRecord      = ''
     SPFPassAll           = ''
@@ -52,6 +53,7 @@ $Result = [PSCustomObject]@{
     DNSSECPresent        = ''
     MailProvider         = ''
     DKIMEnabled          = ''
+    DKIMRecords          = ''
     Score                = ''
     MaximumScore         = 160
     ScorePercentage      = ''
@@ -218,6 +220,7 @@ try {
     if ($DkimRecordCount -gt 0 -and $DkimFailCount -eq 0) {
         $Result.DKIMEnabled = $true
         $ScoreDomain += $Scores.DKIMActiveAndWorking
+        $Result.DKIMRecords = $DkimRecord.Records | Select-Object Selector, Record
     } else {
         $Result.DKIMEnabled = $false
         $ScoreExplanation.Add('DKIM Not Configured') | Out-Null

DomainAnalyser_Orchestration/run.ps1

@@ -1,44 +1,40 @@
 param($Context)
 
-try { 
+try {
 
-  $DurableRetryOptions = @{
-    FirstRetryInterval  = (New-TimeSpan -Seconds 5)
-    MaxNumberOfAttempts = 3
-    BackoffCoefficient  = 2
-  }
-  $RetryOptions = New-DurableRetryOptions @DurableRetryOptions
+    $DurableRetryOptions = @{
+        FirstRetryInterval  = (New-TimeSpan -Seconds 5)
+        MaxNumberOfAttempts = 1
+        BackoffCoefficient  = 2
+    }
+    $RetryOptions = New-DurableRetryOptions @DurableRetryOptions
 
-  # Sync tenants
-  try {
-    Invoke-ActivityFunction -FunctionName 'DomainAnalyser_GetTenantDomains' -Input 'Tenants'
-  }
-  catch { Write-Host "EXCEPTION: TenantDomains $($_.Exception.Message)" }
+    # Sync tenants
+    try {
+        Invoke-ActivityFunction -FunctionName 'DomainAnalyser_GetTenantDomains' -Input 'Tenants'
+    } catch { Write-Host "EXCEPTION: TenantDomains $($_.Exception.Message)" }
 
-  # Get list of all domains to process
-  $Batch = Invoke-ActivityFunction -FunctionName 'Activity_GetAllTableRows' -Input 'Domains'
-
-  $ParallelTasks = foreach ($Item in $Batch) {
-    Invoke-DurableActivity -FunctionName 'DomainAnalyser_All' -Input $item -NoWait -RetryOptions $RetryOptions
-  }
-
-  # Collect activity function results and send to database
-  $TableParams = Get-CippTable -tablename 'Domains'
-  $TableParams.Entity = Wait-ActivityFunction -Task $ParallelTasks
-  $TableParams.Force = $true
-  $TableParams = $TableParams | ConvertTo-Json -Compress
+    # Get list of all domains to process
+    $Batch = Invoke-ActivityFunction -FunctionName 'Activity_GetAllTableRows' -Input 'Domains'
 
-  try {
-    Invoke-ActivityFunction -FunctionName 'Activity_AddOrUpdateTableRows' -Input $TableParams
-  }
-  catch {
-    Write-Host "Orchestrator exception UpdateDomains $($_.Exception.Message)"
-  }
-}
-catch {
-  Write-LogMessage -API 'DomainAnalyser' -message "Domain Analyser Orchestrator Error $($_.Exception.Message)" -sev info
-  #Write-Host $_.Exception | ConvertTo-Json
-}
-finally {
-  Write-LogMessage -API 'DomainAnalyser' -message 'Domain Analyser has Finished' -sev Info
+    $ParallelTasks = foreach ($Item in $Batch) {
+        Invoke-DurableActivity -FunctionName 'DomainAnalyser_All' -Input $item -NoWait -RetryOptions $RetryOptions
+    }
+
+    # Collect activity function results and send to database
+    $TableParams = Get-CippTable -tablename 'Domains'
+    $TableParams.Entity = Wait-ActivityFunction -Task $ParallelTasks
+    $TableParams.Force = $true
+    $TableParams = $TableParams | ConvertTo-Json -Compress
+
+    try {
+        Invoke-ActivityFunction -FunctionName 'Activity_AddOrUpdateTableRows' -Input $TableParams
+    } catch {
+        Write-Host "Orchestrator exception UpdateDomains $($_.Exception.Message)"
+    }
+} catch {
+    Write-LogMessage -API 'DomainAnalyser' -message "Domain Analyser Orchestrator Error $($_.Exception.Message)" -sev info
+    #Write-Host $_.Exception | ConvertTo-Json
+} finally {
+    Write-LogMessage -API 'DomainAnalyser' -message 'Domain Analyser has Finished' -sev Info
 }

ExecGDAPInviteApproved_Timer/function.json

@@ -7,10 +7,9 @@
       "schedule": "0 0 */3 * * *"
     },
     {
-      "type": "queue",
-      "direction": "out",
-      "name": "gdapinvitequeue",
-      "queueName": "gdapinvitequeue"
+      "name": "starter",
+      "type": "durableClient",
+      "direction": "in"
     }
   ]
 }