upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-01 21:10:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow A records below '_spf' labels as recommend by RFC7208

Browse source 
(cherry picked from commit 63c16c8506)
This commit is contained in:
Mark Andrews 2021-01-06 14:22:00 +11:00 committed by Matthijs Mekking
parent 5710207191
commit 6da9f238d4
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/dns/rdata/in_1/a_1.c
View file

@ -207,6 +207,7 @@ digest_in_a(ARGS_DIGEST) {
static inline bool
checkowner_in_a(ARGS_CHECKOWNER) {
dns_name_t prefix, suffix;
unsigned int labels, i;
REQUIRE(type == dns_rdatatype_a);
REQUIRE(rdclass == dns_rdataclass_in);
@ -214,18 +215,41 @@ checkowner_in_a(ARGS_CHECKOWNER) {
UNUSED(type);
UNUSED(rdclass);
/*
* Handle Active Directory gc._msdcs.<forest> name.
*/
if (dns_name_countlabels(name) > 2U) {
labels = dns_name_countlabels(name);
if (labels > 2U) {
/*
* Handle Active Directory gc._msdcs.<forest> name.
*/
dns_name_init(&prefix, NULL);
dns_name_init(&suffix, NULL);
dns_name_split(name, dns_name_countlabels(name) - 2, &prefix,
&suffix);
dns_name_split(name, labels - 2, &prefix, &suffix);
if (dns_name_equal(&gc_msdcs, &prefix) &&
dns_name_ishostname(&suffix, false)) {
return (true);
}
/*
* Handle SPF exists targets when the seperating label is:
* - "_spf" RFC7208, section 5.7
* - "_spf_verify" RFC7208, Appendix D1
* - "_spf_rate" RFC7208, Appendix D1
*/
for (i = 0; i < labels - 2; i++) {
dns_label_t label;
dns_name_getlabel(name, i, &label);
if ((label.length == 5 &&
strncasecmp((char *)label.base, "\x04_spf", 5) ==
0) ||
(label.length == 12 &&
strncasecmp((char *)label.base, "\x0b_spf_verify",
12) == 0) ||
(label.length == 10 &&
strncasecmp((char *)label.base, "\x09_spf_rate",
10) == 0))
{
return (true);
}
}
}
return (dns_name_ishostname(name, wildcard));