From: Remi Gacogne Date: Tue, 23 Mar 2021 14:22:09 +0000 (+0100) Subject: dnsdist: Fix the handling of DoH queries with a non-zero ID X-Git-Tag: rec-4.5.0-beta1~2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10208%2Fhead;p=thirdparty%2Fpdns.git dnsdist: Fix the handling of DoH queries with a non-zero ID rfc8484 states that clients "SHOULD use a DNS ID of 0 in every DNS request", not MUST, so it does indeed happen. The issue was introduced in 341d2553b74c579df9d9843959f3ca6f5c3dc954 when we moved to a safer PacketBuffer. --- diff --git a/pdns/dnsdistdist/doh.cc b/pdns/dnsdistdist/doh.cc index 3d6d8cfc98..682f626940 100644 --- a/pdns/dnsdistdist/doh.cc +++ b/pdns/dnsdistdist/doh.cc @@ -535,7 +535,7 @@ static int processDOHQuery(DOHUnit* du) ids->du = du; ids->cs = &cs; - ids->origID = queryId; + ids->origID = htons(queryId); setIDStateFromDNSQuestion(*ids, dq, std::move(qname)); dq.getHeader()->id = idOffset; diff --git a/regression-tests.dnsdist/test_DOH.py b/regression-tests.dnsdist/test_DOH.py index b19d159f62..861c3983ca 100644 --- a/regression-tests.dnsdist/test_DOH.py +++ b/regression-tests.dnsdist/test_DOH.py @@ -216,6 +216,33 @@ class TestDOH(DNSDistDOHTest): self.assertEquals(response, receivedResponse) self.checkHasHeader('cache-control', 'max-age=3600') + def testDOHTransactionID(self): + """ + DOH: Simple query with ID != 0 + """ + name = 'simple-with-non-zero-id.doh.tests.powerdns.com.' + query = dns.message.make_query(name, 'A', 'IN', use_edns=False) + query.id = 42 + expectedQuery = dns.message.make_query(name, 'A', 'IN', use_edns=True, payload=4096) + expectedQuery.id = 0 + response = dns.message.make_response(query) + rrset = dns.rrset.from_text(name, + 3600, + dns.rdataclass.IN, + dns.rdatatype.A, + '127.0.0.1') + response.answer.append(rrset) + + (receivedQuery, receivedResponse) = self.sendDOHQuery(self._dohServerPort, self._serverName, self._dohBaseURL, query, response=response, caFile=self._caCert) + self.assertTrue(receivedQuery) + self.assertTrue(receivedResponse) + receivedQuery.id = expectedQuery.id + self.assertEquals(expectedQuery, receivedQuery) + self.checkQueryEDNSWithoutECS(expectedQuery, receivedQuery) + self.assertEquals(response, receivedResponse) + # just to be sure the ID _is_ checked + self.assertEquals(response.id, receivedResponse.id) + def testDOHSimplePOST(self): """ DOH: Simple POST query