fix(mcp-server): restrict OAuth redirects and CORS#139
Open
dhairyashiil wants to merge 4 commits into
Open
Conversation
|
@dhairyashiil is attempting to deploy a commit to the cal Team on Vercel. A member of the Team first needs to authorize it. |
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
1 issue found across 10 files
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
…hardening # Conflicts: # apps/mcp-server/README.md
…hardening # Conflicts: # apps/mcp-server/README.md
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
1 participant
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
Hardens MCP HTTP/OAuth defaults by rejecting unallowlisted external dynamic-client redirect URIs, keeping loopback redirects for local clients, and resolving CORS to a concrete configured/server origin instead of permissive defaults.
Reviewer notes
ALLOWED_REDIRECT_HOSTSfor every legitimate external OAuth callback host.ALLOW_OPEN_REDIRECT_REGISTRATION=trueis documented as unsafe/dev-only and should not be enabled in hosted production.CORS_ORIGINif browser clients call MCP from a different origin thanMCP_SERVER_URL.Validation
bun --filter @calcom/mcp-server test -- src/auth/oauth-handlers.test.ts src/utils/http-security.test.tsbun --filter @calcom/mcp-server testbun --filter @calcom/mcp-server typecheckbun --filter @calcom/mcp-server buildgit diff --check HEAD~1..HEAD