[pull] dev from KelvinTegelaar:dev

.github/workflows/dev_cippjta72.yml

@@ -0,0 +1,32 @@
+# 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 - cippjta72
+
+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: ubuntu-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: 'cippjta72'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_1EBE9D73F9EC4528BA666FC934055536 }}
+          sku: 'flexconsumption'
+

Config/CIPPDBCacheTypes.json

@@ -214,6 +214,11 @@
     "friendlyName": "Exchange Quarantine Policy",
     "description": "Exchange Online quarantine policy"
   },
+  {
+    "type": "ExoGlobalQuarantinePolicy",
+    "friendlyName": "Exchange Global Quarantine Policy",
+    "description": "Exchange Online tenant-wide Global Quarantine policy (end-user notification settings)"
+  },
   {
     "type": "ExoRemoteDomain",
     "friendlyName": "Exchange Remote Domain",
@@ -363,5 +368,10 @@
     "type": "CopilotUserCountTrend",
     "friendlyName": "Copilot User Count Trend",
     "description": "Daily Copilot active user count trend (7-day period)"
+  },
+  {
+    "type": "ExoTransportConfig",
+    "friendlyName": "Exchange Transport Config",
+    "description": "Exchange Online transport configuration including SMTP authentication settings"
   }
 ]

Config/CIPPTimers.json

@@ -17,14 +17,6 @@
     "RunOnProcessor": true,
     "PreferredProcessor": "usertasks"
   },
-  {
-    "Id": "168decf3-7ddd-471e-ab46-8b40be0f18ae",
-    "Command": "Start-CIPPProcessorQueue",
-    "Description": "Timer to handle user initiated tasks",
-    "Cron": "0 */15 * * * *",
-    "Priority": 1,
-    "RunOnProcessor": true
-  },
   {
     "Id": "44a40668-ed71-403c-8c26-b32e320086ad",
     "Command": "Start-AuditLogOrchestrator",
@@ -245,6 +237,16 @@
     "TZOffset": true,
     "IsSystem": true
   },
+  {
+    "Id": "5e8a9b4c-2d6f-4a3e-b7c1-9d0e5f3a8b2c",
+    "Command": "Start-IntuneReportExportOrchestrator",
+    "Description": "Submit Intune report-export jobs ahead of nightly DB cache run",
+    "Cron": "0 0 2 * * *",
+    "Priority": 22,
+    "RunOnProcessor": true,
+    "TZOffset": true,
+    "IsSystem": true
+  },
   {
     "Id": "9a7f8e6d-5c4b-3a2d-1e0f-9b8c7d6e5f4a",
     "Command": "Start-CIPPDBCacheOrchestrator",
@@ -273,5 +275,14 @@
     "Priority": 30,
     "RunOnProcessor": false,
     "IsSystem": true
+  },
+  {
+    "Id": "7e2a9b4c-1d5f-4a8e-b3c6-0f9d2e7a4b1c",
+    "Command": "Start-UserSyncTimer",
+    "Description": "Sync partner tenant users and group-based roles into allowedUsers table",
+    "Cron": "0 */15 * * * *",
+    "Priority": 11,
+    "RunOnProcessor": false,
+    "IsSystem": true
   }
 ]

Config/FeatureFlags.json

@@ -32,16 +32,29 @@
     "Endpoints": [
       "ExecCIPPUsers",
       "ListCIPPUsers",
-      "ExecSSOSetup",
       "ExecContainerManagement",
-      "ListContainerLogs"
+      "ListContainerLogs",
+      "ListWorkerHealth"
     ],
     "Pages": [
       "/cipp/advanced/super-admin/cipp-users",
-      "/cipp/advanced/super-admin/sso",
       "/cipp/advanced/super-admin/container",
-      "/cipp/advanced/container-logs"
+      "/cipp/advanced/container-logs",
+      "/cipp/advanced/worker-health"
     ],
     "Hidden": true
+  },
+  {
+    "Id": "MCPServer",
+    "Name": "MCP Server",
+    "Description": "Model Context Protocol (MCP) server endpoint that exposes CIPP's read-only API surface as tools for AI clients. Disabled by default; enable to allow MCP access.",
+    "Enabled": false,
+    "AllowUserToggle": true,
+    "Timers": [],
+    "Endpoints": [
+      "ExecMcp"
+    ],
+    "Pages": [],
+    "Hidden": false
   }
 ]

Config/SAMManifest.json

@@ -10,20 +10,7 @@
       "http://localhost:8400"
     ]
   },
-  "servicePrincipalLockConfiguration": {
-    "isEnabled": true,
-    "allProperties": true
-  },
   "requiredResourceAccess": [
-    {
-      "resourceAppId": "c5393580-f805-4401-95e8-94b7a6ef2fc2",
-      "resourceAccess": [
-        {
-          "id": "594c1fb6-4f81-4475-ae41-0c394909246c",
-          "type": "Scope"
-        }
-      ]
-    },
     {
       "resourceAppId": "aeb86249-8ea3-49e2-900b-54cc8e308f85",
       "resourceAccess": [
@@ -48,6 +35,10 @@
           "id": "5e1e9171-754d-478c-812c-f1755a9a4c2d",
           "type": "Role"
         },
+        {
+          "id": "57f1cf28-c0c4-4ec3-9a30-19a2eaaf2f6e",
+          "type": "Role"
+        },
         {
           "id": "f3a65bd4-b703-46df-8f7e-0174fea562aa",
           "type": "Role"
@@ -60,6 +51,10 @@
           "id": "35930dcf-aceb-4bd1-b99a-8ffed403c974",
           "type": "Role"
         },
+        {
+          "id": "c8948c23-e66b-42db-83fd-770b71ab78d2",
+          "type": "Role"
+        },
         {
           "id": "cac88765-0581-4025-9725-5ebc13f729ee",
           "type": "Role"
@@ -92,10 +87,6 @@
           "id": "9255e99d-faf5-445e-bbf7-cb71482737c4",
           "type": "Role"
         },
-        {
-          "id": "8b9d79d0-ad75-4566-8619-f7500ecfcebe",
-          "type": "Scope"
-        },
         {
           "id": "5ac13192-7ace-4fcf-b828-1a26f28068ee",
           "type": "Role"
@@ -116,6 +107,10 @@
           "id": "75359482-378d-4052-8f01-80520e7db3cd",
           "type": "Role"
         },
+        {
+          "id": "2d9bd318-b883-40be-9df7-63ec4fcdc424",
+          "type": "Role"
+        },
         {
           "id": "bf7b1a76-6e77-406b-b258-bf5c7720e98f",
           "type": "Role"
@@ -224,6 +219,14 @@
           "id": "4437522e-9a86-4a41-a7da-e380edd4a97d",
           "type": "Role"
         },
+        {
+          "id": "0a42382f-155c-4eb1-9bdc-21548ccaa387",
+          "type": "Role"
+        },
+        {
+          "id": "a94a502d-0281-4d15-8cd2-682ac9362c4c",
+          "type": "Role"
+        },
         {
           "id": "741f803b-c850-494e-b5df-cde7c675a1ca",
           "type": "Role"
@@ -232,6 +235,10 @@
           "id": "50483e42-d915-4231-9639-7fdb7fd190e5",
           "type": "Role"
         },
+        {
+          "id": "d72bdbf4-a59b-405c-8b04-5995895819ac",
+          "type": "Role"
+        },
         {
           "id": "bdfbf15f-ee85-4955-8675-146e8e5296b5",
           "type": "Scope"
@@ -332,6 +339,10 @@
           "id": "0c5e8a55-87a6-4556-93ab-adc52c4d862d",
           "type": "Scope"
         },
+        {
+          "id": "8b9d79d0-ad75-4566-8619-f7500ecfcebe",
+          "type": "Scope"
+        },
         {
           "id": "662ed50a-ac44-4eef-ad86-62eed9be2a29",
           "type": "Scope"
@@ -400,6 +411,10 @@
           "id": "46ca0847-7e6b-426e-9775-ea810a948356",
           "type": "Scope"
         },
+        {
+          "id": "1e9b7a7e-4d64-44ff-acf5-2e9651c1519f",
+          "type": "Scope"
+        },
         {
           "id": "346c19ff-3fb2-4e81-87a0-bac9e33990c1",
           "type": "Scope"
@@ -528,6 +543,10 @@
           "id": "b98bfd41-87c6-45cc-b104-e2de4f0dafb9",
           "type": "Scope"
         },
+        {
+          "id": "424b07a8-1209-4d17-9fe4-9018a93a1024",
+          "type": "Scope"
+        },
         {
           "id": "cac97e40-6730-457d-ad8d-4852fddab7ad",
           "type": "Scope"
@@ -551,38 +570,31 @@
         {
           "id": "b7887744-6746-4312-813d-72daeaee7e2d",
           "type": "Scope"
-        },
+        }
+      ]
+    },
+    {
+      "resourceAppId": "fa3d9a0c-3fb0-42cc-9193-47c7ecd2edbd",
+      "resourceAccess": [
         {
-          "id": "424b07a8-1209-4d17-9fe4-9018a93a1024",
+          "id": "1cebfa2a-fb4d-419e-b5f9-839b4383e05a",
           "type": "Scope"
-        },
-        {
-          "id": "0a42382f-155c-4eb1-9bdc-21548ccaa387",
-          "type": "Role"
-        },
-        {
-          "id": "2d9bd318-b883-40be-9df7-63ec4fcdc424",
-          "type": "Role"
-        },
+        }
+      ]
+    },
+    {
+      "resourceAppId": "00000012-0000-0000-c000-000000000000",
+      "resourceAccess": [
         {
-          "id": "c8948c23-e66b-42db-83fd-770b71ab78d2",
+          "id": "e23bd57d-bfd5-4906-867f-89fb5ed8cd43",
           "type": "Role"
         },
         {
-          "id": "a94a502d-0281-4d15-8cd2-682ac9362c4c",
+          "id": "7347eb49-7a1a-43c5-8eac-a5cd1d1c7cf0",
           "type": "Role"
         },
         {
-          "id": "d72bdbf4-a59b-405c-8b04-5995895819ac",
-          "type": "Role"
-        }
-      ]
-    },
-    {
-      "resourceAppId": "fa3d9a0c-3fb0-42cc-9193-47c7ecd2edbd",
-      "resourceAccess": [
-        {
-          "id": "1cebfa2a-fb4d-419e-b5f9-839b4383e05a",
+          "id": "c9c9a04d-3b66-4ca8-a00c-fca953e2afd3",
           "type": "Scope"
         }
       ]
@@ -591,23 +603,23 @@
       "resourceAppId": "00000002-0000-0ff1-ce00-000000000000",
       "resourceAccess": [
         {
-          "id": "dc50a0fb-09a3-484d-be87-e023b12c6440",
+          "id": "ef54d2bf-783f-4e0f-bca1-3210c0444d99",
           "type": "Role"
         },
         {
-          "id": "ef54d2bf-783f-4e0f-bca1-3210c0444d99",
+          "id": "dc50a0fb-09a3-484d-be87-e023b12c6440",
           "type": "Role"
         },
         {
           "id": "f9156939-25cd-4ba8-abfe-7fabcf003749",
           "type": "Role"
         },
         {
-          "id": "ab4f2b77-0b06-4fc1-a9de-02113fc2ab7c",
+          "id": "bbd1ca91-75e0-4814-ad94-9c5dbbae3415",
           "type": "Scope"
         },
         {
-          "id": "bbd1ca91-75e0-4814-ad94-9c5dbbae3415",
+          "id": "ab4f2b77-0b06-4fc1-a9de-02113fc2ab7c",
           "type": "Scope"
         },
         {
@@ -616,6 +628,15 @@
         }
       ]
     },
+    {
+      "resourceAppId": "c5393580-f805-4401-95e8-94b7a6ef2fc2",
+      "resourceAccess": [
+        {
+          "id": "594c1fb6-4f81-4475-ae41-0c394909246c",
+          "type": "Scope"
+        }
+      ]
+    },
     {
       "resourceAppId": "00000003-0000-0ff1-ce00-000000000000",
       "resourceAccess": [
@@ -647,5 +668,9 @@
         }
       ]
     }
-  ]
-}
+  ],
+  "servicePrincipalLockConfiguration": {
+    "isEnabled": true,
+    "allProperties": true
+  }
+}