[9.18] new: usr: Support for parsing HHIT and BRID records has been added

Closes #5444

Backport of MR !10795

Merge branch 'backport-5444-add-hhit-and-brid-records-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!10933
This commit is contained in:
Mark Andrews 2025-09-03 12:21:29 +10:00
commit d7d4e94d08
11 changed files with 523 additions and 1 deletions

View file

@ -2524,6 +2524,7 @@ biganswer.example. 3600 IN A 10.10.50.47
biganswer.example. 3600 IN A 10.10.50.48
biganswer.example. 3600 IN A 10.10.50.49
biganswer.example. 3600 IN A 10.10.50.50
brid.example. 3600 IN BRID abcd
caa01.example. 3600 IN CAA 0 issue "ca.example.net; policy=ev"
caa02.example. 3600 IN CAA 128 tbs "Unknown"
caa03.example. 3600 IN CAA 128 tbs ""
@ -2555,6 +2556,7 @@ eui64.example. 3600 IN EUI64 01-23-45-67-89-ab-cd-ef
gid01.example. 3600 IN GID \# 1 03
gpos01.example. 3600 IN GPOS "-22.6882" "116.8652" "250.0"
gpos02.example. 3600 IN GPOS "" "" ""
hhit.example. 3600 IN HHIT abcd
hinfo01.example. 3600 IN HINFO "Generic PC clone" "NetBSD-1.4"
hinfo02.example. 3600 IN HINFO "PC" "NetBSD"
hip1.example. 3600 IN HIP 2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D

View file

@ -2524,6 +2524,7 @@ biganswer.example8. 3600 IN A 10.10.50.47
biganswer.example8. 3600 IN A 10.10.50.48
biganswer.example8. 3600 IN A 10.10.50.49
biganswer.example8. 3600 IN A 10.10.50.50
brid.example8. 3600 IN BRID abcd
caa01.example8. 3600 IN CAA 0 issue "ca.example.net; policy=ev"
caa02.example8. 3600 IN CAA 128 tbs "Unknown"
caa03.example8. 3600 IN CAA 128 tbs ""
@ -2555,6 +2556,7 @@ eui64.example8. 3600 IN EUI64 01-23-45-67-89-ab-cd-ef
gid01.example8. 3600 IN GID \# 1 03
gpos01.example8. 3600 IN GPOS "-22.6882" "116.8652" "250.0"
gpos02.example8. 3600 IN GPOS "" "" ""
hhit.example8. 3600 IN HHIT abcd
hinfo01.example8. 3600 IN HINFO "Generic PC clone" "NetBSD-1.4"
hinfo02.example8. 3600 IN HINFO "PC" "NetBSD"
hip1.example8. 3600 IN HIP 2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D

View file

@ -392,7 +392,13 @@ https1 HTTPS 1 . port=60
; type 66
dsync01 DSYNC CDS NOTIFY 53 .
; type 68 -- 98 (unassigned)
; type 67
hhit HHIT abcd
; type 68
brid BRID abcd
; type 69 -- 98 (unassigned)
; type 99
spf01 SPF "v=spf1 -all"

View file

@ -37,6 +37,7 @@ pytestmark = pytest.mark.extra_artifacts(
"APL",
"ATMA",
"AVC",
"BRID",
"CAA",
"CDNSKEY",
"CDS",
@ -55,6 +56,7 @@ pytestmark = pytest.mark.extra_artifacts(
"EUI64",
"GID",
"GPOS",
"HHIT",
"HINFO",
"HIP",
"HTTPS",

View file

@ -25,6 +25,7 @@ atma02.example. 3600 IN ATMA +61200000000
atma03.example. 3600 IN ATMA 1234567890abcdef
atma04.example. 3600 IN ATMA fedcba0987654321
avc.example. 3600 IN AVC "foo:bar"
brid.example. 3600 IN BRID abcd
caa01.example. 3600 IN CAA 0 issue "ca.example.net; policy=ev"
caa02.example. 3600 IN CAA 128 tbs "Unknown"
caa03.example. 3600 IN CAA 128 tbs ""
@ -56,6 +57,7 @@ eui64.example. 3600 IN EUI64 01-23-45-67-89-ab-cd-ef
gid01.example. 3600 IN GID \# 1 03
gpos01.example. 3600 IN GPOS "-22.6882" "116.8652" "250.0"
gpos02.example. 3600 IN GPOS "" "" ""
hhit.example. 3600 IN HHIT abcd
hinfo01.example. 3600 IN HINFO "Generic PC clone" "NetBSD-1.4"
hinfo02.example. 3600 IN HINFO "PC" "NetBSD"
hip1.example. 3600 IN HIP 2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D

View file

@ -25,6 +25,7 @@ atma02.example. 3600 IN ATMA +61200000000
atma03.example. 3600 IN ATMA 1234567890abcdef
atma04.example. 3600 IN ATMA fedcba0987654321
avc.example. 3600 IN AVC "foo:bar"
brid.example. 3600 IN BRID abcd
caa01.example. 3600 IN CAA 0 issue "ca.example.net; policy=ev"
caa02.example. 3600 IN CAA 128 tbs "Unknown"
caa03.example. 3600 IN CAA 128 tbs ""
@ -56,6 +57,7 @@ eui64.example. 3600 IN EUI64 01-23-45-67-89-ab-cd-ef
gid01.example. 3600 IN GID \# 1 03
gpos01.example. 3600 IN GPOS "-22.6882" "116.8652" "250.0"
gpos02.example. 3600 IN GPOS "" "" ""
hhit.example. 3600 IN HHIT abcd
hinfo01.example. 3600 IN HINFO "Generic PC clone" "NetBSD-1.4"
hinfo02.example. 3600 IN HINFO "PC" "NetBSD"
hip1.example. 3600 IN HIP 2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D

View file

@ -0,0 +1,214 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* SPDX-License-Identifier: MPL-2.0
*
* 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 https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
#ifndef RDATA_GENERIC_BRID_68_C
#define RDATA_GENERIC_BRID_68_C
#include <dst/dst.h>
#define RRTYPE_BRID_ATTRIBUTES (0)
static isc_result_t
fromtext_brid(ARGS_FROMTEXT) {
REQUIRE(type == dns_rdatatype_brid);
UNUSED(type);
UNUSED(rdclass);
UNUSED(origin);
UNUSED(options);
UNUSED(callbacks);
return isc_base64_tobuffer(lexer, target, -1);
}
static isc_result_t
totext_brid(ARGS_TOTEXT) {
isc_region_t sr;
REQUIRE(rdata->type == dns_rdatatype_brid);
REQUIRE(rdata->length > 0);
dns_rdata_toregion(rdata, &sr);
/* data */
if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) {
RETERR(str_totext(" (", target));
}
RETERR(str_totext(tctx->linebreak, target));
if (tctx->width == 0) { /* No splitting */
RETERR(isc_base64_totext(&sr, 60, "", target));
} else {
RETERR(isc_base64_totext(&sr, tctx->width - 2, tctx->linebreak,
target));
}
if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) {
RETERR(str_totext(" )", target));
}
return ISC_R_SUCCESS;
}
static isc_result_t
fromwire_brid(ARGS_FROMWIRE) {
isc_region_t sr;
REQUIRE(type == dns_rdatatype_brid);
UNUSED(type);
UNUSED(rdclass);
UNUSED(options);
UNUSED(dctx);
isc_buffer_activeregion(source, &sr);
if (sr.length == 0) {
return ISC_R_UNEXPECTEDEND;
}
RETERR(mem_tobuffer(target, sr.base, sr.length));
isc_buffer_forward(source, sr.length);
return ISC_R_SUCCESS;
}
static isc_result_t
towire_brid(ARGS_TOWIRE) {
REQUIRE(rdata->type == dns_rdatatype_brid);
REQUIRE(rdata->length >= 3);
UNUSED(cctx);
return mem_tobuffer(target, rdata->data, rdata->length);
}
static int
compare_brid(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
REQUIRE(rdata1->type == rdata2->type);
REQUIRE(rdata1->rdclass == rdata2->rdclass);
REQUIRE(rdata1->type == dns_rdatatype_brid);
REQUIRE(rdata1->length > 0);
REQUIRE(rdata2->length > 0);
dns_rdata_toregion(rdata1, &r1);
dns_rdata_toregion(rdata2, &r2);
return isc_region_compare(&r1, &r2);
}
static isc_result_t
fromstruct_brid(ARGS_FROMSTRUCT) {
dns_rdata_brid_t *brid = source;
REQUIRE(type == dns_rdatatype_brid);
REQUIRE(brid != NULL);
REQUIRE(brid->common.rdtype == type);
REQUIRE(brid->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
/* Data */
return mem_tobuffer(target, brid->data, brid->datalen);
}
static isc_result_t
tostruct_brid(ARGS_TOSTRUCT) {
dns_rdata_brid_t *brid = target;
isc_region_t sr;
REQUIRE(rdata->type == dns_rdatatype_brid);
REQUIRE(brid != NULL);
REQUIRE(rdata->length > 0);
DNS_RDATACOMMON_INIT(brid, rdata->type, rdata->rdclass);
dns_rdata_toregion(rdata, &sr);
/* Data */
brid->datalen = sr.length;
brid->data = mem_maybedup(mctx, sr.base, brid->datalen);
brid->mctx = mctx;
return ISC_R_SUCCESS;
}
static void
freestruct_brid(ARGS_FREESTRUCT) {
dns_rdata_brid_t *brid = (dns_rdata_brid_t *)source;
REQUIRE(brid != NULL);
REQUIRE(brid->common.rdtype == dns_rdatatype_brid);
if (brid->mctx == NULL) {
return;
}
if (brid->data != NULL) {
isc_mem_free(brid->mctx, brid->data);
}
brid->mctx = NULL;
}
static isc_result_t
additionaldata_brid(ARGS_ADDLDATA) {
REQUIRE(rdata->type == dns_rdatatype_brid);
UNUSED(rdata);
UNUSED(owner);
UNUSED(add);
UNUSED(arg);
return ISC_R_SUCCESS;
}
static isc_result_t
digest_brid(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == dns_rdatatype_brid);
dns_rdata_toregion(rdata, &r);
return (digest)(arg, &r);
}
static bool
checkowner_brid(ARGS_CHECKOWNER) {
REQUIRE(type == dns_rdatatype_brid);
UNUSED(name);
UNUSED(type);
UNUSED(rdclass);
UNUSED(wildcard);
return true;
}
static bool
checknames_brid(ARGS_CHECKNAMES) {
REQUIRE(rdata->type == dns_rdatatype_brid);
UNUSED(rdata);
UNUSED(owner);
UNUSED(bad);
return true;
}
static int
casecompare_brid(ARGS_COMPARE) {
return compare_brid(rdata1, rdata2);
}
#endif /* RDATA_GENERIC_BRID_68_C */

View file

@ -0,0 +1,21 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* SPDX-License-Identifier: MPL-2.0
*
* 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 https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
#pragma once
typedef struct dns_rdata_brid_t {
dns_rdatacommon_t common;
isc_mem_t *mctx;
uint16_t datalen;
unsigned char *data;
} dns_rdata_brid_t;

View file

@ -0,0 +1,214 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* SPDX-License-Identifier: MPL-2.0
*
* 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 https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
#ifndef RDATA_GENERIC_HHIT_67_C
#define RDATA_GENERIC_HHIT_67_C
#include <dst/dst.h>
#define RRTYPE_HHIT_ATTRIBUTES (0)
static isc_result_t
fromtext_hhit(ARGS_FROMTEXT) {
REQUIRE(type == dns_rdatatype_hhit);
UNUSED(type);
UNUSED(rdclass);
UNUSED(origin);
UNUSED(options);
UNUSED(callbacks);
return isc_base64_tobuffer(lexer, target, -1);
}
static isc_result_t
totext_hhit(ARGS_TOTEXT) {
isc_region_t sr;
REQUIRE(rdata->type == dns_rdatatype_hhit);
REQUIRE(rdata->length > 0);
dns_rdata_toregion(rdata, &sr);
/* data */
if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) {
RETERR(str_totext(" (", target));
}
RETERR(str_totext(tctx->linebreak, target));
if (tctx->width == 0) { /* No splitting */
RETERR(isc_base64_totext(&sr, 60, "", target));
} else {
RETERR(isc_base64_totext(&sr, tctx->width - 2, tctx->linebreak,
target));
}
if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) {
RETERR(str_totext(" )", target));
}
return ISC_R_SUCCESS;
}
static isc_result_t
fromwire_hhit(ARGS_FROMWIRE) {
isc_region_t sr;
REQUIRE(type == dns_rdatatype_hhit);
UNUSED(type);
UNUSED(rdclass);
UNUSED(options);
UNUSED(dctx);
isc_buffer_activeregion(source, &sr);
if (sr.length == 0) {
return ISC_R_UNEXPECTEDEND;
}
RETERR(mem_tobuffer(target, sr.base, sr.length));
isc_buffer_forward(source, sr.length);
return ISC_R_SUCCESS;
}
static isc_result_t
towire_hhit(ARGS_TOWIRE) {
REQUIRE(rdata->type == dns_rdatatype_hhit);
REQUIRE(rdata->length >= 3);
UNUSED(cctx);
return mem_tobuffer(target, rdata->data, rdata->length);
}
static int
compare_hhit(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
REQUIRE(rdata1->type == rdata2->type);
REQUIRE(rdata1->rdclass == rdata2->rdclass);
REQUIRE(rdata1->type == dns_rdatatype_hhit);
REQUIRE(rdata1->length > 0);
REQUIRE(rdata2->length > 0);
dns_rdata_toregion(rdata1, &r1);
dns_rdata_toregion(rdata2, &r2);
return isc_region_compare(&r1, &r2);
}
static isc_result_t
fromstruct_hhit(ARGS_FROMSTRUCT) {
dns_rdata_hhit_t *hhit = source;
REQUIRE(type == dns_rdatatype_hhit);
REQUIRE(hhit != NULL);
REQUIRE(hhit->common.rdtype == type);
REQUIRE(hhit->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
/* Data */
return mem_tobuffer(target, hhit->data, hhit->datalen);
}
static isc_result_t
tostruct_hhit(ARGS_TOSTRUCT) {
dns_rdata_hhit_t *hhit = target;
isc_region_t sr;
REQUIRE(rdata->type == dns_rdatatype_hhit);
REQUIRE(hhit != NULL);
REQUIRE(rdata->length > 0);
DNS_RDATACOMMON_INIT(hhit, rdata->type, rdata->rdclass);
dns_rdata_toregion(rdata, &sr);
/* Data */
hhit->datalen = sr.length;
hhit->data = mem_maybedup(mctx, sr.base, hhit->datalen);
hhit->mctx = mctx;
return ISC_R_SUCCESS;
}
static void
freestruct_hhit(ARGS_FREESTRUCT) {
dns_rdata_hhit_t *hhit = (dns_rdata_hhit_t *)source;
REQUIRE(hhit != NULL);
REQUIRE(hhit->common.rdtype == dns_rdatatype_hhit);
if (hhit->mctx == NULL) {
return;
}
if (hhit->data != NULL) {
isc_mem_free(hhit->mctx, hhit->data);
}
hhit->mctx = NULL;
}
static isc_result_t
additionaldata_hhit(ARGS_ADDLDATA) {
REQUIRE(rdata->type == dns_rdatatype_hhit);
UNUSED(rdata);
UNUSED(owner);
UNUSED(add);
UNUSED(arg);
return ISC_R_SUCCESS;
}
static isc_result_t
digest_hhit(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == dns_rdatatype_hhit);
dns_rdata_toregion(rdata, &r);
return (digest)(arg, &r);
}
static bool
checkowner_hhit(ARGS_CHECKOWNER) {
REQUIRE(type == dns_rdatatype_hhit);
UNUSED(name);
UNUSED(type);
UNUSED(rdclass);
UNUSED(wildcard);
return true;
}
static bool
checknames_hhit(ARGS_CHECKNAMES) {
REQUIRE(rdata->type == dns_rdatatype_hhit);
UNUSED(rdata);
UNUSED(owner);
UNUSED(bad);
return true;
}
static int
casecompare_hhit(ARGS_COMPARE) {
return compare_hhit(rdata1, rdata2);
}
#endif /* RDATA_GENERIC_HHIT_67_C */

View file

@ -0,0 +1,21 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* SPDX-License-Identifier: MPL-2.0
*
* 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 https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
#pragma once
typedef struct dns_rdata_hhit_t {
dns_rdatacommon_t common;
isc_mem_t *mctx;
uint16_t datalen;
unsigned char *data;
} dns_rdata_hhit_t;

View file

@ -1099,6 +1099,24 @@ ISC_RUN_TEST_IMPL(amtrelay) {
dns_rdatatype_amtrelay, sizeof(dns_rdata_amtrelay_t));
}
/* BRIB RDATA - base64 encoded opaque */
ISC_RUN_TEST_IMPL(brib) {
text_ok_t text_ok[] = { /* empty */
TEXT_INVALID(""),
/* valid base64 string */
TEXT_VALID("aaaa"),
/* invalid base64 string */
TEXT_INVALID("aaaaa"),
/*
* Sentinel.
*/
TEXT_SENTINEL()
};
check_rdata(text_ok, NULL, NULL, true, dns_rdataclass_in,
dns_rdatatype_brid, sizeof(dns_rdata_brid_t));
}
ISC_RUN_TEST_IMPL(cdnskey) {
key_required(state, dns_rdatatype_cdnskey, sizeof(dns_rdata_cdnskey_t));
}
@ -2035,6 +2053,24 @@ ISC_RUN_TEST_IMPL(hip) {
sizeof(dns_rdata_hip_t));
}
/* HHIT RDATA - base64 encoded opaque */
ISC_RUN_TEST_IMPL(hhit) {
text_ok_t text_ok[] = { /* empty */
TEXT_INVALID(""),
/* valid base64 string */
TEXT_VALID("aaaa"),
/* invalid base64 string */
TEXT_INVALID("aaaaa"),
/*
* Sentinel.
*/
TEXT_SENTINEL()
};
check_rdata(text_ok, NULL, NULL, true, dns_rdataclass_in,
dns_rdatatype_hhit, sizeof(dns_rdata_hhit_t));
}
/*
* ISDN tests.
*