Fail on stalled Docker route checks#220
Open
komen205 wants to merge 2 commits into
Open
Conversation
|
|
pimterry
reviewed
May 28, 2026
Per review on httptoolkit#220: - Revert the docker-tunnel-proxy rule callback to its original inline form and drop the per-request DOCKER_PROXY_SETTING_TIMEOUT_MS timeout. The 3s Docker-availability timeout already bounds the network monitor (which awaits isDockerAvailable), so this still fails open: only requests in the first few seconds of a wedged-Docker startup wait, then everything works. - Move the timeout duration into TimeoutError/withTimeout so every timeout reports "Timeout after <n>ms"; isDockerAvailable's catch returns to its original one-line form. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
komen205
force-pushed
the
codex/docker-route-fail-open
branch
from
f7a3e23 to
9782f91
Compare
komen205
changed the title
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
3 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
This makes Docker routing fail open when Docker is unavailable or stalled, so the Docker tunnel proxy setting cannot block unrelated passthrough traffic.
The
docker-tunnel-proxy-*setting is included in the default passthrough rules, which means it can run for browser, Android/ADB, and other non-Docker traffic too. If Docker is present but the daemon is wedged,monitorDockerNetworkAliases()can remain pending and every request that awaits the rule parameter can hang before falling through to a direct connection.Changes
Validation
source ~/.nvm/nvm.sh && nvm use 24.15.0 && npm_config_cache=/tmp/npm-cache-codex npm run test:unitsource ~/.nvm/nvm.sh && nvm use 24.15.0 && npm_config_cache=/tmp/npm-cache-codex npm run build:src:tsI also tried the focused Docker compose integration path locally, but this machine's Docker Desktop setup times out on the fixture's container-local
localhost/127.0.0.1self-calls while cross-container and external calls succeed, so I did not treat that as validation for this patch.