3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Rewrote the DNS parsing algorithm. Everything is now done on the read buffer, without any extra data structures, making it work about 400% faster than before.

Browse Source
This commit is contained in:
Matias Fontanini
2014-01-19 13:11:50 -03:00
parent 17ceba6064
commit dbcdda9d36
3 changed files with 526 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
tests/src/dns.cpp
View File

@@ -9,7 +9,7 @@ using namespace Tins;
class DNSTest : public testing::Test {
public:
static const uint8_t expected_packet[];
static const uint8_t expected_packet[], dns_response1[];
void test_equals(const DNS &dns1, const DNS &dns2);
void test_equals(const DNS::Query &q1, const DNS::Query &q2);
@@ -23,6 +23,10 @@ const uint8_t DNSTest::expected_packet[] = {
0, 1, 0, 1, 0, 0, 18, 52, 0, 4, 192, 168, 0, 1
};
const uint8_t DNSTest::dns_response1[] = {
174, 73, 129, 128, 0, 1, 0, 5, 0, 0, 0, 0, 6, 103, 111, 111, 103, 108, 101, 3, 99, 111, 109, 0, 0, 15, 0, 1, 192, 12, 0, 15, 0, 1, 0, 0, 2, 88, 0, 17, 0, 50, 4, 97, 108, 116, 52, 5, 97, 115, 112, 109, 120, 1, 108, 192, 12, 192, 12, 0, 15, 0, 1, 0, 0, 2, 88, 0, 9, 0, 40, 4, 97, 108, 116, 51, 192, 47, 192, 12, 0, 15, 0, 1, 0, 0, 2, 88, 0, 9, 0, 20, 4, 97, 108, 116, 49, 192, 47, 192, 12, 0, 15, 0, 1, 0, 0, 2, 88, 0, 4, 0, 10, 192, 47, 192, 12, 0, 15, 0, 1, 0, 0, 2, 88, 0, 9, 0, 30, 4, 97, 108, 116, 50, 192, 47
};
void DNSTest::test_equals(const DNS &dns1, const DNS &dns2) {
@@ -84,6 +88,42 @@ TEST_F(DNSTest, ConstructorFromBuffer) {
test_equals(answers.front(), DNS::Resource("www.example.com", "192.168.0.1", DNS::A, DNS::IN, 0x1234));
}
TEST_F(DNSTest, ConstructorFromBuffer2) {
DNS dns(dns_response1, sizeof(dns_response1));
EXPECT_EQ(dns.questions_count(), 1);
EXPECT_EQ(dns.answers_count(), 5);
for(size_t i = 0; i < 2; ++i) {
DNS::queries_type queries(dns.queries());
for(DNS::queries_type::const_iterator it = queries.begin(); it != queries.end(); ++it) {
EXPECT_EQ("google.com", it->dname());
EXPECT_TRUE(it->type() == DNS::MX || it->type() == DNS::A);
EXPECT_EQ(it->query_class(), DNS::IN);
}
DNS::resources_type resources = dns.answers();
for(DNS::resources_type::const_iterator it = resources.begin(); it != resources.end(); ++it) {
EXPECT_EQ("google.com", it->dname());
EXPECT_EQ(DNS::MX, it->type());
EXPECT_EQ(DNS::IN, it->query_class());
EXPECT_TRUE(
it->data() == "alt1.aspmx.l.google.com" ||
it->data() == "alt2.aspmx.l.google.com" ||
it->data() == "alt3.aspmx.l.google.com" ||
it->data() == "alt4.aspmx.l.google.com" ||
it->data() == "alt5.aspmx.l.google.com" ||
it->data() == "aspmx.l.google.com"
);
}
// Add some stuff and see if something gets broken
if(i == 0) {
dns.add_query(DNS::Query("google.com", DNS::A, DNS::IN));
dns.add_query(DNS::Query("google.com", DNS::MX, DNS::IN));
dns.add_answer("google.com", DNS::make_info(DNS::MX, DNS::IN, 0x762), std::string("alt5.aspmx.l.google.com"));
}
}
}
TEST_F(DNSTest, Serialization) {
DNS dns(expected_packet, sizeof(expected_packet));
DNS::serialization_type buffer = dns.serialize();
@@ -205,6 +245,7 @@ TEST_F(DNSTest, Answers) {
DNS dns;
dns.add_answer("www.example.com", DNS::make_info(DNS::A, DNS::IN, 0x762), IPv4Address("127.0.0.1"));
dns.add_answer("www.example2.com", DNS::make_info(DNS::MX, DNS::IN, 0x762), std::string("mail.example.com"));
ASSERT_EQ(dns.answers_count(), 2);
DNS::resources_type resources = dns.answers();
@@ -225,6 +266,45 @@ TEST_F(DNSTest, Answers) {
}
}
TEST_F(DNSTest, Authority) {
DNS dns;
std::string encoded = DNS::encode_domain_name("carlos.example.com");
dns.add_authority("www.example.com", DNS::make_info(DNS::CNAME, DNS::IN, 0x762), (const uint8_t*)encoded.c_str(), encoded.size());
dns.add_authority("www.example.com", DNS::make_info(DNS::CNAME, DNS::IN, 0x762), (const uint8_t*)encoded.c_str(), encoded.size());
ASSERT_EQ(dns.authority_count(), 2);
DNS::resources_type resources = dns.authority();
EXPECT_EQ(2, resources.size());
for(DNS::resources_type::const_iterator it = resources.begin(); it != resources.end(); ++it) {
EXPECT_EQ("www.example.com", it->dname());
EXPECT_EQ(it->type(), DNS::CNAME);
EXPECT_EQ(it->ttl(), 0x762U);
EXPECT_EQ(it->data(), "carlos.example.com");
EXPECT_EQ(it->query_class(), DNS::IN);
}
}
TEST_F(DNSTest, Additional) {
DNS dns;
std::string encoded = DNS::encode_domain_name("carlos.example.com");
dns.add_additional("www.example.com", DNS::make_info(DNS::CNAME, DNS::IN, 0x762), (const uint8_t*)encoded.c_str(), encoded.size());
dns.add_additional("www.example.com", DNS::make_info(DNS::CNAME, DNS::IN, 0x762), (const uint8_t*)encoded.c_str(), encoded.size());
ASSERT_EQ(dns.additional_count(), 2);
DNS::resources_type resources = dns.additional();
for(DNS::resources_type::const_iterator it = resources.begin(); it != resources.end(); ++it) {
EXPECT_EQ("www.example.com", it->dname());
EXPECT_EQ(it->type(), DNS::CNAME);
EXPECT_EQ(it->ttl(), 0x762U);
EXPECT_EQ(it->data(), "carlos.example.com");
EXPECT_EQ(it->query_class(), DNS::IN);
}
}
TEST_F(DNSTest, AnswersWithSameName) {
DNS dns;
dns.add_answer("www.example.com", DNS::make_info(DNS::A, DNS::IN, 0x762), IPv4Address("127.0.0.1"));
@@ -255,3 +335,60 @@ TEST_F(DNSTest, AnswersV6) {
EXPECT_EQ(it->query_class(), DNS::IN);
}
}
TEST_F(DNSTest, ItAintGonnaCorrupt) {
DNS dns(dns_response1, sizeof(dns_response1));
EXPECT_EQ(dns.questions_count(), 1);
EXPECT_EQ(dns.answers_count(), 5);
std::string encoded = DNS::encode_domain_name("carlos.example.com");
dns.add_additional("www.example.com", DNS::make_info(DNS::CNAME, DNS::IN, 0x762), (const uint8_t*)encoded.c_str(), encoded.size());
dns.add_authority("www.example.com", DNS::make_info(DNS::CNAME, DNS::IN, 0x762), (const uint8_t*)encoded.c_str(), encoded.size());
dns.add_query(DNS::Query("google.com", DNS::A, DNS::IN));
DNS::queries_type queries(dns.queries());
for(DNS::queries_type::const_iterator it = queries.begin(); it != queries.end(); ++it) {
EXPECT_EQ("google.com", it->dname());
EXPECT_TRUE(it->type() == DNS::MX || it->type() == DNS::A);
EXPECT_EQ(it->query_class(), DNS::IN);
}
// Check answers
DNS::resources_type resources = dns.answers();
for(DNS::resources_type::const_iterator it = resources.begin(); it != resources.end(); ++it) {
EXPECT_EQ("google.com", it->dname());
EXPECT_EQ(DNS::MX, it->type());
EXPECT_EQ(DNS::IN, it->query_class());
EXPECT_TRUE(
it->data() == "alt1.aspmx.l.google.com" ||
it->data() == "alt2.aspmx.l.google.com" ||
it->data() == "alt3.aspmx.l.google.com" ||
it->data() == "alt4.aspmx.l.google.com" ||
it->data() == "alt5.aspmx.l.google.com" ||
it->data() == "aspmx.l.google.com"
);
}
// Check authority records
resources = dns.authority();
EXPECT_EQ(1, resources.size());
for(DNS::resources_type::const_iterator it = resources.begin(); it != resources.end(); ++it) {
EXPECT_EQ("www.example.com", it->dname());
EXPECT_EQ(it->type(), DNS::CNAME);
EXPECT_EQ(it->ttl(), 0x762U);
EXPECT_EQ(it->data(), "carlos.example.com");
EXPECT_EQ(it->query_class(), DNS::IN);
}
// Check additional records
resources = dns.additional();
EXPECT_EQ(1, resources.size());
for(DNS::resources_type::const_iterator it = resources.begin(); it != resources.end(); ++it) {
EXPECT_EQ("www.example.com", it->dname());
EXPECT_EQ(it->type(), DNS::CNAME);
EXPECT_EQ(it->ttl(), 0x762U);
EXPECT_EQ(it->data(), "carlos.example.com");
EXPECT_EQ(it->query_class(), DNS::IN);
}
}