Merge pull request KelvinTegelaar#1633 from kris6673/blocked-endpoint

Fix: Fix null checks and fix CIPP permissions

Author: KelvinTegelaar

Modules/CIPPCore/Public/Authentication/Get-CIPPHttpFunctions.ps1

@@ -18,14 +18,14 @@ function Get-CIPPHttpFunctions {
         }
 
         if ($ByRole.IsPresent -or $ByRoleGroup.IsPresent) {
-            $Results = $Results | Group-Object -Property Role | Select-Object -Property @{l = 'Permission'; e = { $_.Name -eq '' ? 'None' : $_.Name } }, Count, @{l = 'Functions'; e = { $_.Group | Select-Object @{l='Name'; e={$_.Function -replace 'Invoke-'}}, Description } } | Sort-Object -Property Permission
+            $Results = $Results | Group-Object -Property Role | Select-Object -Property @{l = 'Permission'; e = { $_.Name -eq '' ? 'None' : $_.Name } }, Count, @{l = 'Functions'; e = { $_.Group | Select-Object @{l = 'Name'; e = { $_.Function -replace 'Invoke-' } }, Description } } | Sort-Object -Property Permission
             if ($ByRoleGroup.IsPresent) {
                 $RoleGroup = @{}
                 foreach ($Permission in $Results) {
                     $PermSplit = $Permission.Permission -split '\.'
                     if ($PermSplit.Count -ne 3) { continue }
-                    if ($RoleGroup[$PermSplit[0]] -eq $null) { $RoleGroup[$PermSplit[0]] = @{} }
-                    if ($RoleGroup[$PermSplit[0]][$PermSplit[1]] -eq $null) { $RoleGroup[$PermSplit[0]][$PermSplit[1]] = @{} }
+                    if ($null -eq $RoleGroup[$PermSplit[0]]) { $RoleGroup[$PermSplit[0]] = @{} }
+                    if ($null -eq $RoleGroup[$PermSplit[0]][$PermSplit[1]]) { $RoleGroup[$PermSplit[0]][$PermSplit[1]] = @{} }
                     $RoleGroup[$PermSplit[0]][$PermSplit[1]][$PermSplit[2]] = @($Permission.Functions)
                 }
                 $Results = $RoleGroup

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

@@ -1,11 +1,11 @@
 using namespace System.Net
 
-Function Invoke-ExecSetCIPPAutoBackup {
+function Invoke-ExecSetCIPPAutoBackup {
     <#
     .FUNCTIONALITY
         Entrypoint
     .ROLE
-        CIPP.Backup.Read
+        CIPP.Backup.ReadWrite
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Resources/Invoke-ListEquipment.ps1

@@ -1,11 +1,11 @@
 using namespace System.Net
 
-Function Invoke-ListEquipment {
+function Invoke-ListEquipment {
     <#
     .FUNCTIONALITY
         Entrypoint
     .ROLE
-        Exchange.Equipment.ReadWrite
+        Exchange.Equipment.Read
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Spamfilter/Invoke-EditAntiPhishingFilter.ps1

@@ -3,7 +3,7 @@ function Invoke-EditAntiPhishingFilter {
     .FUNCTIONALITY
         Entrypoint
     .ROLE
-        Exchange.SpamFilter.Read
+        Exchange.SpamFilter.ReadWrite
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
@@ -33,7 +33,7 @@ function Invoke-EditAntiPhishingFilter {
             'Disable' {
                 $ExoRequestParam.Add('cmdlet', 'Disable-AntiPhishRule')
             }
-            Default {
+            default {
                 throw 'Invalid state'
             }
         }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Spamfilter/Invoke-EditMalwareFilter.ps1

@@ -3,7 +3,7 @@ function Invoke-EditMalwareFilter {
     .FUNCTIONALITY
         Entrypoint
     .ROLE
-        Exchange.SpamFilter.Read
+        Exchange.SpamFilter.ReadWrite
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
@@ -33,7 +33,7 @@ function Invoke-EditMalwareFilter {
             'Disable' {
                 $ExoRequestParam.Add('cmdlet', 'Disable-MalwareFilterRule')
             }
-            Default {
+            default {
                 throw 'Invalid state'
             }
         }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Spamfilter/Invoke-EditSafeAttachmentsFilter.ps1

@@ -3,7 +3,7 @@ function Invoke-EditSafeAttachmentsFilter {
     .FUNCTIONALITY
         Entrypoint
     .ROLE
-        Exchange.SpamFilter.Read
+        Exchange.SpamFilter.ReadWrite
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
@@ -33,7 +33,7 @@ function Invoke-EditSafeAttachmentsFilter {
             'Disable' {
                 $ExoRequestParam.Add('cmdlet', 'Disable-SafeAttachmentRule')
             }
-            Default {
+            default {
                 throw 'Invalid state'
             }
         }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Spamfilter/Invoke-ListMailQuarantine.ps1

@@ -3,7 +3,7 @@ function Invoke-ListMailQuarantine {
     .FUNCTIONALITY
         Entrypoint
     .ROLE
-        Exchange.SpamFilter.ReadWrite
+        Exchange.SpamFilter.Read
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Spamfilter/Invoke-ListMailQuarantineMessage.ps1

@@ -3,7 +3,7 @@ function Invoke-ListMailQuarantineMessage {
     .FUNCTIONALITY
         Entrypoint
     .ROLE
-        Exchange.SpamFilter.ReadWrite
+        Exchange.SpamFilter.Read
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ExecAppApproval.ps1

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ExecAppApproval {
+function Invoke-ExecAppApproval {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -15,8 +15,7 @@ Function Invoke-ExecAppApproval {
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
 
-    Write-Host "$($Request.query.ID)"
-    # Interact with query parameters or the body of the request.
+    # Seems to be an unused endpoint? -Bobby
 
     $ApplicationId = if ($Request.Query.ApplicationId) { $Request.Query.ApplicationId } else { $env:ApplicationID }
     $Results = Get-Tenants | ForEach-Object {

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ExecDomainAnalyser.ps1

@@ -3,7 +3,7 @@ function Invoke-ExecDomainAnalyser {
     .FUNCTIONALITY
         Entrypoint,AnyTenant
     .ROLE
-        Tenant.DomainAnalyser.Read
+        Tenant.DomainAnalyser.ReadWrite
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)