DNS: Warn if forwarding policy conflicts with automatic empty zones

Forwarding policy "first" or "none" may conflicts with some automatic empty
zones. Queries for zones specified by RFC 6303 will ignore
forwarding and recursion and always result in NXDOMAIN answers.

This is not detected and warned about. Global forwarding is equivalent
to forward zone ".".

Example:
Forward zone 1.10.in-addr.arpa with policy "first"
will not forward anything because BIND will automatically prefer
automatic empty zone "10.in-addr.arpa." which is authoritative.

https://fedorahosted.org/freeipa/ticket/5710

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Petr Spacek 2016-05-04 10:30:18 +02:00 committed by Martin Basti
parent 037eae26d0
commit da71e7e9de
3 changed files with 57 additions and 0 deletions

View File

@ -378,6 +378,23 @@ class FailedToRemoveHostDNSRecords(PublicMessage):
"(%(reason)s)")
class DNSForwardPolicyConflictWithEmptyZone(PublicMessage):
"""
**13021** Forward zone 1.10.in-addr.arpa with policy "first"
will not forward anything because BIND automatically prefers
empty zone "10.in-addr.arpa.".
"""
errno = 13021
type = "warning"
format = _(
"Forwarding policy conflicts with some automatic empty zones. "
"Queries for zones specified by RFC 6303 will ignore "
"forwarding and recursion and always result in NXDOMAIN answers. "
"To override this behavior use forward policy 'only'."
)
def iter_messages(variables, base):
"""Return a tuple with all subclasses
"""

View File

@ -66,6 +66,7 @@ from ipalib.util import (normalize_zonemgr,
from ipapython.dn import DN
from ipapython.ipautil import CheckedIPAddress, check_zone_overlap
from ipapython.dnsutil import DNSName
from ipapython.dnsutil import related_to_auto_empty_zone
if six.PY3:
unicode = str
@ -2079,6 +2080,20 @@ def _add_warning_fw_zone_is_not_effective(api, result, fwzone, version):
)
def _add_warning_fw_policy_conflict_aez(result, fwzone, **options):
"""Warn if forwarding policy conflicts with an automatic empty zone."""
fwd_policy = result['result'].get(u'idnsforwardpolicy',
dnsforwardzone.default_forward_policy)
if (
fwd_policy != [u'only']
and related_to_auto_empty_zone(DNSName(fwzone))
):
messages.add_message(
options['version'], result,
messages.DNSForwardPolicyConflictWithEmptyZone()
)
class DNSZoneBase(LDAPObject):
"""
Base class for DNS Zone
@ -4418,7 +4433,13 @@ class dnsconfig_mod(LDAPUpdate):
result = super(dnsconfig_mod, self).execute(*keys, **options)
self.obj.postprocess_result(result)
# this check makes sense only when resulting forwarders are non-empty
if result['result'].get('idnsforwarders'):
fwzone = DNSName('.')
_add_warning_fw_policy_conflict_aez(result, fwzone, **options)
if forwarders:
# forwarders were changed
for forwarder in forwarders:
try:
validate_dnssec_global_forwarder(forwarder, log=self.log)
@ -4559,6 +4580,7 @@ class dnsforwardzone(DNSZoneBase):
)
)
@register()
class dnsforwardzone_add(DNSZoneBase_add):
__doc__ = _('Create new DNS forward zone.')
@ -4589,8 +4611,10 @@ class dnsforwardzone_add(DNSZoneBase_add):
return dn
def execute(self, *keys, **options):
fwzone = keys[-1]
result = super(dnsforwardzone_add, self).execute(*keys, **options)
self.obj._warning_fw_zone_is_not_effective(result, *keys, **options)
_add_warning_fw_policy_conflict_aez(result, fwzone, **options)
if options.get('idnsforwarders'):
self.obj._warning_if_forwarders_do_not_work(
result, True, *keys, **options)
@ -4646,7 +4670,9 @@ class dnsforwardzone_mod(DNSZoneBase_mod):
return dn
def execute(self, *keys, **options):
fwzone = keys[-1]
result = super(dnsforwardzone_mod, self).execute(*keys, **options)
_add_warning_fw_policy_conflict_aez(result, fwzone, **options)
if options.get('idnsforwarders'):
self.obj._warning_if_forwarders_do_not_work(result, False, *keys,
**options)

View File

@ -1762,6 +1762,13 @@ class test_dns(Declarative):
'value': None,
'summary': None,
u'messages': (
{u'message': lambda x: x.startswith(
u"Forwarding policy conflicts with some "
"automatic empty zones."),
u'code': 13021,
u'type': u'warning',
u'name': u'DNSForwardPolicyConflictWithEmptyZone',
u'data': {}},
{u'message': lambda x: x.startswith(
u"DNS server %s: query '. SOA':" % fwd_ip),
u'code': 13006,
@ -3437,6 +3444,13 @@ class test_forward_zones(Declarative):
'value': fwzone2_dnsname,
'summary': None,
u'messages': (
{u'message': lambda x: x.startswith(
u"Forwarding policy conflicts with some "
"automatic empty zones."),
u'code': 13021,
u'type': u'warning',
u'name': u'DNSForwardPolicyConflictWithEmptyZone',
u'data': {}},
{u'message': lambda x: x.startswith(
u"DNS server %s: query '%s SOA':" %
(forwarder1, fwzone2)),