Merge branch 'KelvinTegelaar:dev' into dev

BNWEIN · Sep 26, 2023 · ff92f5d · ff92f5d
2 parents 884e6bb + 7775609
commit ff92f5d
Show file tree

Hide file tree

Showing 37 changed files with 576 additions and 276 deletions.
diff --git a/AddAlert/function.json b/AddAlert/function.json
@@ -5,20 +5,18 @@
       "type": "httpTrigger",
       "direction": "in",
       "name": "Request",
-      "methods": [
-        "get",
-        "post"
-      ]
+      "methods": ["get", "post"]
     },
     {
       "type": "http",
       "direction": "out",
       "name": "Response"
     },
     {
-      "name": "starter",
-      "direction": "in",
-      "type": "durableClient"
+      "type": "queue",
+      "direction": "out",
+      "name": "Subscription",
+      "queueName": "AlertSubscriptions"
     }
   ]
-}
+}
diff --git a/AddAlert/run.ps1 b/AddAlert/run.ps1
@@ -11,8 +11,7 @@ $Results = foreach ($Tenant in $tenants) {
     try {
         $TenantID = if ($tenant -ne 'AllTenants') {
             (get-tenants | Where-Object -Property defaultDomainName -EQ $Tenant).customerId
-        }
-        else {
+        } else {
             'AllTenants'
         }
         if ($Request.body.SetAlerts) {
@@ -58,11 +57,10 @@ $Results = foreach ($Tenant in $tenants) {
                         EventType        = $eventType
                         ExecutingUser    = $Request.headers.'x-ms-client-principal'
                     }
-                    New-CIPPGraphSubscription @params
+                    Push-OutputBinding -Name Subscription -Value $Params
                 }
             }
-        }
-        else {
+        } else {
             foreach ($eventType in $Request.body.EventTypes.value) {
                 $params = @{
                     TenantFilter     = $tenant
@@ -78,8 +76,7 @@ $Results = foreach ($Tenant in $tenants) {
         }
         "Successfully added Alert for $($Tenant) to queue."
         Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Successfully added Alert for $($Tenant) to queue." -Sev 'Info'
-    }
-    catch {
+    } catch {
         Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Failed to add Alert for for $($Tenant) to queue" -Sev 'Error'
         "Failed to add Alert for for $($Tenant) to queue $($_.Exception.message)"
     }

diff --git a/AddAlertSubscription_Queue/function.json b/AddAlertSubscription_Queue/function.json
@@ -0,0 +1,12 @@
+{
+  "scriptFile": "../Modules/CippEntryPoints/CippEntryPoints.psm1",
+  "entryPoint": "Receive-CippQueueTrigger",
+  "bindings": [
+    {
+      "name": "QueueItem",
+      "type": "queueTrigger",
+      "direction": "in",
+      "queueName": "AlertSubscriptions"
+    }
+  ]
+}
diff --git a/AddChocoApp/Choco.app.json b/AddChocoApp/Choco.app.json
@@ -1,5 +1,4 @@
 {
-
   "displayName": "",
   "installCommandLine": "",
   "uninstallCommandLine": "",
@@ -11,47 +10,48 @@
   "fileName": "IntunePackage.intunewin",
   "@odata.type": "#microsoft.graph.win32LobApp",
   "applicableArchitectures": "x86, x64",
- 
+
   "installExperience": {
     "runAsAccount": "user",
     "deviceRestartBehavior": "allow",
     "@odata.type": "microsoft.graph.win32LobAppInstallExperience"
   },
   "detectionRules": [
     {
-  "@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
-  "path": "%programfiles%\\7-zip",
-  "fileOrFolderName": "7z.exe",
-  "check32BitOn64System": false,
-  "detectionType": "exists" }
+      "@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
+      "path": "%programfiles%\\7-zip",
+      "fileOrFolderName": "7z.exe",
+      "check32BitOn64System": false,
+      "detectionType": "exists"
+    }
+  ],
+  "returncode": [
+    {
+      "returnCode": 0,
+      "type": "success",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    },
+    {
+      "returnCode": 1707,
+      "type": "Success",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    },
+    {
+      "returnCode": 1641,
+      "type": "hardReboot",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    },
+    {
+      "returnCode": 1618,
+      "type": "retry",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    },
+    {
+      "returnCode": 3010,
+      "type": "softReboot",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    }
   ],
-      "returncode":  [
-                       {
-                           "returnCode":  0,
-                           "type":  "success",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       },
-                       {
-                           "returnCode":  1707,
-                           "type":  "Success",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       },
-                       {
-                           "returnCode":  1641,
-                           "type":  "hardReboot",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       },
-                       {
-                           "returnCode":  1618,
-                           "type":  "retry",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       },
-                       {
-                           "returnCode":  3010,
-                           "type":  "softReboot",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       }
-                       ],
   "minimumNumberOfProcessors": "1",
   "minimumFreeDiskSpaceInMB": "8",
   "minimumCpuSpeedInMHz": "4",
@@ -60,7 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
-
-
-}
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
+}
diff --git a/AddMSPApp/Immybot.app.json b/AddMSPApp/Immybot.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/automate.app.json b/AddMSPApp/automate.app.json
@@ -59,5 +59,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/cwcommand.app.json b/AddMSPApp/cwcommand.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/datto.app.json b/AddMSPApp/datto.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/huntress.app.json b/AddMSPApp/huntress.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/syncro.app.json b/AddMSPApp/syncro.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddScheduledItems/function.json → AddScheduledItem/function.json b/AddScheduledItems/function.json → AddScheduledItem/function.json
@@ -1,19 +1,19 @@
-{
-    "bindings": [
-      {
-        "authLevel": "anonymous",
-        "type": "httpTrigger",
-        "direction": "in",
-        "name": "Request",
-        "methods": [
-          "get",
-          "post"
-        ]
-      },
-      {
-        "type": "http",
-        "direction": "out",
-        "name": "Response"
-      }
-    ]
+{
+    "bindings": [
+      {
+        "authLevel": "anonymous",
+        "type": "httpTrigger",
+        "direction": "in",
+        "name": "Request",
+        "methods": [
+          "get",
+          "post"
+        ]
+      },
+      {
+        "type": "http",
+        "direction": "out",
+        "name": "Response"
+      }
+    ]
   }
diff --git a/AddScheduledItem/run.ps1 b/AddScheduledItem/run.ps1
@@ -0,0 +1,30 @@
+using namespace System.Net
+param($Request, $TriggerMetadata)
+$APIName = $TriggerMetadata.FunctionName
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+$task = $Request.Body
+$Table = Get-CIPPTable -TableName 'ScheduledTasks'
+
+$propertiesToCheck = @('Webhook', 'Email', 'PSA')
+$PostExecution = ($propertiesToCheck | Where-Object { $task.PostExecution.$_ -eq $true }) -join ','
+$Parameters = ($task.Parameters | ConvertTo-Json -Compress)
+if ($Parameters -eq 'null') { $Parameters = '' }
+$entity = @{
+    PartitionKey  = [string]'ScheduledTask'
+    TaskState     = [string]'Planned'
+    RowKey        = [string]"$(New-Guid)"
+    Tenant        = [string]$task.TenantFilter
+    Name          = [string]$task.Name
+    Command       = [string]$task.Command.value
+    Parameters    = [string]$Parameters
+    ScheduledTime = [string]$task.ScheduledTime
+    Recurrence    = [string]$task.Recurrence.value
+    PostExecution = [string]$PostExecution
+    Results       = 'Planned'
+}
+Write-Host "entity: $($entity | ConvertTo-Json)"
+Add-AzDataTableEntity @Table -Entity $entity
+Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+        StatusCode = [HttpStatusCode]::OK
+        Body       = @{ Results = 'Task added successfully.' }
+    })
diff --git a/AddScheduledItems/run.ps1 b/AddScheduledItems/run.ps1
diff --git a/ExecBECRemediate/run.ps1 b/ExecBECRemediate/run.ps1
@@ -20,8 +20,8 @@ try {
     $GraphRequest = New-GraphPostRequest -uri "https://graph.microsoft.com/v1.0/users/$SuspectUser" -tenantid $TenantFilter -type PATCH -body $passwordProfile  -verbose
     $GraphRequest = New-GraphPostRequest -uri "https://graph.microsoft.com/v1.0/users/$SuspectUser" -tenantid $TenantFilter -type PATCH -body '{"accountEnabled":"false"}'  -verbose
     $GraphRequest = New-GraphPostRequest -uri "https://graph.microsoft.com/v1.0/users/$SuspectUser/revokeSignInSessions" -tenantid $TenantFilter -type POST -body '{}'  -verbose
-    $Mailboxes = New-ExoRequest -tenantid $TenantFilter -cmdlet "get-inboxrule" -cmdParams @{Mailbox = $SuspectUser } -anchor $SuspectUser | ForEach-Object {
-        New-ExoRequest -tenantid $TenantFilter -cmdlet "Disable-InboxRule" -cmdParams @{Confirm = $false; Identity = $_.Identity } -anchor $SuspectUser 
+    $Mailboxes = New-ExoRequest  -anchor $SuspectUser -tenantid $TenantFilter -cmdlet "get-inboxrule" -cmdParams @{Mailbox = $SuspectUser } | ForEach-Object {
+        New-ExoRequest -anchor $SuspectUser  -tenantid $TenantFilter -cmdlet "Disable-InboxRule" -cmdParams @{Confirm = $false; Identity = $_.Identity } 
     } 
     $results = [pscustomobject]@{"Results" = "Executed Remediation for $SuspectUser and tenant $($TenantFilter). The temporary password is $password and must be changed at next logon." }
     Write-LogMessage -API "BECRemediate" -tenant $tenantfilter -message "Executed Remediation for $SuspectUser" -sev "Info"

diff --git a/ExecScheduledCommand/function.json b/ExecScheduledCommand/function.json
@@ -0,0 +1,10 @@
+{
+  "bindings": [
+    {
+      "name": "QueueItem",
+      "type": "queueTrigger",
+      "direction": "in",
+      "queueName": "scheduledcommandprocessor"
+    }
+  ]
+}