Validate serviceurl claim matches activity ServiceUrl#545
Merged
Conversation
Add validation to ensure the "serviceurl" claim in user claims matches the activity's ServiceUrl (case-insensitive) in BotApplication. Throw InvalidDataException on mismatch. Add unit tests covering matching, case-insensitivity, mismatches, and absence of the claim.
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a security validation in BotApplication.ProcessAsync to ensure the authenticated user’s serviceurl claim matches the incoming activity’s ServiceUrl (case-insensitive), and expands unit test coverage to verify expected behavior for matching, case-only differences, mismatches, and missing claim scenarios.
Changes:
- Add
serviceurl-vs-activityServiceUrlvalidation toBotApplication.ProcessAsync, throwingInvalidDataExceptionon mismatch. - Add unit tests covering match, case-insensitive match, mismatch, and missing-claim behavior.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| core/src/Microsoft.Teams.Core/BotApplication.cs | Adds serviceurl claim validation in the incoming activity processing path. |
| core/test/Microsoft.Teams.Core.UnitTests/BotApplicationTests.cs | Adds unit tests to validate the new claim/ServiceUrl matching behavior. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Record activity types and start spans for each turn, tagging spans with activity details (type, ID, conversation ID, channel ID, bot ID, service URL) to improve observability and diagnostics.
singhk97
approved these changes
Jun 3, 2026
heyitsaamir
reviewed
Jun 3, 2026
heyitsaamir
left a comment
heyitsaamir
left a comment
Collaborator
There was a problem hiding this comment.
It'd be good to double check if this logic works in various settings:
- 1:1
- Group Chats
- Channels
- Threads
heyitsaamir
reviewed
Jun 3, 2026
heyitsaamir
approved these changes
Jun 3, 2026
corinagum
reviewed
Jun 3, 2026
corinagum
reviewed
Jun 3, 2026
corinagum
reviewed
Jun 3, 2026
Changed service URL validation to use StringComparison.Ordinal for a case-sensitive match instead of OrdinalIgnoreCase. This affects how the service URL in the activity is compared to the service URL claim.
Add logging for ServiceUrl mismatches using LogServiceUrlClaimMismatch. Update the exception message for clarity. Refactor test to set Conversation property inline during activity initialization.
singhk97
approved these changes
Jun 4, 2026
Contributor
Author
how so? this is only about claims and serviceUrls, it should not affect any other fields in the payload (and yes, tested without any issue) |
corinagum
approved these changes
Jun 4, 2026
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.
Add validation to ensure the "serviceurl" claim in user claims matches the activity's ServiceUrl (case-insensitive) in BotApplication. Throw InvalidDataException on mismatch. Add unit tests covering matching, case-insensitivity, mismatches, and absence of the claim.