2532. [bug] dig: check the question section of the response to

                        see if it matches the asked question. [RT #18495]

diff --git a/CHANGES b/CHANGES
index 3f2b6c1dc22fbc00de0b67ccb297cb38fcf79581..a8a40af046616b9def69913fab98ca6f5dd6eb85 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2532.  [bug]           dig: check the question section of the response to
+                       see if it matches the asked question. [RT #18495]
+
 2531.  [bug]           Change #2207 was incomplete. [RT #19098]
 
 2529.  [cleanup]       Upgrade libtool to silence complaints from recent

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 00dd3fbb78fad332f4521a26a476767daa36340b..032798017e4888ded1823d9a87515820eb542a0b 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.259.18.55 2009/01/19 23:46:13 tbox Exp $ */
+/* $Id: dighost.c,v 1.259.18.56 2009/01/20 05:08:01 marka Exp $ */
 
 /*! \file
  *  \note
@@ -2935,18 +2935,8 @@ recv_done(isc_task_t *task, isc_event_t *event) {
        if (result == ISC_R_SUCCESS && (msgflags & DNS_MESSAGEFLAG_QR) == 0)
                printf(";; Warning: query response not set\n");
 
-       if (!match) {
-               isc_buffer_invalidate(&query->recvbuf);
-               isc_buffer_init(&query->recvbuf, query->recvspace, COMMSIZE);
-               ISC_LIST_ENQUEUE(query->recvlist, &query->recvbuf, link);
-               result = isc_socket_recvv(query->sock, &query->recvlist, 1,
-                                         global_task, recv_done, query);
-               check_result(result, "isc_socket_recvv");
-               recvcount++;
-               isc_event_free(&event);
-               UNLOCK_LOOKUP;
-               return;
-       }
+       if (!match)
+               goto udp_mismatch;
 
        result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg);
        check_result(result, "dns_message_create");
@@ -3001,6 +2991,52 @@ recv_done(isc_task_t *task, isc_event_t *event) {
                UNLOCK_LOOKUP;
                return;
        }
+       if (msg->counts[DNS_SECTION_QUESTION] != 0) {
+               match = ISC_TRUE;
+               for (result = dns_message_firstname(msg, DNS_SECTION_QUESTION);
+                    result == ISC_R_SUCCESS && match;
+                    result = dns_message_nextname(msg, DNS_SECTION_QUESTION)) {
+                       dns_name_t *name = NULL;
+                       dns_rdataset_t *rdataset;
+
+                       dns_message_currentname(msg, DNS_SECTION_QUESTION,
+                                               &name);
+                       for (rdataset = ISC_LIST_HEAD(name->list);
+                            rdataset != NULL;
+                            rdataset = ISC_LIST_NEXT(rdataset, link)) {
+                               if (l->rdtype != rdataset->type ||
+                                   l->rdclass != rdataset->rdclass ||
+                                   !dns_name_equal(l->name, name)) {
+                                       char namestr[DNS_NAME_FORMATSIZE];
+                                       char typebuf[DNS_RDATATYPE_FORMATSIZE];
+                                       char classbuf[DNS_RDATACLASS_FORMATSIZE];
+                                       dns_name_format(name, namestr,
+                                                       sizeof(namestr));
+                                       dns_rdatatype_format(rdataset->type,
+                                                            typebuf,
+                                                            sizeof(typebuf));
+                                       dns_rdataclass_format(rdataset->rdclass,
+                                                             classbuf,
+                                                             sizeof(classbuf));
+                                       printf(";; Question section mismatch: "
+                                              "got %s/%s/%s\n",
+                                              namestr, typebuf, classbuf);
+                                       match = ISC_FALSE;
+                               }
+                       }
+               }
+               if (!match) {
+                       dns_message_destroy(&msg);
+                       if (l->tcp_mode) {
+                               isc_event_free(&event);
+                               clear_query(query);
+                               check_next_lookup(l);
+                               UNLOCK_LOOKUP;
+                               return;
+                       } else
+                               goto udp_mismatch;
+               }
+       }
        if ((msg->flags & DNS_MESSAGEFLAG_TC) != 0 &&
            !l->ignore && !l->tcp_mode) {
                printf(";; Truncated, retrying in TCP mode.\n");
@@ -3255,6 +3291,19 @@ recv_done(isc_task_t *task, isc_event_t *event) {
        }
        isc_event_free(&event);
        UNLOCK_LOOKUP;
+       return;
+
+ udp_mismatch:
+       isc_buffer_invalidate(&query->recvbuf);
+       isc_buffer_init(&query->recvbuf, query->recvspace, COMMSIZE);
+       ISC_LIST_ENQUEUE(query->recvlist, &query->recvbuf, link);
+       result = isc_socket_recvv(query->sock, &query->recvlist, 1,
+                                 global_task, recv_done, query);
+       check_result(result, "isc_socket_recvv");
+       recvcount++;
+       isc_event_free(&event);
+       UNLOCK_LOOKUP;
+       return;
 }
 
 /*%