Do not attempt to perform a DNS64 rewrite if RPZ returns NODATA.

(cherry picked from commit 1eb640049c88ec49bd7710cacc7a01a287735fe6)

diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index 612a543e5fec66d5338ae0ace8f473632eba488d..0c403d8a9e27fe22c2cc612a779c0b7d9e57ae25 100644 (file)
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -71,6 +71,7 @@ typedef enum {
        DNS_RPZ_POLICY_NXDOMAIN = 5,    /* 'nxdomain': answer with NXDOMAIN */
        DNS_RPZ_POLICY_NODATA = 6,      /* 'nodata': answer with ANCOUNT=0 */
        DNS_RPZ_POLICY_CNAME = 7,       /* 'cname x': answer with x's rrsets */
+       DNS_RPZ_POLICY_DNS64,           /* Apply DN64 to the A rewrite */
        DNS_RPZ_POLICY_RECORD,
        DNS_RPZ_POLICY_WILDCNAME,
        DNS_RPZ_POLICY_MISS,

diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index d39692d2152de712ee1b644c2f4dc07a347cfd13..9faad9c2f3832f2e3afb6616ace7cfd3e1e92a16 100644 (file)
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -267,6 +267,9 @@ dns_rpz_policy2str(dns_rpz_policy_t policy) {
        case DNS_RPZ_POLICY_MISS:
                str = "MISS";
                break;
+       case DNS_RPZ_POLICY_DNS64:
+               str = "DNS64";
+               break;
        default:
                INSIST(0);
                ISC_UNREACHABLE();

diff --git a/lib/ns/query.c b/lib/ns/query.c
index fe06b6c5baed6d62302f1283953b74b44baec738..de1a1163d53f32c1d9f94084a68d45749b1cee09 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -2951,6 +2951,7 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype,
        isc_result_t result;
        dns_clientinfomethods_t cm;
        dns_clientinfo_t ci;
+       bool found_a = false;
 
        REQUIRE(nodep != NULL);
 
@@ -2994,6 +2995,18 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype,
                               "rpz_find_p: allrdatasets failed");
                        return (DNS_R_SERVFAIL);
                }
+               if (qtype == dns_rdatatype_aaaa &&
+                   !ISC_LIST_EMPTY(client->view->dns64)) {
+                       for (result = dns_rdatasetiter_first(rdsiter);
+                            result == ISC_R_SUCCESS;
+                            result = dns_rdatasetiter_next(rdsiter)) {
+                               dns_rdatasetiter_current(rdsiter, *rdatasetp);
+                               if ((*rdatasetp)->type == dns_rdatatype_a) {
+                                       found_a = true;
+                               }
+                               dns_rdataset_disassociate(*rdatasetp);
+                       }
+               }
                for (result = dns_rdatasetiter_first(rdsiter);
                     result == ISC_R_SUCCESS;
                     result = dns_rdatasetiter_next(rdsiter)) {
@@ -3046,7 +3059,11 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype,
                }
                return (ISC_R_SUCCESS);
        case DNS_R_NXRRSET:
-               *policyp = DNS_RPZ_POLICY_NODATA;
+               if (found_a) {
+                       *policyp = DNS_RPZ_POLICY_DNS64;
+               } else {
+                       *policyp = DNS_RPZ_POLICY_NODATA;
+               }
                return (result);
        case DNS_R_DNAME:
                /*
@@ -6412,8 +6429,10 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) {
                        qctx->rpz = true;
                        break;
                case DNS_RPZ_POLICY_NODATA:
-                       result = DNS_R_NXRRSET;
                        qctx->nxrewrite = true;
+                       /* FALLTHROUGH */
+               case DNS_RPZ_POLICY_DNS64:
+                       result = DNS_R_NXRRSET;
                        qctx->rpz = true;
                        break;
                case DNS_RPZ_POLICY_RECORD:
@@ -8223,6 +8242,7 @@ query_nodata(query_ctx_t *qctx, isc_result_t res) {
        } else if ((result == DNS_R_NXRRSET ||
                    result == DNS_R_NCACHENXRRSET) &&
                   !ISC_LIST_EMPTY(qctx->view->dns64) &&
+                  !qctx->nxrewrite &&
                   qctx->client->message->rdclass == dns_rdataclass_in &&
                   qctx->qtype == dns_rdatatype_aaaa)
        {