Skip to content

[pull] master from PowerDNS:master #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
May 22, 2026
+7 −3
Merged

[pull] master from PowerDNS:master #819

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc3eb95
Enforce proxy protocol size limit earlier.
miodvallat May 21, 2026
93ff5fb
Merge pull request #17459 from miodvallat/1001nights
rgacogne May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions pdns/tcpreceiver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,18 @@ void TCPNameserver::doConnection(int fd, Logr::log_t slog)
for (;;) {
used = isProxyHeaderComplete(proxyData);
if (used < 0) {
ssize_t origsize = proxyData.size();
proxyData.resize(origsize + -used);
size_t origsize = proxyData.size();
auto extra = static_cast<size_t>(-used);
if (origsize + extra > g_proxyProtocolMaximumSize) {
throw NetworkError("Error reading PROXYv2 header from TCP client "+remote.toString()+": PROXYv2 header too big");
}
proxyData.resize(origsize + extra);
if (maxConnectionDurationReached(d_maxConnectionDuration, start, remainingTime)) {
throw NetworkError("Error reading PROXYv2 header from TCP client "+remote.toString()+": maximum TCP connection duration exceeded");
}

try {
readnWithTimeout(fd, &proxyData[origsize], -used, d_idleTimeout, true, remainingTime);
readnWithTimeout(fd, &proxyData[origsize], extra, d_idleTimeout, true, remainingTime);
}
catch(NetworkError& ae) {
throw NetworkError("Error reading PROXYv2 header from TCP client "+remote.toString()+": "+ae.what());
Expand Down
Loading