resolved: tests for dns_query_process_cname_one(); no match, DNAME, utf-8 handling
This commit is contained in:
@@ -255,6 +255,36 @@ TEST(dns_query_process_cname_one_success_exact_match) {
|
||||
ASSERT_EQ(query->n_cname_redirects, 0u);
|
||||
}
|
||||
|
||||
TEST(dns_query_process_cname_one_success_no_match) {
|
||||
Manager manager = {};
|
||||
_cleanup_(dns_question_unrefp) DnsQuestion *question = NULL;
|
||||
_cleanup_(dns_query_freep) DnsQuery *query = NULL;
|
||||
DnsResourceRecord *rr = NULL;
|
||||
|
||||
ASSERT_OK(dns_question_new_address(&question, AF_INET, "www.example.com", false));
|
||||
ASSERT_NOT_NULL(question);
|
||||
|
||||
ASSERT_OK(dns_query_new(&manager, &query, NULL, question, NULL, 1, 0));
|
||||
ASSERT_NOT_NULL(query);
|
||||
|
||||
query->state = DNS_TRANSACTION_SUCCESS;
|
||||
query->answer_protocol = DNS_PROTOCOL_DNS;
|
||||
query->answer_family = AF_INET;
|
||||
query->answer = dns_answer_new(1);
|
||||
ASSERT_NOT_NULL(query->answer);
|
||||
|
||||
rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_A, "tmp.example.com");
|
||||
ASSERT_NOT_NULL(rr);
|
||||
rr->ttl = 3600;
|
||||
rr->a.in_addr.s_addr = htobe32(0xc0a8017f);
|
||||
dns_answer_add(query->answer, rr, 1, 0, NULL);
|
||||
dns_resource_record_unref(rr);
|
||||
|
||||
ASSERT_EQ(dns_query_process_cname_one(query), DNS_QUERY_NOMATCH);
|
||||
|
||||
ASSERT_EQ(query->n_cname_redirects, 0u);
|
||||
}
|
||||
|
||||
TEST(dns_query_process_cname_one_success_match_cname) {
|
||||
Manager manager = {};
|
||||
_cleanup_(dns_question_unrefp) DnsQuestion *question = NULL;
|
||||
@@ -344,6 +374,159 @@ TEST(dns_query_process_cname_one_success_flags) {
|
||||
ASSERT_TRUE(dns_query_fully_authoritative(query));
|
||||
}
|
||||
|
||||
TEST(dns_query_process_cname_one_success_match_dname) {
|
||||
Manager manager = {};
|
||||
_cleanup_(dns_question_unrefp) DnsQuestion *question = NULL;
|
||||
_cleanup_(dns_query_freep) DnsQuery *query = NULL;
|
||||
DnsResourceRecord *rr = NULL;
|
||||
DnsResourceKey *key = NULL;
|
||||
|
||||
ASSERT_OK(dns_question_new_address(&question, AF_INET, "www.example.com", false));
|
||||
ASSERT_NOT_NULL(question);
|
||||
|
||||
ASSERT_OK(dns_query_new(&manager, &query, NULL, question, NULL, 1, 0));
|
||||
ASSERT_NOT_NULL(query);
|
||||
|
||||
query->state = DNS_TRANSACTION_SUCCESS;
|
||||
query->answer_protocol = DNS_PROTOCOL_DNS;
|
||||
query->answer_family = AF_INET;
|
||||
query->answer = dns_answer_new(1);
|
||||
ASSERT_NOT_NULL(query->answer);
|
||||
|
||||
rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_DNAME, "example.com");
|
||||
ASSERT_NOT_NULL(rr);
|
||||
rr->ttl = 3600;
|
||||
rr->dname.name = checked_strdup("v2.example.com");
|
||||
dns_answer_add(query->answer, rr, 1, 0, NULL);
|
||||
dns_resource_record_unref(rr);
|
||||
|
||||
ASSERT_EQ(dns_query_process_cname_one(query), DNS_QUERY_CNAME);
|
||||
|
||||
ASSERT_EQ(query->n_cname_redirects, 1u);
|
||||
|
||||
ASSERT_EQ(dns_question_size(query->collected_questions), 1u);
|
||||
ASSERT_NULL(query->question_utf8);
|
||||
ASSERT_EQ(dns_question_size(query->question_idna), 1u);
|
||||
|
||||
key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.example.com");
|
||||
ASSERT_NOT_NULL(key);
|
||||
ASSERT_TRUE(dns_question_contains_key(query->collected_questions, key));
|
||||
dns_resource_key_unref(key);
|
||||
|
||||
key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.v2.example.com");
|
||||
ASSERT_NOT_NULL(key);
|
||||
ASSERT_TRUE(dns_question_contains_key(query->question_idna, key));
|
||||
dns_resource_key_unref(key);
|
||||
}
|
||||
|
||||
#if HAVE_LIBIDN || HAVE_LIBIDN2
|
||||
TEST(dns_query_process_cname_one_success_match_dname_utf8_same) {
|
||||
Manager manager = {};
|
||||
_cleanup_(dns_question_unrefp) DnsQuestion *q_utf8 = NULL, *q_idna = NULL;
|
||||
_cleanup_(dns_query_freep) DnsQuery *query = NULL;
|
||||
DnsResourceRecord *rr = NULL;
|
||||
DnsResourceKey *key = NULL;
|
||||
|
||||
ASSERT_OK(dns_question_new_address(&q_utf8, AF_INET, "www.xn--tl8h.com", false));
|
||||
ASSERT_NOT_NULL(q_utf8);
|
||||
|
||||
ASSERT_OK(dns_question_new_address(&q_idna, AF_INET, "www.\xF0\x9F\x8E\xBC.com", true));
|
||||
ASSERT_NOT_NULL(q_idna);
|
||||
|
||||
ASSERT_OK(dns_query_new(&manager, &query, q_utf8, q_idna, NULL, 1, 0));
|
||||
ASSERT_NOT_NULL(query);
|
||||
|
||||
query->state = DNS_TRANSACTION_SUCCESS;
|
||||
query->answer_protocol = DNS_PROTOCOL_DNS;
|
||||
query->answer_family = AF_INET;
|
||||
query->answer = dns_answer_new(1);
|
||||
ASSERT_NOT_NULL(query->answer);
|
||||
|
||||
rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_DNAME, "xn--tl8h.com");
|
||||
ASSERT_NOT_NULL(rr);
|
||||
rr->ttl = 3600;
|
||||
rr->dname.name = checked_strdup("v2.xn--tl8h.com");
|
||||
dns_answer_add(query->answer, rr, 1, 0, NULL);
|
||||
dns_resource_record_unref(rr);
|
||||
|
||||
ASSERT_EQ(dns_query_process_cname_one(query), DNS_QUERY_CNAME);
|
||||
|
||||
ASSERT_EQ(query->n_cname_redirects, 1u);
|
||||
|
||||
ASSERT_EQ(dns_question_size(query->collected_questions), 1u);
|
||||
ASSERT_EQ(dns_question_size(query->question_utf8), 1u);
|
||||
ASSERT_EQ(dns_question_size(query->question_idna), 1u);
|
||||
|
||||
key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.xn--tl8h.com");
|
||||
ASSERT_NOT_NULL(key);
|
||||
ASSERT_TRUE(dns_question_contains_key(query->collected_questions, key));
|
||||
dns_resource_key_unref(key);
|
||||
|
||||
key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.v2.xn--tl8h.com");
|
||||
ASSERT_NOT_NULL(key);
|
||||
ASSERT_TRUE(dns_question_contains_key(query->question_utf8, key));
|
||||
dns_resource_key_unref(key);
|
||||
|
||||
key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.v2.xn--tl8h.com");
|
||||
ASSERT_NOT_NULL(key);
|
||||
ASSERT_TRUE(dns_question_contains_key(query->question_idna, key));
|
||||
dns_resource_key_unref(key);
|
||||
}
|
||||
|
||||
TEST(dns_query_process_cname_one_success_match_dname_utf8_different) {
|
||||
Manager manager = {};
|
||||
_cleanup_(dns_question_unrefp) DnsQuestion *q_utf8 = NULL, *q_idna = NULL;
|
||||
_cleanup_(dns_query_freep) DnsQuery *query = NULL;
|
||||
DnsResourceRecord *rr = NULL;
|
||||
DnsResourceKey *key = NULL;
|
||||
|
||||
ASSERT_OK(dns_question_new_address(&q_utf8, AF_INET, "www.\xF0\x9F\x98\xB1.com", false));
|
||||
ASSERT_NOT_NULL(q_utf8);
|
||||
|
||||
ASSERT_OK(dns_question_new_address(&q_idna, AF_INET, "www.\xF0\x9F\x8E\xBC.com", true));
|
||||
ASSERT_NOT_NULL(q_idna);
|
||||
|
||||
ASSERT_OK(dns_query_new(&manager, &query, q_utf8, q_idna, NULL, 1, 0));
|
||||
ASSERT_NOT_NULL(query);
|
||||
|
||||
query->state = DNS_TRANSACTION_SUCCESS;
|
||||
query->answer_protocol = DNS_PROTOCOL_DNS;
|
||||
query->answer_family = AF_INET;
|
||||
query->answer = dns_answer_new(1);
|
||||
ASSERT_NOT_NULL(query->answer);
|
||||
|
||||
rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_DNAME, "xn--tl8h.com");
|
||||
ASSERT_NOT_NULL(rr);
|
||||
rr->ttl = 3600;
|
||||
rr->dname.name = checked_strdup("v2.xn--tl8h.com");
|
||||
dns_answer_add(query->answer, rr, 1, 0, NULL);
|
||||
dns_resource_record_unref(rr);
|
||||
|
||||
ASSERT_EQ(dns_query_process_cname_one(query), DNS_QUERY_CNAME);
|
||||
|
||||
ASSERT_EQ(query->n_cname_redirects, 1u);
|
||||
|
||||
ASSERT_EQ(dns_question_size(query->collected_questions), 2u);
|
||||
ASSERT_NULL(query->question_utf8);
|
||||
ASSERT_EQ(dns_question_size(query->question_idna), 1u);
|
||||
|
||||
key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.\xF0\x9F\x98\xB1.com");
|
||||
ASSERT_NOT_NULL(key);
|
||||
ASSERT_TRUE(dns_question_contains_key(query->collected_questions, key));
|
||||
dns_resource_key_unref(key);
|
||||
|
||||
key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.xn--tl8h.com");
|
||||
ASSERT_NOT_NULL(key);
|
||||
ASSERT_TRUE(dns_question_contains_key(query->collected_questions, key));
|
||||
dns_resource_key_unref(key);
|
||||
|
||||
key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.v2.xn--tl8h.com");
|
||||
ASSERT_NOT_NULL(key);
|
||||
ASSERT_TRUE(dns_question_contains_key(query->question_idna, key));
|
||||
dns_resource_key_unref(key);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* ================================================================
|
||||
* dns_query_process_cname_many()
|
||||
* ================================================================ */
|
||||
|
||||
Reference in New Issue
Block a user