From: Mark Andrews Date: Wed, 30 Jul 2025 03:12:13 +0000 (+1000) Subject: Add support for parsing and displaying BRID rdata type X-Git-Tag: v9.21.12~5^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b29da55fceda75a6c159f21a372964d4a39b293;p=thirdparty%2Fbind9.git Add support for parsing and displaying BRID rdata type --- diff --git a/bin/tests/system/rrchecker/tests_rrchecker.py b/bin/tests/system/rrchecker/tests_rrchecker.py index cf5b6845cf6..d1cc1b71927 100644 --- a/bin/tests/system/rrchecker/tests_rrchecker.py +++ b/bin/tests/system/rrchecker/tests_rrchecker.py @@ -37,6 +37,7 @@ pytestmark = pytest.mark.extra_artifacts( "APL", "ATMA", "AVC", + "BRID", "CAA", "CDNSKEY", "CDS", diff --git a/lib/dns/rdata/generic/brid_68.c b/lib/dns/rdata/generic/brid_68.c new file mode 100644 index 00000000000..3dbae973097 --- /dev/null +++ b/lib/dns/rdata/generic/brid_68.c @@ -0,0 +1,213 @@ +/* + * 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 + +#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(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 */ diff --git a/lib/dns/rdata/generic/brid_68.h b/lib/dns/rdata/generic/brid_68.h new file mode 100644 index 00000000000..41caa0b4aa8 --- /dev/null +++ b/lib/dns/rdata/generic/brid_68.h @@ -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;