return true;
}
-static bool slowParseEDNSOptions(const PacketBuffer& packet, EDNSOptionViewMap& options)
-{
- if (packet.size() < sizeof(dnsheader)) {
- return false;
- }
-
- const dnsheader_aligned dnsHeader(packet.data());
-
- if (ntohs(dnsHeader->qdcount) == 0) {
- return false;
- }
-
- if (ntohs(dnsHeader->arcount) == 0) {
- throw std::runtime_error("slowParseEDNSOptions() should not be called for queries that have no EDNS");
- }
-
- try {
- uint64_t numrecords = ntohs(dnsHeader->ancount) + ntohs(dnsHeader->nscount) + ntohs(dnsHeader->arcount);
- // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast,cppcoreguidelines-pro-type-const-cast)
- DNSPacketMangler dpm(const_cast<char*>(reinterpret_cast<const char*>(packet.data())), packet.size());
- uint64_t index{};
- for (index = 0; index < ntohs(dnsHeader->qdcount); ++index) {
- dpm.skipDomainName();
- /* type and class */
- dpm.skipBytes(4);
- }
-
- for (index = 0; index < numrecords; ++index) {
- dpm.skipDomainName();
-
- uint8_t section = index < ntohs(dnsHeader->ancount) ? 1 : (index < (ntohs(dnsHeader->ancount) + ntohs(dnsHeader->nscount)) ? 2 : 3);
- uint16_t dnstype = dpm.get16BitInt();
- dpm.get16BitInt();
- dpm.skipBytes(4); /* TTL */
-
- if (section == 3 && dnstype == QType::OPT) {
- uint32_t offset = dpm.getOffset();
- if (offset >= packet.size()) {
- return false;
- }
- /* if we survive this call, we can parse it safely */
- dpm.skipRData();
- // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
- return getEDNSOptions(reinterpret_cast<const char*>(&packet.at(offset)), packet.size() - offset, options) == 0;
- }
- dpm.skipRData();
- }
- }
- catch (...) {
- return false;
- }
-
- return true;
-}
-
int locateEDNSOptRR(const PacketBuffer& packet, uint16_t* optStart, size_t* optLen, bool* last)
{
if (optStart == nullptr || optLen == nullptr || last == nullptr) {
#include "dns.hh"
#include "ednsoptions.hh"
#include "iputils.hh"
+#include "dnsparser.hh"
bool getNextEDNSOption(const char* data, size_t dataLen, uint16_t& optionCode, uint16_t& optionLen)
{
return ENOENT;
}
+bool slowParseEDNSOptions(const PacketBuffer& packet, EDNSOptionViewMap& options)
+{
+ if (packet.size() < sizeof(dnsheader)) {
+ return false;
+ }
+
+ const dnsheader_aligned dnsHeader(packet.data());
+
+ if (ntohs(dnsHeader->qdcount) == 0) {
+ return false;
+ }
+
+ if (ntohs(dnsHeader->arcount) == 0) {
+ throw std::runtime_error("slowParseEDNSOptions() should not be called for queries that have no EDNS");
+ }
+
+ try {
+ uint64_t numrecords = ntohs(dnsHeader->ancount) + ntohs(dnsHeader->nscount) + ntohs(dnsHeader->arcount);
+ // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast,cppcoreguidelines-pro-type-const-cast)
+ DNSPacketMangler dpm(const_cast<char*>(reinterpret_cast<const char*>(packet.data())), packet.size());
+ uint64_t index{};
+ for (index = 0; index < ntohs(dnsHeader->qdcount); ++index) {
+ dpm.skipDomainName();
+ /* type and class */
+ dpm.skipBytes(4);
+ }
+
+ for (index = 0; index < numrecords; ++index) {
+ dpm.skipDomainName();
+
+ uint8_t section = index < ntohs(dnsHeader->ancount) ? 1 : (index < (ntohs(dnsHeader->ancount) + ntohs(dnsHeader->nscount)) ? 2 : 3);
+ uint16_t dnstype = dpm.get16BitInt();
+ dpm.get16BitInt();
+ dpm.skipBytes(4); /* TTL */
+
+ if (section == 3 && dnstype == QType::OPT) {
+ uint32_t offset = dpm.getOffset();
+ if (offset >= packet.size()) {
+ return false;
+ }
+ /* if we survive this call, we can parse it safely */
+ dpm.skipRData();
+ // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+ return getEDNSOptions(reinterpret_cast<const char*>(&packet.at(offset)), packet.size() - offset, options) == 0;
+ }
+ dpm.skipRData();
+ }
+ }
+ catch (...) {
+ return false;
+ }
+
+ return true;
+}
+
/* extract all EDNS0 options from a pointer on the beginning rdLen of the OPT RR */
int getEDNSOptions(const char* optRR, const size_t len, EDNSOptionViewMap& options)
{
#pragma once
#include "namespaces.hh"
+#include "noinitvector.hh"
+
struct EDNSOptionCode
{
enum EDNSOptionCodeEnum {NSID=3, DAU=5, DHU=6, N3U=7, ECS=8, EXPIRE=9, COOKIE=10, TCPKEEPALIVE=11, PADDING=12, CHAIN=13, KEYTAG=14, EXTENDEDERROR=15};
bool getNextEDNSOption(const char* data, size_t dataLen, uint16_t& optionCode, uint16_t& optionLen);
void generateEDNSOption(uint16_t optionCode, const std::string& payload, std::string& res);
+bool slowParseEDNSOptions(const PacketBuffer& packet, EDNSOptionViewMap& options);
thread_local TCPOutConnectionManager t_tcp_manager;
std::shared_ptr<Logr::Logger> g_slogout;
bool g_paddingOutgoing;
+bool g_ECSHardening{false};
void remoteLoggerQueueData(RemoteLoggerInterface& rli, const std::string& data)
{
if (EDNS0Level > 0 && getEDNSOpts(mdp, &edo)) {
lwr->d_haveEDNS = true;
- // If we sent out ECS, we can also expect to see a return with or without ECS, the absent case is
- // not handled explicitly. If we do see a ECS in the reply, the source part *must* match with
- // what we sent out. See https://www.rfc-editor.org/rfc/rfc7871#section-7.3
+ // If we sent out ECS, we can also expect to see a return with or without ECS, the absent case
+ // is not handled explicitly. In hardening mode, if we do see a ECS in the reply, the source
+ // part *must* match with what we sent out. See
+ // https://www.rfc-editor.org/rfc/rfc7871#section-7.3
if (subnetOpts) {
for (const auto& opt : edo.d_options) {
if (opt.first == EDNSOptionCode::ECS) {
EDNSSubnetOpts reso;
if (getEDNSSubnetOptsFromString(opt.second, &reso)) {
- if (!(reso.source == subnetOpts->source)) {
+ if (g_ECSHardening && !(reso.source == subnetOpts->source)) {
g_slogout->info(Logr::Notice, "Incoming ECS does not match outgoing",
"server", Logging::Loggable(address),
"qname", Logging::Loggable(domain),
extern std::shared_ptr<Logr::Logger> g_slogout;
extern bool g_paddingOutgoing;
+extern bool g_ECSHardening;
class LWResException : public PDNSException
{
OSLimitError = 3,
Spoofed = 4, /* Spoofing attempt (too many near-misses) */
ChainLimitError = 5,
+ ECSMissing = 6,
};
[[nodiscard]] static bool isLimitError(Result res)
#include "rec-taskqueue.hh"
#include "shuffle.hh"
#include "validate-recursor.hh"
-
#include "ratelimitedlog.hh"
+#include "ednsoptions.hh"
#ifdef HAVE_SYSTEMD
#include <systemd/sd-daemon.h>
else {
PacketBuffer empty;
g_multiTasker->sendEvent(pident, &empty);
- // cerr<<"Had some kind of error: "<<ret<<", "<<stringerror()<<endl;
}
}
if (ecs) {
pident->ecsSubnet = ecs->source;
}
- // We cannot merge ECS-enabled queries based on the ECS source only, as the scope
- // of the response might be narrower, so instead we do not chain ECS-enabled queries
- // at all.
- if (true || !ecs) {
- // See if there is an existing outstanding request we can chain on to, using partial equivalence
- // function looking for the same query (qname and qtype) to the same host, but with a different
- // message ID.
- auto chain = g_multiTasker->getWaiters().equal_range(pident, PacketIDBirthdayCompare());
- for (; chain.first != chain.second; chain.first++) {
- // Line below detected an issue with the two ways of ordering PacketIDs (birthday and non-birthday)
- assert(chain.first->key->domain == pident->domain); // NOLINT
- // don't chain onto existing chained waiter or a chain already processed
- if (chain.first->key->fd > -1 && !chain.first->key->closed) {
- auto currentChainSize = chain.first->key->authReqChain.size();
- *fileDesc = -static_cast<int>(currentChainSize + 1); // value <= -1, gets used in waitEvent / sendEvent later on
- if (g_maxChainLength > 0 && currentChainSize >= g_maxChainLength) {
- return LWResult::Result::ChainLimitError;
- }
- assert(uSec(chain.first->key->creationTime) != 0); // NOLINT
- auto age = now - chain.first->key->creationTime;
- if (uSec(age) > static_cast<uint64_t>(1000) * authWaitTimeMSec(g_multiTasker) * 2 / 3) {
- return LWResult::Result::ChainLimitError;
- }
- chain.first->key->authReqChain.emplace(*fileDesc, qid); // we can chain
- auto maxLength = t_Counters.at(rec::Counter::maxChainLength);
- if (currentChainSize + 1 > maxLength) {
- t_Counters.at(rec::Counter::maxChainLength) = currentChainSize + 1;
- }
- return LWResult::Result::Success;
+ // See if there is an existing outstanding request we can chain on to, using partial equivalence
+ // function looking for the same query (qname, qtype and ecs if applicable) to the same host, but
+ // with a different message ID.
+ auto chain = g_multiTasker->getWaiters().equal_range(pident, PacketIDBirthdayCompare());
+
+ for (; chain.first != chain.second; chain.first++) {
+ // Line below detected an issue with the two ways of ordering PacketIDs (birthday and non-birthday)
+ assert(chain.first->key->domain == pident->domain); // NOLINT
+ // don't chain onto existing chained waiter or a chain already processed
+ if (chain.first->key->fd > -1 && !chain.first->key->closed) {
+ auto currentChainSize = chain.first->key->authReqChain.size();
+ *fileDesc = -static_cast<int>(currentChainSize + 1); // value <= -1, gets used in waitEvent / sendEvent later on
+ if (g_maxChainLength > 0 && currentChainSize >= g_maxChainLength) {
+ return LWResult::Result::ChainLimitError;
}
+ assert(uSec(chain.first->key->creationTime) != 0); // NOLINT
+ auto age = now - chain.first->key->creationTime;
+ if (uSec(age) > static_cast<uint64_t>(1000) * authWaitTimeMSec(g_multiTasker) * 2 / 3) {
+ return LWResult::Result::ChainLimitError;
+ }
+ chain.first->key->authReqChain.emplace(*fileDesc, qid); // we can chain
+ auto maxLength = t_Counters.at(rec::Counter::maxChainLength);
+ if (currentChainSize + 1 > maxLength) {
+ t_Counters.at(rec::Counter::maxChainLength) = currentChainSize + 1;
+ }
+ return LWResult::Result::Success;
}
}
len = packet.size();
+ if (g_ECSHardening && pident->ecsSubnet && !*pident->ecsReceived) {
+ t_Counters.at(rec::Counter::ecsMissingCount)++;
+ return LWResult::Result::ECSMissing;
+ }
if (nearMissLimit > 0 && pident->nearMisses > nearMissLimit) {
/* we have received more than nearMissLimit answers on the right IP and port, from the right source (we are using connected sockets),
for the correct qname and qtype, but with an unexpected message ID. That looks like a spoofing attempt. */
}
}
else {
- // cerr<<t_id<<" had error: "<<stringerror()<<endl;
if (firstQuery && errno == EAGAIN) {
t_Counters.at(rec::Counter::noPacketError)++;
}
}
// resend event to everybody chained onto it
-static void doResends(MT_t::waiters_t::iterator& iter, const std::shared_ptr<PacketID>& resend, const PacketBuffer& content)
+static void doResends(MT_t::waiters_t::iterator& iter, const std::shared_ptr<PacketID>& resend, const PacketBuffer& content, const std::optional<bool>& ecsReceived)
{
// We close the chain for new entries, since they won't be processed anyway
iter->key->closed = true;
return;
}
+ if (ecsReceived) {
+ iter->key->ecsReceived = ecsReceived;
+ }
+
auto maxWeight = t_Counters.at(rec::Counter::maxChainWeight);
auto weight = iter->key->authReqChain.size() * content.size();
if (weight > maxWeight) {
assert(g_multiTasker->waitEvent(neverHappens, nullptr, jitterMsec) != -1); // NOLINT
}
+static bool checkIncomingECSSource(const PacketBuffer& packet, const Netmask& subnet)
+{
+ bool foundMatchingECS = false;
+
+ // We sent out ECS, check if the response has the expected ECS info
+ EDNSOptionViewMap ednsOptions;
+ if (slowParseEDNSOptions(packet, ednsOptions)) {
+ // check content
+ auto option = ednsOptions.find(EDNSOptionCode::ECS);
+ if (option != ednsOptions.end()) {
+ // found an ECS option
+ EDNSSubnetOpts ecs;
+ for (const auto& value : option->second.values) {
+ if (getEDNSSubnetOptsFromString(value.content, value.size, &ecs)) {
+ if (ecs.source == subnet) {
+ foundMatchingECS = true;
+ }
+ }
+ break; // only look at first
+ }
+ }
+ }
+ return foundMatchingECS;
+}
+
static void handleUDPServerResponse(int fileDesc, FDMultiplexer::funcparam_t& var)
{
auto pid = boost::any_cast<std::shared_ptr<PacketID>>(var);
PacketBuffer empty;
auto iter = g_multiTasker->getWaiters().find(pid);
if (iter != g_multiTasker->getWaiters().end()) {
- doResends(iter, pid, empty);
+ doResends(iter, pid, empty, false);
}
g_multiTasker->sendEvent(pid, &empty); // this denotes error (does retry lookup using other NS)
return;
if (!pident->domain.empty()) {
auto iter = g_multiTasker->getWaiters().find(pident);
if (iter != g_multiTasker->getWaiters().end()) {
- doResends(iter, pident, packet);
+ if (g_ECSHardening) {
+ iter->key->ecsReceived = iter->key->ecsSubnet && checkIncomingECSSource(packet, *iter->key->ecsSubnet);
+ }
+ doResends(iter, pident, packet, iter->key->ecsReceived);
}
}
// be a bit paranoid here since we're weakening our matching
if (pident->domain.empty() && !d_waiter.key->domain.empty() && pident->type == 0 && d_waiter.key->type != 0 && pident->id == d_waiter.key->id && d_waiter.key->remote == pident->remote) {
- // cerr<<"Empty response, rest matches though, sending to a waiter"<<endl;
pident->domain = d_waiter.key->domain;
pident->type = d_waiter.key->type;
goto retryWithName; // note that this only passes on an error, lwres will still reject the packet NOLINT(cppcoreguidelines-avoid-goto)
maxChainLength,
maxChainWeight,
chainLimits,
+ ecsMissingCount,
numberOfCounters
};
LOG(prefix << qname << ": Query handled by Lua" << endl);
}
else {
- ednsmask = getEDNSSubnetMask(qname, remoteIP);
- if (ednsmask) {
- LOG(prefix << qname << ": Adding EDNS Client Subnet Mask " << ednsmask->toString() << " to query" << endl);
- s_ecsqueries++;
- }
- updateQueryCounts(prefix, qname, remoteIP, doTCP, doDoT);
- resolveret = asyncresolveWrapper(remoteIP, d_doDNSSEC, qname, auth, qtype.getCode(),
- doTCP, sendRDQuery, &d_now, ednsmask, &lwr, &chained, nsName); // <- we go out on the wire!
- ednsStats(ednsmask, qname, prefix);
+ bool sendECSIfRelevant = true;
+ for (int count = 0; count < 2; ++count) {
+ ednsmask = sendECSIfRelevant ? getEDNSSubnetMask(qname, remoteIP) : boost::none;
+ if (ednsmask) {
+ LOG(prefix << qname << ": Adding EDNS Client Subnet Mask " << ednsmask->toString() << " to query" << endl);
+ s_ecsqueries++;
+ }
+ updateQueryCounts(prefix, qname, remoteIP, doTCP, doDoT);
+ resolveret = asyncresolveWrapper(remoteIP, d_doDNSSEC, qname, auth, qtype.getCode(),
+ doTCP, sendRDQuery, &d_now, ednsmask, &lwr, &chained, nsName); // <- we go out on the wire!
+ ednsStats(ednsmask, qname, prefix);
+ if (resolveret == LWResult::Result::ECSMissing) {
+ if (sendECSIfRelevant) {
+ sendECSIfRelevant = false;
+ LOG(prefix << qname << ": Answer has no ECS, trying again without EDNS Client Subnet Mask" << endl);
+ continue;
+ }
+ assert(0); // should not happen
+ }
+ break; // when no ECS shenanigans happened, only one pass through the loop
+ }
}
/* preoutquery killed the query by setting dq.rcode to -3 */
bool inIncompleteOkay{false};
uint16_t id{0}; // wait for a specific id/remote pair
uint16_t type{0}; // and this is its type
+ std::optional<bool> ecsReceived; // only set in ecsHardened mode
TCPAction highState{TCPAction::DoingRead};
IOState lowState{IOState::NeedRead};
projects / thirdparty / pdns.git / commitdiff
