4436. [func] Return TLSA records as additional data for MX and SRV

                        lookups. [RT #42894]

diff --git a/CHANGES b/CHANGES
index b1b55177a8f44fa9585b984c137588d3cb449242..383970cb691572cdc314dcf7f39f3b532ac78016 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4436.  [func]          Return TLSA records as additional data for MX and SRV
+                       lookups. [RT #42894]
+
 4435.  [tuning]        Only set IPV6_USE_MIN_MTU for UDP when the message
                        will not fit into a single IPv4 encapsulated IPv6
                        UDP packet when transmitted over a Ethernet link.

diff --git a/bin/tests/system/additional/ns1/mx.db b/bin/tests/system/additional/ns1/mx.db
new file mode 100644 (file)
index 0000000..f4aa035
--- /dev/null
+++ b/bin/tests/system/additional/ns1/mx.db
@@ -0,0 +1,13 @@
+; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$TTL 86400
+@      IN      SOA     ns1 hostmaster ( 2 8H 2H 4W 1D );
+               NS      ns1
+               MX      0 mail
+ns1            A       10.53.0.1
+mail           A       1.2.3.4
+_25._tcp.mail  TLSA    3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383

diff --git a/bin/tests/system/additional/ns1/named4.conf b/bin/tests/system/additional/ns1/named4.conf
new file mode 100644 (file)
index 0000000..92ee520
--- /dev/null
+++ b/bin/tests/system/additional/ns1/named4.conf
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+options {
+       query-source address 10.53.0.1;
+       notify-source 10.53.0.1;
+       transfer-source 10.53.0.1;
+       recursion no;
+       port 5300;
+       pid-file "named.pid";
+       listen-on { 10.53.0.1; };
+       listen-on-v6 { none; };
+       notify no;
+};
+
+include "../../common/rndc.key";
+
+controls {
+       inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+};
+
+zone "mx.example" {
+       type master;
+       file "mx.db";
+};
+
+zone "srv.example" {
+       type master;
+       file "srv.db";
+};

diff --git a/bin/tests/system/additional/ns1/srv.db b/bin/tests/system/additional/ns1/srv.db
new file mode 100644 (file)
index 0000000..39901d9
--- /dev/null
+++ b/bin/tests/system/additional/ns1/srv.db
@@ -0,0 +1,13 @@
+; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$TTL 86400
+@      IN      SOA     ns1 hostmaster ( 2 8H 2H 4W 1D );
+               NS      ns1
+ns1            A       10.53.0.1
+_xmpp-client._tcp SRV     1 0 5222 server
+server         A       1.2.3.4
+_5222._tcp.server      TLSA    3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383

diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index 658e0ee836b04dac34de30aa7485fac3c2b0173e..e7367979710d34ca0ad0aef454c1bb37d22a247e 100644 (file)
--- a/bin/tests/system/additional/tests.sh
+++ b/bin/tests/system/additional/tests.sh
@@ -110,8 +110,9 @@ echo "I:testing with 'minimal-responses no;'"
 minimal=no
 dotests
 
-echo "I:testing with 'minimal-any no;'"
 n=`expr $n + 1`
+echo "I:testing with 'minimal-any no;' ($n)"
+ret=0
 $DIG -t ANY www.rt.example @10.53.0.1 -p 5300 > dig.out.$n || ret=1
 grep "ANSWER: 3, AUTHORITY: 1, ADDITIONAL: 2" dig.out.$n > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
@@ -123,13 +124,41 @@ cp ns1/named3.conf ns1/named.conf
 $RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 reconfig 2>&1 | sed 's/^/I:ns1 /'
 sleep 2
 
-echo "I:testing with 'minimal-any yes;'"
 n=`expr $n + 1`
+echo "I:testing with 'minimal-any yes;' ($n)"
+ret=0
 $DIG -t ANY www.rt.example @10.53.0.1 -p 5300 > dig.out.$n || ret=1
 grep "ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
     echo "I: failed"; status=1
 fi
 
+echo "I:reconfiguring server"
+cp ns1/named4.conf ns1/named.conf
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 reconfig 2>&1 | sed 's/^/I:ns1 /'
+sleep 2
+
+n=`expr $n + 1`
+echo "I:testing returning TLSA records with MX query ($n)"
+ret=0
+$DIG -t mx mx.example @10.53.0.1 -p 5300 > dig.out.$n || ret=1
+grep "mx\.example\..*MX.0 mail\.mx\.example" dig.out.$n > /dev/null || ret=1
+grep "mail\.mx\.example\..*A.1\.2\.3\.4" dig.out.$n > /dev/null || ret=1
+grep "_25\._tcp\.mail\.mx\.example\..*TLSA.3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383" dig.out.$n > /dev/null || ret=1
+if [ $ret -eq 1 ] ; then
+    echo "I: failed"; status=1
+fi
+
+n=`expr $n + 1`
+echo "I:testing returning TLSA records with SRV query ($n)"
+ret=0
+$DIG -t srv _xmpp-client._tcp.srv.example @10.53.0.1 -p 5300 > dig.out.$n || ret=1
+grep "_xmpp-client\._tcp\.srv\.example\..*SRV.1 0 5222 server\.srv\.example" dig.out.$n > /dev/null || ret=1
+grep "server\.srv\.example\..*A.1\.2\.3\.4" dig.out.$n > /dev/null || ret=1
+grep "_5222\._tcp\.server\.srv\.example\..*TLSA.3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383" dig.out.$n > /dev/null || ret=1
+if [ $ret -eq 1 ] ; then
+    echo "I: failed"; status=1
+fi
+
 echo "I:exit status: $status"
 [ $status -eq 0 ] || exit 1

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 7d8e7680f39fba46ac1b97ab0e8ec7fc36b6abab..1be723b52f96064b64a852e6c903e21857286407 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -143,6 +143,22 @@ struct dns_name {
 LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_rootname;
 LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_wildcardname;
 
+#define DNS_NAME_INITNONABSOLUTE(A,B) { \
+       DNS_NAME_MAGIC, \
+       A, (sizeof(A) - 1), sizeof(B), \
+       DNS_NAMEATTR_READONLY, \
+       B, NULL, { (void *)-1, (void *)-1}, \
+       {NULL, NULL} \
+}
+
+#define DNS_NAME_INITABSOLUTE(A,B) { \
+       DNS_NAME_MAGIC, \
+       A, sizeof(A), sizeof(B), \
+       DNS_NAMEATTR_READONLY | DNS_NAME_ABSOLUTE, \
+       B, NULL, { (void *)-1, (void *)-1}, \
+       {NULL, NULL} \
+}
+
 /*%
  * Standard size of a wire format name
  */

diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index 5ee9812899f9816d55ac6c11e098c1fa4ed6b5b6..61b0ae1984eb26742cfbc9ac8bdcd45148e27d75 100644 (file)
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -17,6 +17,8 @@
 
 #include <isc/net.h>
 
+#include <dns/fixedname.h>
+
 #define RRTYPE_MX_ATTRIBUTES (0)
 
 static isc_boolean_t
@@ -242,8 +244,15 @@ freestruct_mx(ARGS_FREESTRUCT) {
        mx->mctx = NULL;
 }
 
+static unsigned char port25_offset[] = { 0, 3 };
+static unsigned char port25_ndata[] = "\003_25\004_tcp";
+static dns_name_t port25 =
+        DNS_NAME_INITNONABSOLUTE(port25_ndata, port25_offset);
+
 static inline isc_result_t
 additionaldata_mx(ARGS_ADDLDATA) {
+       isc_result_t result;
+       dns_fixedname_t fixed;
        dns_name_t name;
        dns_offsets_t offsets;
        isc_region_t region;
@@ -255,7 +264,20 @@ additionaldata_mx(ARGS_ADDLDATA) {
        isc_region_consume(&region, 2);
        dns_name_fromregion(&name, &region);
 
-       return ((add)(arg, &name, dns_rdatatype_a));
+       if (dns_name_equal(&name, dns_rootname))
+               return (ISC_R_SUCCESS);
+
+       result = (add)(arg, &name, dns_rdatatype_a);
+       if (result != ISC_R_SUCCESS)
+               return (result);
+
+       dns_fixedname_init(&fixed);
+       result = dns_name_concatenate(&port25, &name,
+                                     dns_fixedname_name(&fixed), NULL);
+       if (result != ISC_R_SUCCESS)
+               return (ISC_R_SUCCESS);
+
+       return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa));
 }
 
 static inline isc_result_t

diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index b120d54a09893b38c9d34585f51154f743be9ede..6a772e3fbd8fdaba3f1ca00ff57a0c1f9adc79b0 100644 (file)
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -100,7 +100,7 @@ totext_in_srv(ARGS_TOTEXT) {
        dns_rdata_toregion(rdata, &region);
        num = uint16_fromregion(&region);
        isc_region_consume(&region, 2);
-       sprintf(buf, "%u", num);
+       snprintf(buf, sizeof(buf), "%u", num);
        RETERR(str_totext(buf, target));
        RETERR(str_totext(" ", target));
 
@@ -109,7 +109,7 @@ totext_in_srv(ARGS_TOTEXT) {
         */
        num = uint16_fromregion(&region);
        isc_region_consume(&region, 2);
-       sprintf(buf, "%u", num);
+       snprintf(buf, sizeof(buf), "%u", num);
        RETERR(str_totext(buf, target));
        RETERR(str_totext(" ", target));
 
@@ -118,7 +118,7 @@ totext_in_srv(ARGS_TOTEXT) {
         */
        num = uint16_fromregion(&region);
        isc_region_consume(&region, 2);
-       sprintf(buf, "%u", num);
+       snprintf(buf, sizeof(buf), "%u", num);
        RETERR(str_totext(buf, target));
        RETERR(str_totext(" ", target));
 
@@ -293,19 +293,44 @@ freestruct_in_srv(ARGS_FREESTRUCT) {
 
 static inline isc_result_t
 additionaldata_in_srv(ARGS_ADDLDATA) {
+       char buf[sizeof("_65000._tcp")];
+       dns_fixedname_t fixed;
        dns_name_t name;
        dns_offsets_t offsets;
        isc_region_t region;
+       isc_uint16_t port;
+       isc_result_t result;
 
        REQUIRE(rdata->type == dns_rdatatype_srv);
        REQUIRE(rdata->rdclass == dns_rdataclass_in);
 
        dns_name_init(&name, offsets);
        dns_rdata_toregion(rdata, &region);
-       isc_region_consume(&region, 6);
+       isc_region_consume(&region, 4);
+       port = uint16_fromregion(&region);
+       isc_region_consume(&region, 2);
        dns_name_fromregion(&name, &region);
 
-       return ((add)(arg, &name, dns_rdatatype_a));
+       if (dns_name_equal(&name, dns_rootname))
+               return (ISC_R_SUCCESS);
+
+       result = (add)(arg, &name, dns_rdatatype_a);
+       if (result != ISC_R_SUCCESS)
+               return (result);
+
+       dns_fixedname_init(&fixed);
+       snprintf(buf, sizeof(buf), "_%u._tcp", port);
+       result = dns_name_fromstring2(dns_fixedname_name(&fixed), buf, NULL,
+                                     0, NULL);
+       if (result != ISC_R_SUCCESS)
+               return (ISC_R_SUCCESS);
+
+       result = dns_name_concatenate(dns_fixedname_name(&fixed), &name,
+                                     dns_fixedname_name(&fixed), NULL);
+       if (result != ISC_R_SUCCESS)
+               return (ISC_R_SUCCESS);
+ 
+       return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa));
 }
 
 static inline isc_result_t