Add validation for Cosmos query command#524
Merged
xiangyan99 merged 24 commits intomainfrom Oct 2, 2025
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR adds validation for Cosmos DB query commands to ensure only safe, read-only SELECT statements can be executed. The validation prevents execution of potentially dangerous SQL operations like INSERT, UPDATE, DELETE, and DDL statements.
Key changes:
- Implements a comprehensive CosmosQueryValidator class with security-focused query validation
- Integrates validation into the ItemQueryCommand to validate user-provided queries
- Adds extensive unit tests covering various query scenarios and edge cases
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| tools/Azure.Mcp.Tools.Cosmos/src/Validation/CosmosQueryValidator.cs | New validator class that ensures only safe SELECT queries are allowed |
| tools/Azure.Mcp.Tools.Cosmos/src/Commands/ItemQueryCommand.cs | Integrates query validation for user-provided queries while skipping validation for default queries |
| tools/Azure.Mcp.Tools.Cosmos/tests/Azure.Mcp.Tools.Cosmos.UnitTests/CosmosQueryValidatorTests.cs | Comprehensive test suite covering valid queries, security threats, and edge cases |
| servers/Azure.Mcp.Server/CHANGELOG.md | Documents the addition of query validation feature |
neildsh
reviewed
Sep 24, 2025
Member
Author
|
/check-enforcer reset |
Contributor
|
/azp run mcp - pullrequest |
Contributor
|
/azp run mcp - pullrequest - live |
|
Azure Pipelines successfully started running 1 pipeline(s). |
1 similar comment
|
Azure Pipelines successfully started running 1 pipeline(s). |
anuchandy
reviewed
Oct 2, 2025
anuchandy
approved these changes
Oct 2, 2025
colbytimm
pushed a commit
to colbytimm/microsoft-mcp
that referenced
this pull request
Dec 8, 2025
* Add valition for query command * update * update * update * update * update * update * update * Add valition for query command * update * update * update * update * update * updates * update * update * update * update
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.
What does this PR do?
[Provide a clear, concise description of the changes]CosmosDB SQL has only SELECT statements based on the grammar. However, stored procs and triggers can be used to modify documents. Here's a reference: https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/how-to-write-stored-procedures-triggers-udfs?tabs=javascript
based on this, we add validation to block just those patterns.
[Any additional context, screenshots, or information that helps reviewers]GitHub issue number?
[Link to the GitHub issue this PR addresses]https://github.com/microsoft/mcp-pr/issues/10
Pre-merge Checklist
servers/Azure.Mcp.Server/CHANGELOG.mdand/orservers/Fabric.Mcp.Server/CHANGELOG.mdfor product changes (features, bug fixes, UI/UX, updated dependencies)servers/Azure.Mcp.Server/README.mdand/orservers/Fabric.Mcp.Server/README.mddocumentation/docs/azmcp-commands.mdand/or/docs/fabric-commands.mdToolDescriptionEvaluatorand obtained a score of0.4or more and a top 3 ranking for all related test prompts/docs/e2eTestPrompts.mdcrypto mining, spam, data exfiltration, etc.)/azp run mcp - pullrequest - liveto run Live Test Pipeline