resolved: tests for dns_query_process_cname_many()

diff --git a/src/resolve/test-dns-query.c b/src/resolve/test-dns-query.c
index 11bb2fe5a070bbee0d0efebb421f8c52fc28d08b..b5c72a30739e56658d100a8a636779dc13222de6 100644 (file)
--- a/src/resolve/test-dns-query.c
+++ b/src/resolve/test-dns-query.c
@@ -6,6 +6,12 @@
 #include "resolved-manager.h"
 #include "tests.h"
 
+static char* checked_strdup(const char *str) {
+        char *copy = strdup(str);
+        ASSERT_NOT_NULL(copy);
+        return copy;
+}
+
 /* ================================================================
  * dns_query_new()
  * ================================================================ */
@@ -272,8 +278,7 @@ TEST(dns_query_process_cname_one_success_match_cname) {
         rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_CNAME, "www.example.com");
         ASSERT_NOT_NULL(rr);
         rr->ttl = 3600;
-        rr->cname.name = strdup("example.com");
-        ASSERT_NOT_NULL(rr->cname.name);
+        rr->cname.name = checked_strdup("example.com");
         dns_answer_add(query->answer, rr, 1, 0, NULL);
         dns_resource_record_unref(rr);
 
@@ -287,17 +292,17 @@ TEST(dns_query_process_cname_one_success_match_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_EQ(dns_question_size(query->collected_questions), 1u);
         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, "example.com");
         ASSERT_NOT_NULL(key);
-        ASSERT_EQ(dns_question_size(query->question_idna), 1u);
         ASSERT_TRUE(dns_question_contains_key(query->question_idna, key));
         dns_resource_key_unref(key);
 }
@@ -328,8 +333,7 @@ TEST(dns_query_process_cname_one_success_flags) {
         rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_CNAME, "www.example.com");
         ASSERT_NOT_NULL(rr);
         rr->ttl = 3600;
-        rr->cname.name = strdup("example.com");
-        ASSERT_NOT_NULL(rr->cname.name);
+        rr->cname.name = checked_strdup("example.com");
         dns_answer_add(query->answer, rr, 1, 0, NULL);
         dns_resource_record_unref(rr);
 
@@ -340,4 +344,91 @@ TEST(dns_query_process_cname_one_success_flags) {
         ASSERT_TRUE(dns_query_fully_authoritative(query));
 }
 
+/* ================================================================
+ * dns_query_process_cname_many()
+ * ================================================================ */
+
+TEST(dns_query_process_cname_many_success_match_multiple_cname) {
+        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_query_flags = SD_RESOLVED_FROM_NETWORK;
+        query->answer = dns_answer_new(4);
+        ASSERT_NOT_NULL(query->answer);
+
+        rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_A, "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);
+
+        rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_CNAME, "www.example.com");
+        ASSERT_NOT_NULL(rr);
+        rr->ttl = 3600;
+        rr->cname.name = checked_strdup("tmp1.example.com");
+        dns_answer_add(query->answer, rr, 1, 0, NULL);
+        dns_resource_record_unref(rr);
+
+        rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_CNAME, "tmp2.example.com");
+        ASSERT_NOT_NULL(rr);
+        rr->ttl = 3600;
+        rr->cname.name = checked_strdup("example.com");
+        dns_answer_add(query->answer, rr, 1, 0, NULL);
+        dns_resource_record_unref(rr);
+
+        rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_CNAME, "tmp1.example.com");
+        ASSERT_NOT_NULL(rr);
+        rr->ttl = 3600;
+        rr->cname.name = checked_strdup("tmp2.example.com");
+        dns_answer_add(query->answer, rr, 1, 0, NULL);
+        dns_resource_record_unref(rr);
+
+        ASSERT_EQ(dns_query_process_cname_many(query), DNS_QUERY_MATCH);
+
+        ASSERT_FALSE(dns_query_fully_authenticated(query));
+        ASSERT_FALSE(dns_query_fully_confidential(query));
+        ASSERT_FALSE(dns_query_fully_authoritative(query));
+
+        ASSERT_GT(query->flags & SD_RESOLVED_NO_SEARCH, 0u);
+
+        ASSERT_EQ(query->n_cname_redirects, 3u);
+
+        ASSERT_EQ(dns_question_size(query->collected_questions), 3u);
+        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, "tmp1.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, "tmp2.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, "example.com");
+        ASSERT_NOT_NULL(key);
+        ASSERT_TRUE(dns_question_contains_key(query->question_idna, key));
+        dns_resource_key_unref(key);
+}
+
 DEFINE_TEST_MAIN(LOG_DEBUG);