Repository navigation
Conversation
There was a problem hiding this comment.
🟡 Changes recommended
The changes leave a test assertion that fails on big-endian hosts and cause unsupported AF_UNIX headers to report pathname bytes as an IP address and port.
2 open issues
What changed in this PR
This PR updates PROXY v2 parsing to accept trailing TLVs, addressing connection hangs for IPv6 clients behind HAProxy.
Changes:
- Limits the payload copy to the address buffer size while consuming the full header.
- Adds IPv4/IPv6 ALPN TLV and truncated-payload tests.
- Runs the new parser tests in the default test target.
| File | Description |
|---|---|
tests/ProxyParser.cpp |
Adds regression tests for TLV handling and incomplete payloads. |
tests/Makefile |
Builds and runs the new parser tests with AddressSanitizer. |
src/ProxyParser.h |
Removes the payload-size rejection and bounds the address copy. |
Review effort: Balanced
| memcpy(&addr, data.data() + 16, hostLength); | ||
| /* The address block may be followed by TLVs (such as ALPN from | ||
| * HAProxy), which we consume but do not keep */ | ||
| memcpy(&addr, data.data() + 16, hostLength < sizeof(proxy_addr) ? hostLength : sizeof(proxy_addr)); |
| assert(v6Done); | ||
| assert(v6Consumed == v6.length()); | ||
| assert(v6Parser.getSourceAddress() == std::string_view(ipv6.data(), 16)); | ||
| assert(v6Parser.getSourcePort() == 0x901f); |
This branch has not been deployed
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 #1957. Thanks to @slavslavov for the detailed report.
A PROXY v2 payload is the address block followed by optional TLVs.
ProxyParser::parse()rejected any payload longer thansizeof(proxy_addr)(36 bytes), and a rejected header looks like "need more data" toHttpParser, so the connection just hangs. HAProxy'ssend-proxy-v2adds an ALPN TLV for ALPN clients, which puts every IPv6 client at 36 + 5 bytes, so they all hang behind HAProxy.The parser now copies at most
sizeof(proxy_addr)bytes of the payload and still consumes the whole16 + len, so TLVs are skipped. The existing check that all16 + lenbytes have arrived stays as it is.Adds
tests/ProxyParser.cpp(wired intotests/Makefile): IPv6 and IPv4 headers with an ALPN TLV parse, report the right source address and port, and consume the TLV; a truncated header still waits for more data. The IPv6 case fails without the change.HttpParser.cppalso still builds and passes with-DUWS_WITH_PROXY.Replaces #1962, which got closed when my fork was accidentally detached.