Add sovereign cloud support to next/core (GCCH, DoD, China)#413
Open
Add sovereign cloud support to next/core (GCCH, DoD, China)#413
Conversation
This was referenced Apr 9, 2026
Contributor
Review: GraphScope needed here tooThis PR extends #352's CloudEnvironment to next/core — the right approach since core/ is the shipping path. Same gap as #352: the CloudEnvironment class is missing a GraphScope property. In core/, the MSAL Instance is correctly wired from CloudEnvironment.LoginEndpoint (in AddBotApplicationExtensions.cs), but the Graph token scope still needs to come from CloudEnvironment too. The correct Graph scopes per cloud (from Microsoft Graph national cloud deployments):
Note: DoD uses a different Graph host than GCC High ( Source: Access national cloud deployments with the Microsoft Graph SDKs Once #352 adds GraphScope, this PR picks it up automatically via the cherry-pick. |
heyitsaamir
approved these changes
Apr 10, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Adds sovereign cloud support (GCCH, DoD, China) across the libraries layer and next/core by introducing a shared CloudEnvironment model and threading cloud-aware endpoints/scopes through configuration, auth/token acquisition, and token-service clients.
Changes:
- Introduces
CloudEnvironment(Public/USGov/USGovDoD/China) and updates credentials + token clients to use cloud-specific endpoints/scopes. - Adds configuration-driven cloud resolution (
TeamsSettings, ASP.NET Core host builders,corebot hosting) and usesCloudEnvironment.LoginEndpointto configure MSALInstance. - Adds/extends tests covering cloud endpoint presets, token scopes, and validation settings per cloud.
Reviewed changes
Copilot reviewed 18 out of 19 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| Tests/Microsoft.Teams.Plugins.AspNetCore.Tests/Extensions/TeamsValidationSettingsTests.cs | Adds tests for cloud-aware token validation settings. |
| Tests/Microsoft.Teams.Api.Tests/Clients/BotTokenClientTests.cs | Verifies ActiveBotScope default/override behavior and usage. |
| Tests/Microsoft.Teams.Api.Tests/Auth/CloudEnvironmentTests.cs | Adds tests for cloud endpoint presets and override behavior. |
| Libraries/Microsoft.Teams.Plugins/Microsoft.Teams.Plugins.AspNetCore/Extensions/TeamsValidationSettings.cs | Makes token validation settings cloud-aware via CloudEnvironment. |
| Libraries/Microsoft.Teams.Plugins/Microsoft.Teams.Plugins.AspNetCore/Extensions/HostApplicationBuilder.cs | Wires resolved cloud into JWT validation settings. |
| Libraries/Microsoft.Teams.Extensions/Microsoft.Teams.Extensions.Hosting/Microsoft.Teams.Apps.Extensions/HostApplicationBuilder.cs | Resolves cloud from config/options and propagates into credentials. |
| Libraries/Microsoft.Teams.Extensions/Microsoft.Teams.Extensions.Configuration/Microsoft.Teams.Apps.Extensions/TeamsSettings.cs | Adds Cloud + per-endpoint overrides and resolves into AppOptions/credentials. |
| Libraries/Microsoft.Teams.Apps/AppOptions.cs | Adds optional Cloud to app options. |
| Libraries/Microsoft.Teams.Apps/App.cs | Applies cloud-specific bot scope and token service URLs to API clients. |
| Libraries/Microsoft.Teams.Api/Clients/UserTokenClient.cs | Makes token service base URL configurable. |
| Libraries/Microsoft.Teams.Api/Clients/BotTokenClient.cs | Adds ActiveBotScope and uses it for token acquisition. |
| Libraries/Microsoft.Teams.Api/Clients/BotSignInClient.cs | Makes token service base URL configurable for sign-in URLs/resources. |
| Libraries/Microsoft.Teams.Api/Auth/CloudEnvironment.cs | Adds cloud endpoint preset model and override mechanism. |
| Libraries/Microsoft.Teams.Api/Auth/ClientCredentials.cs | Uses cloud login endpoint + tenant for token acquisition. |
| core/src/Microsoft.Teams.Bot.Core/UserTokenClient.cs | Chooses default token service endpoint based on configured cloud. |
| core/src/Microsoft.Teams.Bot.Core/Hosting/BotConfig.cs | Adds cloud resolution for BF/Core/AzureAd config formats. |
| core/src/Microsoft.Teams.Bot.Core/Hosting/BotClientOptions.cs | Stores resolved cloud for client configuration defaults. |
| core/src/Microsoft.Teams.Bot.Core/Hosting/AddBotApplicationExtensions.cs | Resolves cloud for scope defaults and configures MSAL Instance accordingly. |
| .gitignore | Ignores additional local development configuration files. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
corinagum
force-pushed
the
cg/sovereign-cloud-nextcore
branch
from
caf3422 to
3568d2e
Compare
corinagum
force-pushed
the
cg/sovereign-cloud-nextcore
branch
4 times, most recently
from
dbbbd06 to
2ca0021
Compare
… cloud thru AddBotAuthentication, AddBotAuthorization, AddTeamsJwtBearer
…Cloud + Instance validation
corinagum
force-pushed
the
cg/sovereign-cloud-nextcore
branch
from
2ca0021 to
86f2cba
Compare
3 tasks
corinagum
added a commit
that referenced
this pull request
Apr 28, 2026
## Summary Reverting the serviceUrl allowlist defense-in-depth feature before public release. Open design questions on the work item (default sovereign cloud domains, narrowing of `*.botframework.com`, applying to proactive `ConversationReference`s, consultation with APX) should be resolved before this becomes part of the public API surface. This feature has not shipped in any release. Removing the public `AdditionalAllowedDomains` option is a breaking change for anyone building from `main`, which is not ideal but acceptable since no release has been cut. Reverting now buys time to discuss without breaking customers later. ## Removed - `ServiceUrlValidator` class and `ServiceUrlValidatorTests` - `AppOptions.AdditionalAllowedDomains`, `App._additionalAllowedDomains` field, related warn log, and the `IsAllowed` check in `App.Process` - `TeamsSettings.AdditionalAllowedDomains` and its `Apply()` assignment - `CloudEnvironment.AllowedServiceUrls` property, per-cloud entries (Public/USGov/USGovDoD/China), constructor parameter, and `WithOverrides` parameter ## Preserved (other security work bundled into PR #418) - DevTools production guard (`DevToolsPlugin`, `TeamsValidationSettings`) ## Preserved (sovereign cloud, separate work) `CloudEnvironment` presets, `WithOverrides`, `FromName`, `AppOptions.Cloud`, and the per-cloud `Bots.Token.ActiveBotScope` / `ActiveGraphScope` / `TokenServiceUrl` wiring in `App` are unchanged. ## Note on related open PRs PR #450 (`Tighten AdditionalAllowedDomains API contract`) and PR #413 (sovereign cloud next/core, which carries this plumbing) are intentionally left open for separate decisions. ## Test plan - [x] `dotnet build` clean (0 errors, 5 unrelated pre-existing warnings) - [x] `dotnet test` net10.0 passes (net8.0 testhost aborted on local machine due to missing SDK, environmental, not code) - [x] Smoke test: `Samples/Samples.Echo` starts and binds to port
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
BotConfigcloud resolution, MSAL Instance fromCloudEnvironment.LoginEndpoint, cloud-aware default scope, cloud-awareUserTokenClientendpointcore/ changes
core/src/.../Hosting/BotConfig.csCloudproperty, resolved from config key in all 3 formats (BF, Core, AzureAd)core/src/.../Hosting/BotClientOptions.csCloudproperty, scope defaults from cloudcore/src/.../Hosting/AddBotApplicationExtensions.csInstance, resolves cloud from config, threads through all auth methodscore/src/.../UserTokenClient.csTest plan
dotnet build— 0 errorsdotnet test— 42 sovereign cloud tests pass (24 CloudEnv + 9 BotTokenClient + 9 TeamsValidationSettings)Depends on
🤖 Generated with Claude Code