Fix server/discover timeout interrupting OAuth#1719
Open
halter73 wants to merge 1 commit into
Open
Conversation
Start the short server/discover timeout only after the request has been sent so OAuth authentication remains governed by the overall initialization timeout. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.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
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
Start
DiscoverProbeTimeoutonly after theserver/discoverrequest has been sent. This keeps transport setup and OAuth authorization under the overallInitializationTimeout, while preserving the short response timeout used to fall back when an older server silently dropsserver/discover.The regression test now deliberately keeps protected-resource metadata discovery in flight longer than the probe timeout and verifies that the fallback paths are requested exactly once.
Main CI failure
This fixes the failure in Build and Test run 29739945453, Ubuntu Debug job 88344129696:
The logs show the initial OAuth flow beginning for
server/discover, then the five-second probe timeout startinginitializebefore the first token exchange completed:That overlap launched a second OAuth flow and repeated protected-resource metadata discovery.
Tests
dotnet build --no-restoreModelContextProtocol.Testssuite on net9.0 (2,286 passed)