Skip to content

dnsdist: Include a Date: response header for rejected HTTP1 requests #16375

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
merged 1 commit into from
Nov 3, 2025
+14 −2
Merged

dnsdist: Include a Date: response header for rejected HTTP1 requests #16375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions pdns/dnsdistdist/dnsdist-nghttp2-in.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,20 @@ bool IncomingHTTP2Connection::checkALPN()
++d_ci.cs->dohFrontend->d_http1Stats.d_nbQueries;
}

const std::string data("HTTP/1.1 400 Bad Request\r\nConnection: Close\r\n\r\n<html><body>This server implements RFC 8484 - DNS Queries over HTTP, and requires HTTP/2 in accordance with section 5.2 of the RFC.</body></html>\r\n");
d_out.insert(d_out.end(), data.begin(), data.end());
static const std::string data0("HTTP/1.1 400 Bad Request\r\nConnection: Close\r\n");

std::array<char, 40> data1{};
static const std::string dateformat("Date: %a, %d %h %Y %T GMT\r\n");
struct tm tmval{};
time_t timestamp = time(nullptr);
size_t len = strftime(data1.data(), data1.size(), dateformat.data(), gmtime_r(&timestamp, &tmval));
assert(len != 0);
Copy link
Contributor

@miodvallat miodvallat Oct 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure you want to keep that assert? Maybe simply skip the d_out.insert(..., data1)) in this case.

Copy link
Member Author

@omoerbeek omoerbeek Oct 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I want to keep the assert, it means the buffer was too small. Getting a very clear message is better than having to debug why the Date header is missing.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good until the year 1000000


static const std::string data2("\r\n<html><body>This server implements RFC 8484 - DNS Queries over HTTP, and requires HTTP/2 in accordance with section 5.2 of the RFC.</body></html>\r\n");

d_out.insert(d_out.end(), data0.begin(), data0.end());
d_out.insert(d_out.end(), data1.begin(), data1.begin() + len);
d_out.insert(d_out.end(), data2.begin(), data2.end());
writeToSocket(false);

vinfolog("DoH connection from %s expected ALPN value 'h2', got '%s'", d_ci.remote.toStringWithPort(), std::string(protocols.begin(), protocols.end()));
Expand Down