fix(macos): close UDP ConnectionTask on redirector EOF - #326
Open
BetterAndBetterII wants to merge 1 commit into
Open
fix(macos): close UDP ConnectionTask on redirector EOF#326BetterAndBetterII wants to merge 1 commit into
BetterAndBetterII wants to merge 1 commit into
Conversation
Some(packet) = stream.next() ignored None, so UDP flows closed before the first datagram never got ConnectionEstablished/CloseConnection and leaked the UnixStream forever (EMFILE under DNS-heavy local redirect). Treat stream EOF like CloseConnection: state.close(); break. Regression tests cover EOF before and after the first datagram. Fixes mitmproxy/mitmproxy#8412
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
1 participant
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
In macOS local redirect mode,
ConnectionTask::handle_udpusedSome(packet) = stream.next(), so redirector EOF (None) disabled thatselect!arm. When a UDP flow ended before its first datagram,ConnectionEstablishedwas never sent, Python never sentCloseConnection, and theUnixStreamleaked for the process lifetime (EMFILE under DNS-heavy traffic).Treat stream EOF like
CloseConnection:state.close(); break;so the task drops the socket.Fixes mitmproxy/mitmproxy#8412 (UDP counterpart of the TCP leak class fixed in #260 / mitmproxy#7675).
Test plan
cargo test -p mitmproxy --lib packet_sources::macos::testsudp_eof_before_first_datagram_completes(timed out before fix)udp_eof_after_first_datagram_completes(timed out before fix)