Only check SVBC alias forms at higher levels

Allow SVBC (HTTPS) alias form with parameters to be accepted from
the wire and when transfered.  This is for possible future extensions.

(cherry picked from commit 799046929cb1f23cfec7ae7391e5408e01baface)

diff --git a/lib/dns/rdata/in_1/svcb_64.c b/lib/dns/rdata/in_1/svcb_64.c
index 0d9da89683a8956cd46a78a687a6a8c89c8b6a5d..930a68f2ac834996e9011ab4c5756599f65e96b8 100644 (file)
--- a/lib/dns/rdata/in_1/svcb_64.c
+++ b/lib/dns/rdata/in_1/svcb_64.c
@@ -617,10 +617,6 @@ generic_fromtext_in_svcb(ARGS_FROMTEXT) {
                warn_badname(&name, lexer, callbacks);
        }
 
-       if (alias) {
-               return (ISC_R_SUCCESS);
-       }
-
        /*
         * SvcParams
         */
@@ -799,7 +795,7 @@ static isc_result_t
 generic_fromwire_in_svcb(ARGS_FROMWIRE) {
        dns_name_t name;
        isc_region_t region, man = { .base = NULL, .length = 0 };
-       bool alias, first = true, have_alpn = false;
+       bool first = true, have_alpn = false;
        uint16_t lastkey = 0, mankey = 0;
 
        UNUSED(type);
@@ -817,7 +813,6 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) {
                return (ISC_R_UNEXPECTEDEND);
        }
        RETERR(mem_tobuffer(target, region.base, 2));
-       alias = uint16_fromregion(&region) == 0;
        isc_buffer_forward(source, 2);
 
        /*
@@ -825,10 +820,6 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) {
         */
        RETERR(dns_name_fromwire(&name, source, dctx, options, target));
 
-       if (alias) {
-               return (ISC_R_SUCCESS);
-       }
-
        /*
         * SvcParams.
         */

diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c
index 7fed10c8050b1ca941305d5164976d5ec9dd9521..d79b072e141ee4ec8efd82fc31bf82e583378d72 100644 (file)
--- a/tests/dns/rdata_test.c
+++ b/tests/dns/rdata_test.c
@@ -2517,8 +2517,8 @@ ISC_RUN_TEST_IMPL(https_svcb) {
                TEXT_INVALID("0"),
                /* minimal record */
                TEXT_VALID_LOOP(0, "0 ."),
-               /* Alias form requires SvcFieldValue to be empty */
-               TEXT_INVALID("0 . alpn=\"h2\""),
+               /* Alias form possible future extension */
+               TEXT_VALID_LOOP(1, "0 . alpn=\"h2\""),
                /* no "key" prefix */
                TEXT_INVALID("2 svc.example.net. 0=\"2222\""),
                /* no key value */
@@ -2638,7 +2638,7 @@ ISC_RUN_TEST_IMPL(https_svcb) {
                 */
                WIRE_VALID(0x00, 0x00, 0x00),
                /*
-                * Alias with non-empty SvcFieldValue (key7="").
+                * Alias with invalid dohpath.
                 */
                WIRE_INVALID(0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00),
                /*