mirror of https://github.com/c-ares/c-ares.git
Parse SOA records from ns_t_any response (#103)
Added the capability of parsing SOA record from a response buffer of ns_t_any type query, this implementation doesn't interfere with existing T_SOA query's response as that too is treated as a list of records. The function returns ARES_EBADRESP if no SOA record is found(as per RFC). The basic idea of sticking to RFC that a ns_t_any too should return an SOA record is something open for discussion but I have kept the functionality intact as it was previously i.e the function returns ARES_EBADRESP if it doesn't find a SOA record regardless of which response it is parsing i.e. T_SOA or T_ANY. Note that asking for T_ANY is generally a bad idea: - https://blog.cloudflare.com/what-happened-next-the-deprecation-of-any/ - https://tools.ietf.org/html/draft-ietf-dnsop-refuse-any Bug: #102 Fix By: Dron Rathore (@DronRathore)pull/310/head
Dron Rathore
5 years ago
committed by
GitHub
parent
49894389fd
commit
e0517f97d9
4 changed files with 210 additions and 50 deletions
@ -0,0 +1,111 @@ |
||||
#include "ares-test.h" |
||||
#include "dns-proto.h" |
||||
|
||||
#include <sstream> |
||||
#include <vector> |
||||
|
||||
namespace ares { |
||||
namespace test { |
||||
|
||||
TEST_F(LibraryTest, ParseSoaAnyReplyOK) { |
||||
DNSPacket pkt; |
||||
pkt.set_qid(0x1234).set_response().set_aa() |
||||
.add_question(new DNSQuestion("example.com", ns_t_any))\
|
||||
.add_answer(new DNSARR("example.com", 0x01020304, {2,3,4,5})) |
||||
.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com")) |
||||
.add_answer(new DNSMxRR("example.com", 100, 200, "mx2.example.com")) |
||||
.add_answer(new DNSSoaRR("example.com", 100, |
||||
"soa1.example.com", "fred.example.com", |
||||
1, 2, 3, 4, 5)); |
||||
std::vector<byte> data = pkt.data(); |
||||
|
||||
struct ares_soa_reply* soa = nullptr; |
||||
EXPECT_EQ(ARES_SUCCESS, ares_parse_soa_reply(data.data(), data.size(), &soa)); |
||||
ASSERT_NE(nullptr, soa); |
||||
EXPECT_EQ("soa1.example.com", std::string(soa->nsname)); |
||||
EXPECT_EQ("fred.example.com", std::string(soa->hostmaster)); |
||||
EXPECT_EQ(1, soa->serial); |
||||
EXPECT_EQ(2, soa->refresh); |
||||
EXPECT_EQ(3, soa->retry); |
||||
EXPECT_EQ(4, soa->expire); |
||||
EXPECT_EQ(5, soa->minttl); |
||||
ares_free_data(soa); |
||||
} |
||||
|
||||
TEST_F(LibraryTest, ParseSoaAnyReplyErrors) { |
||||
DNSPacket pkt; |
||||
pkt.set_qid(0x1234).set_response().set_aa() |
||||
.add_question(new DNSQuestion("example.com", ns_t_any)) |
||||
.add_answer(new DNSSoaRR("example.com", 100, |
||||
"soa1.example.com", "fred.example.com", |
||||
1, 2, 3, 4, 5)); |
||||
std::vector<byte> data; |
||||
struct ares_soa_reply* soa = nullptr; |
||||
|
||||
// No question.
|
||||
pkt.questions_.clear(); |
||||
data = pkt.data(); |
||||
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa)); |
||||
pkt.add_question(new DNSQuestion("example.com", ns_t_any)); |
||||
|
||||
#ifdef DISABLED |
||||
// Question != answer
|
||||
pkt.questions_.clear(); |
||||
pkt.add_question(new DNSQuestion("Axample.com", ns_t_any)); |
||||
data = pkt.data(); |
||||
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa)); |
||||
pkt.questions_.clear(); |
||||
pkt.add_question(new DNSQuestion("example.com", ns_t_any)); |
||||
#endif |
||||
|
||||
// Two questions
|
||||
pkt.add_question(new DNSQuestion("example.com", ns_t_any)); |
||||
data = pkt.data(); |
||||
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa)); |
||||
pkt.questions_.clear(); |
||||
pkt.add_question(new DNSQuestion("example.com", ns_t_any)); |
||||
|
||||
// Wrong sort of answer.
|
||||
pkt.answers_.clear(); |
||||
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com")); |
||||
data = pkt.data(); |
||||
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa)); |
||||
pkt.answers_.clear(); |
||||
pkt.add_answer(new DNSSoaRR("example.com", 100, |
||||
"soa1.example.com", "fred.example.com", |
||||
1, 2, 3, 4, 5)); |
||||
|
||||
// No answer.
|
||||
pkt.answers_.clear(); |
||||
data = pkt.data(); |
||||
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa)); |
||||
pkt.add_answer(new DNSSoaRR("example.com", 100, |
||||
"soa1.example.com", "fred.example.com", |
||||
1, 2, 3, 4, 5)); |
||||
|
||||
// Truncated packets.
|
||||
data = pkt.data(); |
||||
for (size_t len = 1; len < data.size(); len++) { |
||||
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), len, &soa)); |
||||
} |
||||
} |
||||
|
||||
TEST_F(LibraryTest, ParseSoaAnyReplyAllocFail) { |
||||
DNSPacket pkt; |
||||
pkt.set_qid(0x1234).set_response().set_aa() |
||||
.add_question(new DNSQuestion("example.com", ns_t_any)) |
||||
.add_answer(new DNSSoaRR("example.com", 100, |
||||
"soa1.example.com", "fred.example.com", |
||||
1, 2, 3, 4, 5)); |
||||
std::vector<byte> data = pkt.data(); |
||||
struct ares_soa_reply* soa = nullptr; |
||||
|
||||
for (int ii = 1; ii <= 5; ii++) { |
||||
ClearFails(); |
||||
SetAllocFail(ii); |
||||
EXPECT_EQ(ARES_ENOMEM, ares_parse_soa_reply(data.data(), data.size(), &soa)) << ii; |
||||
} |
||||
} |
||||
|
||||
} // namespace test
|
||||
} // namespace ares
|
||||
Loading…
Reference in new issue