external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Some secondary DNS hosting providers like DNS Made Easy provide different IP addresses for notifies and zone transfers. Added the ability to add these in the custom.yaml, but purposely did not expose it in the UI as it would probably serve to confuse the majority of people. 

The format in the custom.yaml file for the IPs to send notifies and allow zone transfers to (but that we do not want NS records created for) is like this:
_secondary_notify_xfr:
  A:
  - 1.1.1.1
  - 2.2.2.2
This commit is contained in:
Brian Bustin 2015-07-01 21:55:54 -04:00
parent 32a6ebe2ca
commit f9c078c3aa
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
management/dns_update.py
View File

@ -468,13 +468,21 @@ zone:
# If custom secondary nameservers have been set, allow zone transfers # If custom secondary nameservers have been set, allow zone transfers
# and notifies to them. # and notifies to them.
if get_secondary_dns(additional_records): if get_secondary_dns(additional_records, ['_secondary_nameserver']):
for hostname in get_secondary_dns(additional_records): for hostname in get_secondary_dns(additional_records):
# Get the IP address of the nameserver by resolving it. # Get the IP address of the nameserver by resolving it.
resolver = dns.resolver.get_default_resolver() resolver = dns.resolver.get_default_resolver()
response = dns.resolver.query(hostname+'.', "A") response = dns.resolver.query(hostname+'.', "A")
ipaddr = str(response[0]) ipaddr = str(response[0])
nsdconf += "\n\tnotify: %s NOKEY\n\tprovide-xfr: %s NOKEY" % (ipaddr, ipaddr) nsdconf += "\n\tnotify: %s NOKEY\n\tprovide-xfr: %s NOKEY" % (ipaddr, ipaddr)
# Some providers use different servers for zone transfers and notifies
# such as DNS Made Easy. This allows us to set these IP addresses as well manually
# in custom.yaml
if get_secondary_dns(additional_records, ["_secondary_notify_xfr"]):
for ipaddr in get_secondary_dns(additional_records, ["_secondary_notify_xfr"]):
nsdconf += "\n\tnotify: %s NOKEY\n\tprovide-xfr: %s NOKEY" % (ipaddr, ipaddr)
# Check if the file is changing. If it isn't changing, # Check if the file is changing. If it isn't changing,
# return False to flag that no change was made. # return False to flag that no change was made.
@ -791,10 +799,14 @@ def set_custom_dns_record(qname, rtype, value, action, env):
######################################################################## ########################################################################
def get_secondary_dns(custom_dns): def get_secondary_dns(custom_dns, dns_type=['_secondary_nameserver']):
valid_types = set(['_secondary_nameserver', '_secondary_notify_xfr'])
if not valid_types.issuperset(set(dns_type)):
raise ValueError("Valid types are one or more of the following: %s" % ", ".join(valid_types))
values = [] values = []
for qname, rtype, value in custom_dns: for qname, rtype, value in custom_dns:
if qname == "_secondary_nameserver": if qname in dns_type:
if isinstance(value, str): if isinstance(value, str):
values.append(value) values.append(value)
if len(values) > 0: if len(values) > 0: