fix(server): require a numeric port for Host/Origin :* allowlist entries - #3465
fix(server): require a numeric port for Host/Origin :* allowlist entries#3465Oskii wants to merge 1 commit into
Conversation
The wildcard matcher used startswith(base + ":"), so wild.example:9000.evil was accepted for wild.example:*. Require the suffix to be digits. Fixes modelcontextprotocol#3463
|
This PR has been closed automatically. This repo only keeps pull requests open when they come from a maintainer, or from a contributor a maintainer has assigned to the linked issue, and you aren't currently assigned to #3463. If a maintainer assigns you to #3463, this PR reopens on its own and there's nothing more you need to do here. Assignment is a maintainer call based on capacity; comments that only ask to be assigned don't factor in. What does help is engaging on the issue itself by confirming the repro, explaining why it matters for your use case, or describing the approach you'd take. You're welcome to keep pushing commits here (just avoid force-pushing, since GitHub can't reopen a rewritten branch), but that on its own won't get the PR reviewed or the issue assigned, and realistically most auto-closed PRs stay closed. There's no need to open a new PR either way. CONTRIBUTING.md has the full reasoning, but in short:
Maintainers: reopen, remove |
Fixes #3463
What
HTTP transports can enable DNS rebinding protection with
allowed_hosts/allowed_origins. An entry that ends in:*is meant to allow any port on that host or origin.The matcher was a prefix check:
So
allowed_hosts=["wild.example:*"]also acceptedwild.example:9000.evil. The same form accepted Originhttp://wild.example:9000.evilforhttp://wild.example:*.Existing tests only used a numeric port (
wild.example:9000). After the fix, the suffix afterbase:must be digits.wild.example:9000still passes.wild.example:9000.eviland an empty port do not.Why
I was reading
TransportSecurityMiddlewarenext totests/server/test_transport_security.py. The wildcard cases only coverwild.example:9000. I tried a Host that starts with that prefix and keeps going (wild.example:9000.evil) andvalidate_requestreturnedNone.This matters when someone turns protection on and trusts
:*to mean "this host, any port". A client that can set Host or Origin can satisfy the allowlist with a longer value.How
Share one helper:
base:*matches onlybase:<digits>. Host and Origin both use it. No new settings.Testing
Added
host-wildcard-suffix-rejected,host-wildcard-empty-port, andorigin-wildcard-suffix-rejectedtotest_validate_request_checks_host_then_origin.29 passed.
Written with AI assistance. I read the matcher, reproduced the suffix case, and kept the existing numeric-port tests.