Revert serviceUrl allowlist (ADO 5310460)#415
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Reverts the (unshipped) serviceUrl hostname allowlist defense-in-depth feature from the Teams Apps SDK before public release, removing the related public configuration surface and tests while keeping other token-validation hardening (scope/issuer handling) intact.
Changes:
- Removes
additional_allowed_domainsfrom app options and stops plumbing it throughApp→HttpServer→TokenValidator. - Deletes serviceUrl hostname allowlist logic (helper + enforcement in
HttpServerandTokenValidator) and the associated cloud preset data. - Removes allowlist-focused unit tests in
packages/apps/tests.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| packages/apps/tests/test_token_validator.py | Removes serviceUrl allowlist and additional_allowed_domains token validator tests. |
| packages/apps/tests/test_http_server.py | Removes serviceUrl allowlist request-handling tests and initialization plumbing assertion. |
| packages/apps/src/microsoft_teams/apps/options.py | Removes additional_allowed_domains from AppOptions / InternalAppOptions. |
| packages/apps/src/microsoft_teams/apps/http/http_server.py | Removes allowlist configuration + enforcement in request handling and initialization. |
| packages/apps/src/microsoft_teams/apps/auth/token_validator.py | Deletes allowlist helper + domain enforcement; leaves serviceUrl claim equality validation. |
| packages/apps/src/microsoft_teams/apps/app.py | Removes forwarding of additional_allowed_domains into server/token-validator setup. |
| packages/api/src/microsoft_teams/api/auth/cloud_environment.py | Removes allowed_service_urls field and preset values from CloudEnvironment. |
heyitsaamir
approved these changes
Apr 28, 2026
singhk97
approved these changes
Apr 28, 2026
Addresses review feedback. The cloud parameter on the constructor was added by the allowlist work and became dead after the revert. Sovereign cloud routing happens entirely inside the factory methods (for_service, for_entra), which derive valid_issuers, jwks_uri, and login_endpoint from cloud and bake them into JwtValidationOptions before construction. Restores the pre-allowlist constructor signature. Co-Authored-By: Claude Opus 4.7 (1M context) <[email protected]>
7 tasks
corinagum
added a commit
that referenced
this pull request
May 27, 2026
## Summary Brings `origin/main` into `release` for the **2.0.12** release. **No carve-outs this time** — Quoted Replies (PR #321) is included. `version.json`: `2.0.11` → `2.0.12`. Aligns with teams.ts/teams.net cadence. ## What's in this release (delta from 2.0.11) **Features** - Quoted Replies & new quotes features (#321) — previously held back - SuggestedActionSubmitActivity for `suggestedAction/submit` invoke (#434) - Default targeted replies for targeted inbound messages (#439) - Reactions API marked GA (#427) — already shipped in 2.0.11 actually, ignore if duplicate - Prompt Preview support (#397) - Sample: opt targeted-messages into slash commands (#430) - Sample: a2a-in-teams (#401) - Sample: proactive message update (#405) - Allow custom HTTP client via `AppOptions` (#416) **Security & fixes** - Lock JsonWebToken trust-boundary contract (#432) - Bump starlette 1.0.0 -> 1.1.0 for PYSEC-2026-161 / BadHost (#441) - warn when bot starts without credentials (#435) - fix(apps): support AAD v1 issuers in Entra token validation (#422) - fix(apps): log inbound activities at info, warn on missing Authorization (#425) - fix(http-stream): wait for in-flight flush before sending final close (#419) - Mark reactions API as GA and fix sample remove flow (#427) - Revert serviceUrl allowlist (ADO 5310460) (#415) - Route `app.get_app_graph` + `ctx.*_graph` to sovereign endpoints via `cloud.graph_scope` (#402) **Deprecations / package changes** - Remove ai, openai, mcpplugin, a2a, and devtools packages (#413) - Restore and deprecate devtools package (#410) - Deprecate ai, openai, mcpplugin, a2a packages (#406) - Add agent framework example, remove chatprompt/mcp client samples (#386) **Dependency bumps** - urllib3 2.6.3 → 2.7.0 (#426) - python-multipart 0.0.26 → 0.0.27 (#424) - microsoft-kiota-http 1.9.7 → 1.9.9 (#423) - idna 3.11 → 3.15 (#431) - starlette 1.0.0 → 1.1.0 (#441, security) - /examples/tab/Web: qs, postcss, uuid, follow-redirects bumps ## Quoted Replies inclusion notes - Teams client rendering is in-sync with the wire format as of 2026-05-06. - APX QR rollout completed: Public 2026-04-10, GCCH/DoD/Gallatin 2026-04-14. - Builder methods (`prepend_quote()`, `add_quote()`), `ctx.quote()`, and the quote-aware `ctx.reply()` behavior are all present in this release. - `examples/quoting` is included. ## Conflict resolution The 2.0.11 release branch had the QR-removed shape for four files; took `main`'s (QR-included) version for all of them: - `examples/targeted-messages/src/main.py` - `packages/api/src/microsoft_teams/api/activities/message/message.py` - `packages/apps/src/microsoft_teams/apps/routing/activity_context.py` - `packages/apps/tests/test_activity_context.py` `version.json` conflict resolved to `2.0.12`. ## Test plan - [x] `uv sync` clean - [x] `poe check` (ruff format + lint) — clean - [x] `poe test` — 609 passed - [x] `pyright` — 0 errors, 0 warnings - [ ] Pipeline build + test stages green on `release` after merge - [ ] Publish pipeline run with **Public** → ESRP approval → PyPI - [ ] `pip install microsoft-teams-apps==2.0.12` smoke install --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Aamir Jawaid <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]> Co-authored-by: Shanmathi Mayuram Krithivasan <[email protected]>
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
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 proactiveConversationReferences, 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
additional_allowed_domainsoption is a breaking change for anyone building frommain, which is not ideal but acceptable since no release has been cut. Reverting now buys time to discuss without breaking customers later.Removed
is_allowed_service_urlhelperadditional_allowed_domainsoption onAppOptions/InternalAppOptions, plus plumbing throughApp->HttpServer->TokenValidator(for_service,for_entra,validate_token)CloudEnvironment.allowed_service_urlsfield and per-cloud entries (PUBLIC/US_GOV/US_GOV_DOD/CHINA)HttpServer.handle_requesttest_token_validator.pyandtest_http_server.pyPreserved (other security work bundled into PR #370)
tenant_idis missing infor_entraPreserved (sovereign cloud, separate work)
CloudEnvironmentpresets,with_overrides,from_name,cloudoption onApp, and thecloudparameter onTokenValidatorfactories are unchanged.Test plan
uv run ruff checkclean (full repo)uv run pyrightclean (full repo, 0 errors / 0 warnings)uv run pytest packages/apps/tests/: 246 tests passexamples/echostarts and uvicorn binds to port