add mcp allowed

Author: KelvinTegelaar

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

@@ -20,7 +20,7 @@ function Get-CippApiClient {
     }
     $Apps = Get-CIPPAzDataTableEntity @Table | Where-Object { ![string]::IsNullOrEmpty($_.RowKey) }
     $Apps = foreach ($Client in $Apps) {
-        $Client = $Client | Select-Object -Property @{Name = 'ClientId'; Expression = { $_.RowKey } }, AppName, Role, IPRange, Enabled
+        $Client = $Client | Select-Object -Property @{Name = 'ClientId'; Expression = { $_.RowKey } }, AppName, Role, IPRange, Enabled, @{Name = 'MCPAllowed'; Expression = { [bool]$_.MCPAllowed } }
 
         if (!$Client.Role) {
             $Client.Role = $null

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/MCP/Invoke-ExecMcp.ps1

@@ -27,6 +27,20 @@ function Invoke-ExecMcp {
             })
     }
 
+    # Per-client gate: the global 'MCPServer' feature flag lets this endpoint run at all (enforced
+    # upstream in New-CippCoreRequest); this narrows access to API clients explicitly flagged
+    # 'MCP Access Allowed'. A non-API-client caller, an unknown client, or one without the flag is denied.
+    $CallerAppId = $Request.Headers.'x-ms-client-principal-name'
+    $IsApiClient = $Request.Headers.'x-ms-client-principal-idp' -eq 'aad' -and $CallerAppId -match '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+    $McpAllowed = if ($IsApiClient) { [bool](Get-CippApiClient -AppId $CallerAppId).MCPAllowed } else { $false }
+    if (-not $McpAllowed) {
+        return ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::Forbidden
+                Headers    = @{ 'Content-Type' = 'application/json' }
+                Body       = (@{ jsonrpc = '2.0'; id = $null; error = @{ code = -32001; message = 'This API client is not permitted to use the MCP server. Enable "MCP Access Allowed" on the API client in CIPP.' } } | ConvertTo-Json -Compress)
+            })
+    }
+
     $Rpc = $Request.Body
     $RpcId = $Rpc.id
 

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecApiClient.ps1

@@ -103,6 +103,7 @@ function Invoke-ExecApiClient {
                     $Client.Role = [string]$Request.Body.Role.value
                     $Client.IPRange = "$(@($IpRange) | ConvertTo-Json -Compress)"
                     $Client.Enabled = $Request.Body.Enabled ?? $false
+                    $Client | Add-Member -NotePropertyName 'MCPAllowed' -NotePropertyValue ([bool]($Request.Body.MCPAllowed ?? $false)) -Force
                     Write-LogMessage -headers $Request.Headers -API 'ExecApiClient' -message "Updated API client $($Request.Body.ClientId)" -Sev 'Info'
                     if ($APIConfig.ApplicationSecret) {
                         $Results.Add(@{
@@ -121,6 +122,7 @@ function Invoke-ExecApiClient {
                         'Role'         = [string]$Request.Body.Role.value
                         'IPRange'      = "$(@($IpRange) | ConvertTo-Json -Compress)"
                         'Enabled'      = $Request.Body.Enabled ?? $false
+                        'MCPAllowed'   = [bool]($Request.Body.MCPAllowed ?? $false)
                     }
                     $Results.Add(@{
                             resultText = "API Client created with the name '$($Client.AppName)'. Use the Copy to Clipboard button to retrieve the secret."