fix(mcp): Direct proxy paths use shared passthrough header utility - #3677
Merged
Conversation
crivetimihai
added
release-fix
This was referenced Mar 14, 2026
cafalchio
previously approved these changes
Mar 14, 2026
cafalchio
left a comment
cafalchio
left a comment
Collaborator
There was a problem hiding this comment.
It is cleaner to use compute_passthrough_headers_cached.
Good test coverage. LGTM
bogdanmariusc10
self-requested a review
March 20, 2026 08:57
bogdanmariusc10
previously approved these changes
Mar 20, 2026
bogdanmariusc10
left a comment
bogdanmariusc10
left a comment
Collaborator
There was a problem hiding this comment.
✅ Verified - Bug Fixed
Tested this PR against the reproduction steps from the bug report.
Setup:
- mcpgateway running from
green-3643-direct-proxybranch viauv run - Gateway configured in
direct_proxymode withSTREAMABLEHTTPtransport - Mock upstream server logging all incoming headers
Test: Sent a tools/list request with X-Upstream-Authorization: Bearer upstream-secret-token and X-Context-Forge-Gateway-Id pointing to the direct proxy gateway.
Result before this PR (on main):
[UPSTREAM] Authorization: None
Result with this PR:
[UPSTREAM] Authorization: Bearer upstream-secret-token
The X-Upstream-Authorization header is now correctly renamed to Authorization and forwarded to the upstream server on tools/list. The fix replaces the manual header loop in _proxy_list_tools_to_gateway, _proxy_list_resources_to_gateway and the resource read proxy with a call to compute_passthrough_headers_cached(), consistent with the tools/call path.
crivetimihai
added
MUST
jonpspri
dismissed stale reviews from bogdanmariusc10 and cafalchio
via
March 26, 2026 20:10
4f951e0
jonpspri
force-pushed
the
green-3643-direct-proxy
branch
from
March 26, 2026 20:10
7970f7b to
4f951e0
Compare
…irect proxy paths Replace manual header loops in _proxy_list_tools_to_gateway, _proxy_list_resources_to_gateway, and _proxy_read_resource_to_gateway with calls to compute_passthrough_headers_cached so that X-Upstream-Authorization → Authorization rename, global passthrough config, and header sanitization are applied consistently. Closes #3643 Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
The function-scoped `app` fixture was causing ~25s setup per test due to repeated mcpgateway.main imports. Module scope matches the existing `app_with_temp_db` fixture and pays the import cost once per module. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com>
…is explicit When a gateway has explicit passthrough_headers (including empty []), use them directly instead of querying the global config cache. This avoids an unnecessary DB round-trip and ensures an explicit empty list does not fall through to the global allowlist. Closes #3643 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com>
jonpspri
force-pushed
the
green-3643-direct-proxy
branch
from
March 26, 2026 22:28
4f951e0 to
b2ea286
Compare
brian-hussey
pushed a commit
that referenced
this pull request
Mar 27, 2026
…3677) * fix(mcp): Use compute_passthrough_headers_cached in Streamable HTTP direct proxy paths Replace manual header loops in _proxy_list_tools_to_gateway, _proxy_list_resources_to_gateway, and _proxy_read_resource_to_gateway with calls to compute_passthrough_headers_cached so that X-Upstream-Authorization → Authorization rename, global passthrough config, and header sanitization are applied consistently. Closes #3643 Signed-off-by: Mihai Criveti <crivetimihai@gmail.com> * fix(test): Widen `app` fixture scope from function to module The function-scoped `app` fixture was causing ~25s setup per test due to repeated mcpgateway.main imports. Module scope matches the existing `app_with_temp_db` fixture and pays the import cost once per module. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com> * fix(mcp): Skip DB lookup for passthrough headers when gateway config is explicit When a gateway has explicit passthrough_headers (including empty []), use them directly instead of querying the global config cache. This avoids an unnecessary DB round-trip and ensures an explicit empty list does not fall through to the global allowlist. Closes #3643 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com> --------- Signed-off-by: Mihai Criveti <crivetimihai@gmail.com> Signed-off-by: Jonathan Springer <jps@s390x.com> Co-authored-by: Jonathan Springer <jps@s390x.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
madhu-mohan-jaishankar
pushed a commit
that referenced
this pull request
Mar 27, 2026
…3677) * fix(mcp): Use compute_passthrough_headers_cached in Streamable HTTP direct proxy paths Replace manual header loops in _proxy_list_tools_to_gateway, _proxy_list_resources_to_gateway, and _proxy_read_resource_to_gateway with calls to compute_passthrough_headers_cached so that X-Upstream-Authorization → Authorization rename, global passthrough config, and header sanitization are applied consistently. Closes #3643 Signed-off-by: Mihai Criveti <crivetimihai@gmail.com> * fix(test): Widen `app` fixture scope from function to module The function-scoped `app` fixture was causing ~25s setup per test due to repeated mcpgateway.main imports. Module scope matches the existing `app_with_temp_db` fixture and pays the import cost once per module. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com> * fix(mcp): Skip DB lookup for passthrough headers when gateway config is explicit When a gateway has explicit passthrough_headers (including empty []), use them directly instead of querying the global config cache. This avoids an unnecessary DB round-trip and ensures an explicit empty list does not fall through to the global allowlist. Closes #3643 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com> --------- Signed-off-by: Mihai Criveti <crivetimihai@gmail.com> Signed-off-by: Jonathan Springer <jps@s390x.com> Co-authored-by: Jonathan Springer <jps@s390x.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
msureshkumar88
pushed a commit
that referenced
this pull request
May 13, 2026
…3677) * fix(mcp): Use compute_passthrough_headers_cached in Streamable HTTP direct proxy paths Replace manual header loops in _proxy_list_tools_to_gateway, _proxy_list_resources_to_gateway, and _proxy_read_resource_to_gateway with calls to compute_passthrough_headers_cached so that X-Upstream-Authorization → Authorization rename, global passthrough config, and header sanitization are applied consistently. Closes #3643 Signed-off-by: Mihai Criveti <crivetimihai@gmail.com> * fix(test): Widen `app` fixture scope from function to module The function-scoped `app` fixture was causing ~25s setup per test due to repeated mcpgateway.main imports. Module scope matches the existing `app_with_temp_db` fixture and pays the import cost once per module. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com> * fix(mcp): Skip DB lookup for passthrough headers when gateway config is explicit When a gateway has explicit passthrough_headers (including empty []), use them directly instead of querying the global config cache. This avoids an unnecessary DB round-trip and ensures an explicit empty list does not fall through to the global allowlist. Closes #3643 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com> --------- Signed-off-by: Mihai Criveti <crivetimihai@gmail.com> Signed-off-by: Jonathan Springer <jps@s390x.com> Co-authored-by: Jonathan Springer <jps@s390x.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
kamath-a
pushed a commit
to kamath-a/mcp-context-forge
that referenced
this pull request
Jun 26, 2026
…BM#3677) * fix(mcp): Use compute_passthrough_headers_cached in Streamable HTTP direct proxy paths Replace manual header loops in _proxy_list_tools_to_gateway, _proxy_list_resources_to_gateway, and _proxy_read_resource_to_gateway with calls to compute_passthrough_headers_cached so that X-Upstream-Authorization → Authorization rename, global passthrough config, and header sanitization are applied consistently. Closes IBM#3643 Signed-off-by: Mihai Criveti <crivetimihai@gmail.com> * fix(test): Widen `app` fixture scope from function to module The function-scoped `app` fixture was causing ~25s setup per test due to repeated mcpgateway.main imports. Module scope matches the existing `app_with_temp_db` fixture and pays the import cost once per module. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com> * fix(mcp): Skip DB lookup for passthrough headers when gateway config is explicit When a gateway has explicit passthrough_headers (including empty []), use them directly instead of querying the global config cache. This avoids an unnecessary DB round-trip and ensures an explicit empty list does not fall through to the global allowlist. Closes IBM#3643 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jonathan Springer <jps@s390x.com> --------- Signed-off-by: Mihai Criveti <crivetimihai@gmail.com> Signed-off-by: Jonathan Springer <jps@s390x.com> Co-authored-by: Jonathan Springer <jps@s390x.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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
4 participants
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
_proxy_list_tools_to_gateway,_proxy_list_resources_to_gateway, and_proxy_read_resource_to_gatewaywith calls tocompute_passthrough_headers_cached()X-Upstream-Authorization→Authorizationrename, global passthrough config, and header sanitization are applied consistently across all direct proxy operations in Streamable HTTP transportCloses #3643
Test plan
test_streamablehttp_transport.pytests passcompute_passthrough_headers_cachedTestProxyUpstreamAuthorizationRenametests cover tools/list, resources/list, resources/read, negative case, and feature-flag-disabled scenarioisortandblackclean