Repository navigation
[PR] fix(proxy): apply configured CA trust to both TLS connectors - #6583
Merged
ranxianglei merged 1 commit intoNov 14, 2026
Merged
Conversation
This was referenced Nov 13, 2026
This was referenced Nov 14, 2026
Owner
|
Superseded by #6677 (merged as Landed into master via the real merge commit The fix for #6582 is now in master. Closing this PR as superseded — thanks for the careful, well-tested fix. |
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.
Fixes #6582
Problem
Configured private CA roots never reach the actual TLS connectors used for proxied model requests. Undici replaces the top-level
connectoption inside ProxyAgent, and the raw HTTPS CONNECT helper does not pass the configured roots. This leaves private upstream endpoints and HTTPS proxies unavailable even with a correctBILI_CA_FILE.Change
Pass the existing merged CA bundle as
requestTls.caandproxyTls.cafor ProxyAgent, and ascafor the raw HTTPS-proxy socket. No certificate or hostname verification is disabled. An absent custom CA retains the platform defaults. The shared outbound transport serves both plugin and proxy modes; no wire/message or kernel change is involved.Verification
e1f31ad9d5b47500362699a9867819b861c7de96: all four trusted proxy scenarios fail; five rejection controls pass.git diff --checkpass.Prior work and duplicate screening are recorded in the linked issue. This touches CA propagation, so the repository's normal security review gate applies.