Skip to content

Add support for ZONEMD RR #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k0ekk0ek merged 1 commit into from
Aug 1, 2023
Merged

Add support for ZONEMD RR #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions src/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,17 +673,6 @@ int32_t zone_check_tlsa_rdata(
return accept_rr(parser);
}

zone_nonnull_all
int32_t zone_check_openpgpkey_rdata(
zone_parser_t *parser, const zone_type_info_t *type)
{
// FIXME: as the RDATA contains a digest, it is likely we can make this
// check stricter, at least, for known digests
if (parser->rdata->length < 4)
SYNTAX_ERROR(parser, "Invalid %s", TNAME(type));
return accept_rr(parser);
}

zone_nonnull_all
int32_t zone_check_l32_rdata(
zone_parser_t *parser, const zone_type_info_t *type)
Expand Down Expand Up @@ -739,6 +728,27 @@ int32_t zone_check_eui64_rdata(
return accept_rr(parser);
}

zone_nonnull_all
int32_t zone_check_openpgpkey_rdata(
zone_parser_t *parser, const zone_type_info_t *type)
{
// FIXME: as the RDATA contains a digest, it is likely we can make this
// check stricter, at least, for known digests
if (parser->rdata->length < 4)
SYNTAX_ERROR(parser, "Invalid %s", TNAME(type));
return accept_rr(parser);
}

zone_nonnull_all
int32_t zone_check_zonemd_rdata(
zone_parser_t *parser, const zone_type_info_t *type)
{
// FIXME: RDATA contains digests, do extra checks?
if (parser->rdata->length < 6)
SYNTAX_ERROR(parser, "Invalid %s", TNAME(type));
return accept_rr(parser);
}

zone_nonnull_all
int32_t zone_check_uri_rdata(
zone_parser_t *parser, const zone_type_info_t *type)
Expand Down
37 changes: 36 additions & 1 deletion src/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,31 @@ static int32_t parse_openpgpkey_rdata(
return accept_rr(parser);
}

zone_nonnull_all
extern int32_t zone_check_zonemd_rdata(
zone_parser_t *parser, const zone_type_info_t *type);

zone_nonnull_all
static int32_t parse_zonemd_rdata(
zone_parser_t *parser, const zone_type_info_t *type, token_t *token)
{
int32_t r;

if ((r = parse_int32(parser, type, &type->rdata.fields[0], token)) < 0)
return r;
lex(parser, token);
if ((r = parse_int8(parser, type, &type->rdata.fields[1], token)) < 0)
return r;
lex(parser, token);
if ((r = parse_int8(parser, type, &type->rdata.fields[2], token)) < 0)
return r;
lex(parser, token);
if ((r = parse_base16(parser, type, &type->rdata.fields[3], token)) < 0)
return r;

return accept_rr(parser);
}

zone_nonnull_all
extern int32_t zone_check_l32_rdata(
zone_parser_t *parser, const zone_type_info_t *type);
Expand Down Expand Up @@ -1121,6 +1146,13 @@ static const zone_field_info_t openpgpkey_rdata_fields[] = {
FIELD("key", ZONE_BLOB, ZONE_BASE64)
};

static const zone_field_info_t zonemd_rdata_fields[] = {
FIELD("serial", ZONE_INT32, 0),
FIELD("scheme", ZONE_INT8, 0),
FIELD("algorithm", ZONE_INT8, 0),
FIELD("digest", ZONE_BLOB, ZONE_BASE16),
};

static const zone_field_info_t spf_rdata_fields[] = {
FIELD("text", ZONE_STRING, ZONE_SEQUENCE)
};
Expand Down Expand Up @@ -1297,7 +1329,10 @@ static const type_descriptor_t types[] = {
zone_check_openpgpkey_rdata, parse_openpgpkey_rdata),

UNKNOWN_TYPE(62),
UNKNOWN_TYPE(63),

TYPE("ZONEMD", ZONE_ZONEMD, ZONE_ANY, FIELDS(zonemd_rdata_fields),
zone_check_zonemd_rdata, parse_zonemd_rdata),

UNKNOWN_TYPE(64),
UNKNOWN_TYPE(65),
UNKNOWN_TYPE(66),
Expand Down
26 changes: 26 additions & 0 deletions tests/types.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,30 @@ static const rdata_t openpgpkey_rdata =
0xfe, 0x59, 0xed, 0x5a, 0x4c, 0x18, 0x5a, 0x19,
0xaf, 0x3a, 0x01);

static const char zonemd_text[] =
PAD("example.com. 86400 IN ZONEMD 2018031500 1 1 (\n"
" FEBE3D4CE2EC2FFA4BA99D46CD69D6D29711E55217057BEE\n"
" 7EB1A7B641A47BA7FED2DD5B97AE499FAFA4F22C6BD647DE )");
static const char zonemd_generic_text[] =
PAD("example.com. 86400 CLASS1 TYPE63 \\# 54 "
/* serial */
"7848b78c"
/* scheme */
"01"
/* algorithm */
"01"
/* digest */
"febe3d4ce2ec2ffa4ba99d46cd69d6d29711e55217057bee"
"7eb1a7b641a47ba7fed2dd5b97ae499fafa4f22c6bd647de");
static const rdata_t zonemd_rdata =
RDATA(0x78, 0x48, 0xb7, 0x8c, 0x01, 0x01, 0xfe, 0xbe,
0x3d, 0x4c, 0xe2, 0xec, 0x2f, 0xfa, 0x4b, 0xa9,
0x9d, 0x46, 0xcd, 0x69, 0xd6, 0xd2, 0x97, 0x11,
0xe5, 0x52, 0x17, 0x05, 0x7b, 0xee, 0x7e, 0xb1,
0xa7, 0xb6, 0x41, 0xa4, 0x7b, 0xa7, 0xfe, 0xd2,
0xdd, 0x5b, 0x97, 0xae, 0x49, 0x9f, 0xaf, 0xa4,
0xf2, 0x2c, 0x6b, 0xd6, 0x47, 0xde);

static const char spf_text[] =
PAD(" SPF \"v=spf1 +all\"");
static const char spf_generic_text[] =
Expand Down Expand Up @@ -631,6 +655,8 @@ static const test_t tests[] = {
{ ZONE_CDNSKEY, cdnskey_generic_text, &cdnskey_rdata },
{ ZONE_OPENPGPKEY, openpgpkey_text, &openpgpkey_rdata },
{ ZONE_OPENPGPKEY, openpgpkey_generic_text, &openpgpkey_rdata },
{ ZONE_ZONEMD, zonemd_text, &zonemd_rdata },
{ ZONE_ZONEMD, zonemd_generic_text, &zonemd_rdata },
{ ZONE_SPF, spf_text, &spf_rdata },
{ ZONE_SPF, spf_generic_text, &spf_rdata },
{ ZONE_L32, l32_text, &l32_rdata },
Expand Down