- Reverted fix for #3512, this may not be the best way forward;

  although it could be changed at a later time, to stay similar to
  other implementations.

git-svn-id: file:///svn/unbound/trunk@4560 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 2381450888b4709db6c679dd59ea7e833f10c6bc..488c31f9fa57eb4335d790ce37a1137d44e11454 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+6 March 2018: Wouter
+       - Reverted fix for #3512, this may not be the best way forward;
+         although it could be changed at a later time, to stay similar to
+         other implementations.
+
 5 March 2018: Wouter
        - Fix to check define of DSA for when openssl is without deprecated.
        - iana port update.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 33fb02ddee9ae9cc51715f7fe2637187a5c4a7f8..7f3c65737d5951848b02a3a606c978aa181ce581 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1157,13 +1157,6 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
        if(iq->query_restart_count > MAX_RESTART_COUNT) {
                verbose(VERB_QUERY, "request has exceeded the maximum number"
                        " of query restarts with %d", iq->query_restart_count);
-               if(iq->response) {
-                       /* return the partial CNAME loop, i.e. with the
-                        * actual packet in iq->response cleared of RRsets,
-                        * the stored prepend RRsets contain the loop contents
-                        * with duplicates removed */
-                       return next_state(iq, FINISHED_STATE);
-               }
                return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
        }
 
@@ -1253,11 +1246,6 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                        iq->qchase.qname_len = slen;
                        /* This *is* a query restart, even if it is a cheap 
                         * one. */
-                       msg->rep->an_numrrsets = 0;
-                       msg->rep->ns_numrrsets = 0;
-                       msg->rep->ar_numrrsets = 0;
-                       msg->rep->rrset_count = 0;
-                       iq->response = msg;
                        iq->dp = NULL;
                        iq->refetch_glue = 0;
                        iq->query_restart_count++;
@@ -2751,10 +2739,6 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
                if (qstate->env->cfg->qname_minimisation)
                        iq->minimisation_state = INIT_MINIMISE_STATE;
                /* Clear the query state, since this is a query restart. */
-               iq->response->rep->an_numrrsets = 0;
-               iq->response->rep->ns_numrrsets = 0;
-               iq->response->rep->ar_numrrsets = 0;
-               iq->response->rep->rrset_count = 0;
                iq->deleg_msg = NULL;
                iq->dp = NULL;
                iq->dsns_point = NULL;

diff --git a/testdata/iter_dname_insec.rpl b/testdata/iter_dname_insec.rpl
index 1ce8c2cb56540a791197132142ed6d29e5578bcb..8f4a29c79e19f24f3148d2799ff276e8ad70934e 100644 (file)
--- a/testdata/iter_dname_insec.rpl
+++ b/testdata/iter_dname_insec.rpl
@@ -776,18 +776,12 @@ ENTRY_END
 
 ; Expected result is defined by RFC 1034 section 3.6.2:
 ; CNAME chains should be followed and CNAME loops signalled as an error
-; but bug#3512: return partial contents with NOERROR.
 STEP 221002 CHECK_ANSWER
 ENTRY_BEGIN
 MATCH all
-REPLY QR RD RA DO NOERROR
+REPLY QR RD RA DO SERVFAIL
 SECTION QUESTION
 cyc2.example.com. IN A
-SECTION ANSWER
-example.com.   0       IN      DNAME   cyc2.example.net.
-cyc2.example.com.      0       IN      CNAME   cyc2.cyc2.example.net.
-cyc2.example.net.      0       IN      DNAME   example.com.
-cyc2.cyc2.example.net. 0       IN      CNAME   cyc2.example.com.
 ENTRY_END
 
 ; ns1.example.com.

diff --git a/testdata/val_cname_loop1.rpl b/testdata/val_cname_loop1.rpl
index b942cb263e14c7a867709d1d528e1643fd85e93b..61fcdb7036fd52dce48bb531a1c7c846c9b34582 100644 (file)
--- a/testdata/val_cname_loop1.rpl
+++ b/testdata/val_cname_loop1.rpl
@@ -5,7 +5,6 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        fake-sha1: yes
-       trust-anchor-signaling: no
 
 stub-zone:
        name: "."
@@ -87,17 +86,6 @@ ns.example.com.         IN      A       1.2.3.4
 ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
 ENTRY_END
 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-ns.example.com. IN AAAA
-SECTION AUTHORITY
-ns.example.com. IN NSEC www.example.com. A RRSIG NSEC
-ns.example.com.        3600    IN      RRSIG   NSEC 3 3 3600 20070926134150 20070829134150 2854 example.com. AE+zfHodyVCTnni/bur8IiUhTUtdac6ip/znrYYN0l1nqll1fon2+kQ=
-ENTRY_END
-
 ; response to DNSKEY priming query
 ENTRY_BEGIN
 MATCH opcode qtype qname
@@ -116,18 +104,6 @@ ns.example.com.            IN      A       1.2.3.4
 ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
 ENTRY_END
 
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.com. IN DS
-SECTION AUTHORITY
-www.example.com. IN NSEC z.example.com. CNAME RRSIG NSEC
-www.example.com.       3600    IN      RRSIG   NSEC 3 3 3600 20070926134150 20070829134150 2854 example.com. AJ8hqdeoKtvR094y+0KjO6LkCe1SCs6z5YhuY2YZCmzvUiYHP9wiMTw=
-ENTRY_END
-
 ; response to query of interest
 ENTRY_BEGIN
 MATCH opcode qtype qname
@@ -158,12 +134,10 @@ ENTRY_END
 STEP 10 CHECK_ANSWER
 ENTRY_BEGIN
 MATCH all
-REPLY QR RD RA DO AD NOERROR
+REPLY QR RD RA DO SERVFAIL
 SECTION QUESTION
 www.example.com. IN A
 SECTION ANSWER
-www.example.com.        3600    IN      CNAME   www.example.com.
-www.example.com.        3600    IN      RRSIG   CNAME 3 3 3600 20070926134150 20070829134150 2854 example.com. MCwCFH0SwLHe7u56TshoVciFRHEl1KqbAhQ3zBOZMlL8bt1DqoDoM5ni8U/1UA== ;{id = 2854}
 SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END

diff --git a/testdata/val_cname_loop2.rpl b/testdata/val_cname_loop2.rpl
index d42bbd2c1cb646a0ed1f5bd709bb698cdc4d0043..26644bc14755c5fb12aab4f1cabbbedf408849a6 100644 (file)
--- a/testdata/val_cname_loop2.rpl
+++ b/testdata/val_cname_loop2.rpl
@@ -5,7 +5,6 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        fake-sha1: yes
-       trust-anchor-signaling: no
 
 stub-zone:
        name: "."
@@ -114,7 +113,7 @@ SECTION QUESTION
 www.example.com. IN A
 SECTION ANSWER
 www.example.com. IN    CNAME   foo.example.com.
-www.example.com.       3600    IN      RRSIG   CNAME 3 3 3600 20070926134150 20070829134150 2854 example.com. AD50yy1elnzRmjGCd7FBiWEkYlhQYXaZu0g1JoJMr/ONiXVnV2yiONg=
+www.example.com.        3600    IN      RRSIG   CNAME DSA 3 3600 20070926134150 20070829134150 2854 example.com. MCwCFH0SwLHe7u56TshoVciFRHEl1KqbAhQ3zBOZMlL8bt1DqoDoM5ni8U/1UA== ;{id = 2854}
 SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END
@@ -127,7 +126,7 @@ SECTION QUESTION
 foo.example.com. IN A
 SECTION ANSWER
 foo.example.com. IN    CNAME   www.example.com.
-foo.example.com.       3600    IN      RRSIG   CNAME 3 3 3600 20070926134150 20070829134150 2854 example.com. AEEIVUwbtfcn2RP41l0PDO+Sk4YdJ0HyRVsgq20fJnrDDC6eFXFGqUg=
+foo.example.com.        3600    IN      RRSIG   CNAME DSA 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFC7kcWPsMnGbjvzj5UNnxQzM0YvnAhUAgxIKgs1huJHvcAP2Xt3p8Adpy/c= ;{id = 2854}
 SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END
@@ -144,14 +143,10 @@ ENTRY_END
 STEP 10 CHECK_ANSWER
 ENTRY_BEGIN
 MATCH all
-REPLY QR RD RA DO AD NOERROR
+REPLY QR RD RA DO SERVFAIL
 SECTION QUESTION
 www.example.com. IN A
 SECTION ANSWER
-www.example.com.        3600    IN      CNAME   foo.example.com.
-www.example.com.        3600    IN      RRSIG   CNAME 3 3 3600 20070926134150 20070829134150 2854 example.com. AD50yy1elnzRmjGCd7FBiWEkYlhQYXaZu0g1JoJMr/ONiXVnV2yiONg= ;{id = 2854}
-foo.example.com.        3600    IN      CNAME   www.example.com.
-foo.example.com.        3600    IN      RRSIG   CNAME 3 3 3600 20070926134150 20070829134150 2854 example.com. AEEIVUwbtfcn2RP41l0PDO+Sk4YdJ0HyRVsgq20fJnrDDC6eFXFGqUg= ;{id = 2854}
 SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END

diff --git a/testdata/val_cname_loop3.rpl b/testdata/val_cname_loop3.rpl
index 30e6abfbb1d5c44c9c628ad1e3aa03ec4b460ef2..fbd0d8abcf3c26979d4427d564d77fb70989c620 100644 (file)
--- a/testdata/val_cname_loop3.rpl
+++ b/testdata/val_cname_loop3.rpl
@@ -5,7 +5,6 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        fake-sha1: yes
-       trust-anchor-signaling: no
 
 stub-zone:
        name: "."
@@ -114,7 +113,7 @@ SECTION QUESTION
 www.example.com. IN A
 SECTION ANSWER
 www.example.com. IN    CNAME   foo.example.com.
-www.example.com.       3600    IN      RRSIG   CNAME 3 3 3600 20070926134150 20070829134150 2854 example.com. AD50yy1elnzRmjGCd7FBiWEkYlhQYXaZu0g1JoJMr/ONiXVnV2yiONg=
+www.example.com.        3600    IN      RRSIG   CNAME DSA 3 3600 20070926134150 20070829134150 2854 example.com. MCwCFH0SwLHe7u56TshoVciFRHEl1KqbAhQ3zBOZMlL8bt1DqoDoM5ni8U/1UA== ;{id = 2854}
 SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END
@@ -127,7 +126,7 @@ SECTION QUESTION
 foo.example.com. IN A
 SECTION ANSWER
 foo.example.com. IN    CNAME   bar.example.com.
-foo.example.com.       3600    IN      RRSIG   CNAME 3 3 3600 20070926134150 20070829134150 2854 example.com. AILRq+NAK+k+qCNJAmByoTAkGNveSHT+au0u360OeUa56b8zU7gi6+I=
+foo.example.com.        3600    IN      RRSIG   CNAME DSA 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFFMlXuWrNL/8aYOl9U9WYjgif8gAAhUAqsC/xOXakHP1SYxMSLANziOik94= ;{id = 2854}
 SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END
@@ -140,7 +139,7 @@ SECTION QUESTION
 bar.example.com. IN A
 SECTION ANSWER
 bar.example.com. IN    CNAME   www.example.com.
-bar.example.com.       3600    IN      RRSIG   CNAME 3 3 3600 20070926134150 20070829134150 2854 example.com. AKA7eO4DAGPB8vg/OdBLk41/2txpklOJrszT8Gvp+UOVSLYtddNGz+k=
+bar.example.com.        3600    IN      RRSIG   CNAME DSA 3 3600 20070926134150 20070829134150 2854 example.com. MCwCFAsalUJJSV86uPlfiGS3kKDc0JB7AhQ+qmHqagY/r36Re/J3Q1OfvcA1dA== ;{id = 2854}
 SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END
@@ -157,13 +156,10 @@ ENTRY_END
 STEP 10 CHECK_ANSWER
 ENTRY_BEGIN
 MATCH all
-REPLY QR RD RA NOERROR
+REPLY QR RD RA SERVFAIL
 SECTION QUESTION
 www.example.com. IN A
 SECTION ANSWER
-www.example.com.        3600    IN      CNAME   foo.example.com.
-foo.example.com.        3600    IN      CNAME   bar.example.com.
-bar.example.com.        3600    IN      CNAME   www.example.com.
 SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END

diff --git a/validator/validator.c b/validator/validator.c
index 715ea31712c080372998e58ba7f62570ede8c00b..02a7aa20654335dbd0e803bc0421eca50803c685 100644 (file)
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1540,22 +1540,6 @@ processInit(struct module_qstate* qstate, struct val_qstate* vq,
                if(verbosity >= VERB_ALGO)
                        log_dns_msg("chased extract", &vq->qchase, 
                                vq->chase_reply);
-               /* we skipped cnames, and now the reply is empty, is this
-                * a CNAME loop? */
-               if(vq->rrset_skip > 0 && vq->chase_reply->rrset_count == 0) {
-                       if(reply_find_rrset_section_an(vq->orig_msg->rep,
-                               lookup_name, lookup_len, LDNS_RR_TYPE_CNAME,
-                               vq->qchase.qclass)) {
-                               if(anchor) {
-                                       lock_basic_unlock(&anchor->lock);
-                               }
-                               verbose(VERB_ALGO, "validator: encountered "
-                                       "CNAME loop - terminating");
-                               vq->chase_reply->security = vq->orig_msg->rep->security;
-                               vq->state = VAL_FINISHED_STATE;
-                               return 1;
-                       }
-               }
        }
 
        vq->key_entry = key_cache_obtain(ve->kcache, lookup_name, lookup_len,