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

Ability to set custom TTL values for custom DNS records (#28)

This commit is contained in:
David Duque 2021-09-16 15:35:04 +01:00 committed by David Duque
parent 113b7bd827
commit 3b0b2a1605
No known key found for this signature in database
GPG Key ID: 2F327738A3C0AE3A
4 changed files with 118 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
management/daemon.py
View File

@ -304,12 +304,14 @@ def dns_get_records(qname=None, rtype=None):
# Make a better data structure. # Make a better data structure.
records = [ records = [
{ {
"qname": r[0], "qname": r[0],
"rtype": r[1], "rtype": r[1],
"value": r[2], "value": r[2],
"sort-order": { }, "ttl": r[3],
} for r in records ] "sort-order": { },
}
for r in records ]
# To help with grouping by zone in qname sorting, label each record with which zone it is in. # To help with grouping by zone in qname sorting, label each record with which zone it is in.
# There's an inconsistency in how we handle zones in get_dns_zones and in sort_domains, so # There's an inconsistency in how we handle zones in get_dns_zones and in sort_domains, so
@ -349,7 +351,21 @@ def dns_set_record(qname, rtype="A"):
# Read the record value from the request BODY, which must be # Read the record value from the request BODY, which must be
# ASCII-only. Not used with GET. # ASCII-only. Not used with GET.
value = request.stream.read().decode("ascii", "ignore").strip() rec = request.form
value = ""
ttl = None
if isinstance(rec, dict):
value = request.form.get("value", "")
ttl = request.form.get("ttl", None)
else:
value = request.stream.read().decode("ascii", "ignore").strip()
if ttl is not None:
try:
ttl = int(ttl)
except Exception:
ttl = None
if request.method == "GET": if request.method == "GET":
# Get the existing records matching the qname and rtype. # Get the existing records matching the qname and rtype.
@ -383,7 +399,7 @@ def dns_set_record(qname, rtype="A"):
pass pass
action = "remove" action = "remove"
if set_custom_dns_record(qname, rtype, value, action, env): if set_custom_dns_record(qname, rtype, value, action, env, ttl = ttl):
return do_dns_update(env) or "Something isn't right." return do_dns_update(env) or "Something isn't right."
return "OK" return "OK"

118
management/dns_update.py
View File

@ -18,6 +18,10 @@ from ssl_certificates import get_ssl_certificates, check_certificate
# DNS but not in URLs), which are common in certain record types like for DKIM. # DNS but not in URLs), which are common in certain record types like for DKIM.
DOMAIN_RE = "^(?!\-)(?:[*][.])?(?:[a-zA-Z\d\-_]{0,62}[a-zA-Z\d_]\.){1,126}(?!\d+)[a-zA-Z\d_]{1,63}(\.?)$" DOMAIN_RE = "^(?!\-)(?:[*][.])?(?:[a-zA-Z\d\-_]{0,62}[a-zA-Z\d_]\.){1,126}(?!\d+)[a-zA-Z\d_]{1,63}(\.?)$"
DEFAULT_TTL = 86400 # 24 hours; MIAB-generated records and all custom records without a specified TTL will use this one.
TTL_MIN = 30 # 30 seconds; Most resolvers will not honor TTL values below this one. Some have an higher min TTL.
TTL_MAX = 2592000 # 30 days; some DNS services have lower caps (7 days)
def get_dns_domains(env): def get_dns_domains(env):
# Add all domain names in use by email users and mail aliases, any # Add all domain names in use by email users and mail aliases, any
# domains we serve web for (except www redirects because that would # domains we serve web for (except www redirects because that would
@ -179,32 +183,32 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True)
# is managed outside of the box. # is managed outside of the box.
if is_zone: if is_zone:
# Obligatory NS record to ns1.PRIMARY_HOSTNAME. # Obligatory NS record to ns1.PRIMARY_HOSTNAME.
records.append((None, "NS", "ns1.%s." % env["PRIMARY_HOSTNAME"], False)) records.append((None, "NS", "ns1.%s." % env["PRIMARY_HOSTNAME"], False, None))
# NS record to ns2.PRIMARY_HOSTNAME or whatever the user overrides. # NS record to ns2.PRIMARY_HOSTNAME or whatever the user overrides.
# User may provide one or more additional nameservers # User may provide one or more additional nameservers
secondary_ns_list = get_secondary_dns(additional_records, mode="NS") \ secondary_ns_list = get_secondary_dns(additional_records, mode="NS") \
or ["ns2." + env["PRIMARY_HOSTNAME"]] or ["ns2." + env["PRIMARY_HOSTNAME"]]
for secondary_ns in secondary_ns_list: for secondary_ns in secondary_ns_list:
records.append((None, "NS", secondary_ns+'.', False)) records.append((None, "NS", secondary_ns+'.', False, None))
# In PRIMARY_HOSTNAME... # In PRIMARY_HOSTNAME...
if domain == env["PRIMARY_HOSTNAME"]: if domain == env["PRIMARY_HOSTNAME"]:
# Set the A/AAAA records. Do this early for the PRIMARY_HOSTNAME so that the user cannot override them # Set the A/AAAA records. Do this early for the PRIMARY_HOSTNAME so that the user cannot override them
# and we can provide different explanatory text. # and we can provide different explanatory text.
records.append((None, "A", env["PUBLIC_IP"], "Required. Sets the IP address of the box.")) records.append((None, "A", env["PUBLIC_IP"], "Required. Sets the IP address of the box.", None))
if env.get("PUBLIC_IPV6"): records.append((None, "AAAA", env["PUBLIC_IPV6"], "Required. Sets the IPv6 address of the box.")) if env.get("PUBLIC_IPV6"): records.append((None, "AAAA", env["PUBLIC_IPV6"], "Required. Sets the IPv6 address of the box.", None))
# Add a DANE TLSA record for SMTP. # Add a DANE TLSA record for SMTP.
records.append(("_25._tcp", "TLSA", build_tlsa_record(env), "Recommended when DNSSEC is enabled. Advertises to mail servers connecting to the box that mandatory encryption should be used.")) records.append(("_25._tcp", "TLSA", build_tlsa_record(env), "Recommended when DNSSEC is enabled. Advertises to mail servers connecting to the box that mandatory encryption should be used.", None))
# Add a DANE TLSA record for HTTPS, which some browser extensions might make use of. # Add a DANE TLSA record for HTTPS, which some browser extensions might make use of.
records.append(("_443._tcp", "TLSA", build_tlsa_record(env), "Optional. When DNSSEC is enabled, provides out-of-band HTTPS certificate validation for a few web clients that support it.")) records.append(("_443._tcp", "TLSA", build_tlsa_record(env), "Optional. When DNSSEC is enabled, provides out-of-band HTTPS certificate validation for a few web clients that support it.", None))
# Add a SSHFP records to help SSH key validation. One per available SSH key on this system. # Add a SSHFP records to help SSH key validation. One per available SSH key on this system.
for value in build_sshfp_records(): for value in build_sshfp_records():
records.append((None, "SSHFP", value, "Optional. Provides an out-of-band method for verifying an SSH key before connecting. Use 'VerifyHostKeyDNS yes' (or 'VerifyHostKeyDNS ask') when connecting with ssh.")) records.append((None, "SSHFP", value, "Optional. Provides an out-of-band method for verifying an SSH key before connecting. Use 'VerifyHostKeyDNS yes' (or 'VerifyHostKeyDNS ask') when connecting with ssh.", None))
# Add DNS records for any subdomains of this domain. We should not have a zone for # Add DNS records for any subdomains of this domain. We should not have a zone for
# both a domain and one of its subdomains. # both a domain and one of its subdomains.
@ -213,12 +217,12 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True)
for subdomain in subdomains: for subdomain in subdomains:
subdomain_qname = subdomain[0:-len("." + domain)] subdomain_qname = subdomain[0:-len("." + domain)]
subzone = build_zone(subdomain, domain_properties, additional_records, env, is_zone=False) subzone = build_zone(subdomain, domain_properties, additional_records, env, is_zone=False)
for child_qname, child_rtype, child_value, child_explanation in subzone: for child_qname, child_rtype, child_value, child_explanation, child_ttl in subzone:
if child_qname == None: if child_qname == None:
child_qname = subdomain_qname child_qname = subdomain_qname
else: else:
child_qname += "." + subdomain_qname child_qname += "." + subdomain_qname
records.append((child_qname, child_rtype, child_value, child_explanation)) records.append((child_qname, child_rtype, child_value, child_explanation, child_ttl))
has_rec_base = list(records) # clone current state has_rec_base = list(records) # clone current state
def has_rec(qname, rtype, prefix=None): def has_rec(qname, rtype, prefix=None):
@ -229,7 +233,7 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True)
# The user may set other records that don't conflict with our settings. # The user may set other records that don't conflict with our settings.
# Don't put any TXT records above this line, or it'll prevent any custom TXT records. # Don't put any TXT records above this line, or it'll prevent any custom TXT records.
for qname, rtype, value in filter_custom_records(domain, additional_records): for qname, rtype, value, ttl in filter_custom_records(domain, additional_records):
# Don't allow custom records for record types that override anything above. # Don't allow custom records for record types that override anything above.
# But allow multiple custom records for the same rtype --- see how has_rec_base is used. # But allow multiple custom records for the same rtype --- see how has_rec_base is used.
if has_rec(qname, rtype): continue if has_rec(qname, rtype): continue
@ -243,7 +247,7 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True)
value = env["PUBLIC_IPV6"] value = env["PUBLIC_IPV6"]
else: else:
continue continue
records.append((qname, rtype, value, "(Set by user.)")) records.append((qname, rtype, value, "(Set by user.)", ttl))
# Add A/AAAA defaults if not overridden by the user's custom settings (and not otherwise configured). # Add A/AAAA defaults if not overridden by the user's custom settings (and not otherwise configured).
# Any CNAME or A record on the qname overrides A and AAAA. But when we set the default A record, # Any CNAME or A record on the qname overrides A and AAAA. But when we set the default A record,
@ -270,7 +274,7 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True)
# (2) there is not a CNAME record already, since you can't set both and who knows what takes precedence # (2) there is not a CNAME record already, since you can't set both and who knows what takes precedence
# (2) there is not an A record already (if this is an A record this is a dup of (1), and if this is an AAAA record then don't set a default AAAA record if the user sets a custom A record, since the default wouldn't make sense and it should not resolve if the user doesn't provide a new AAAA record) # (2) there is not an A record already (if this is an A record this is a dup of (1), and if this is an AAAA record then don't set a default AAAA record if the user sets a custom A record, since the default wouldn't make sense and it should not resolve if the user doesn't provide a new AAAA record)
if not has_rec(qname, rtype) and not has_rec(qname, "CNAME") and not has_rec(qname, "A"): if not has_rec(qname, rtype) and not has_rec(qname, "CNAME") and not has_rec(qname, "A"):
records.append((qname, rtype, value, explanation)) records.append((qname, rtype, value, explanation, None))
# Don't pin the list of records that has_rec checks against anymore. # Don't pin the list of records that has_rec checks against anymore.
has_rec_base = records has_rec_base = records
@ -278,7 +282,7 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True)
if domain_properties[domain]["mail"]: if domain_properties[domain]["mail"]:
# The MX record says where email for the domain should be delivered: Here! # The MX record says where email for the domain should be delivered: Here!
if not has_rec(None, "MX", prefix="10 "): if not has_rec(None, "MX", prefix="10 "):
records.append((None, "MX", "10 %s." % env["PRIMARY_HOSTNAME"], "Required. Specifies the hostname (and priority) of the machine that handles @%s mail." % domain)) records.append((None, "MX", "10 %s." % env["PRIMARY_HOSTNAME"], "Required. Specifies the hostname (and priority) of the machine that handles @%s mail." % domain, None))
# SPF record: Permit the box ('mx', see above) to send mail on behalf of # SPF record: Permit the box ('mx', see above) to send mail on behalf of
# the domain, and no one else. # the domain, and no one else.
@ -298,7 +302,7 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True)
# Append a DMARC record. # Append a DMARC record.
# Skip if the user has set a DMARC record already. # Skip if the user has set a DMARC record already.
if not has_rec("_dmarc", "TXT", prefix="v=DMARC1; "): if not has_rec("_dmarc", "TXT", prefix="v=DMARC1; "):
records.append(("_dmarc", "TXT", 'v=DMARC1; p=quarantine', "Recommended. Specifies that mail that does not originate from the box but claims to be from @%s or which does not have a valid DKIM signature is suspect and should be quarantined by the recipient's mail system." % domain)) records.append(("_dmarc", "TXT", 'v=DMARC1; p=quarantine', "Recommended. Specifies that mail that does not originate from the box but claims to be from @%s or which does not have a valid DKIM signature is suspect and should be quarantined by the recipient's mail system." % domain, None))
if domain_properties[domain]["user"]: if domain_properties[domain]["user"]:
# Add CardDAV/CalDAV SRV records on the non-primary hostname that points to the primary hostname # Add CardDAV/CalDAV SRV records on the non-primary hostname that points to the primary hostname
@ -308,7 +312,7 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True)
for dav in ("card", "cal"): for dav in ("card", "cal"):
qname = "_" + dav + "davs._tcp" qname = "_" + dav + "davs._tcp"
if not has_rec(qname, "SRV"): if not has_rec(qname, "SRV"):
records.append((qname, "SRV", "0 0 443 " + env["PRIMARY_HOSTNAME"] + ".", "Recommended. Specifies the hostname of the server that handles CardDAV/CalDAV services for email addresses on this domain.")) records.append((qname, "SRV", "0 0 443 " + env["PRIMARY_HOSTNAME"] + ".", "Recommended. Specifies the hostname of the server that handles CardDAV/CalDAV services for email addresses on this domain.", None))
# If this is a domain name that there are email addresses configured for, i.e. "something@" # If this is a domain name that there are email addresses configured for, i.e. "something@"
# this domain name, then the domain name is a MTA-STS (https://tools.ietf.org/html/rfc8461) # this domain name, then the domain name is a MTA-STS (https://tools.ietf.org/html/rfc8461)
@ -345,29 +349,29 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True)
# Enable SMTP TLS reporting (https://tools.ietf.org/html/rfc8460) if the user has set a config option. # Enable SMTP TLS reporting (https://tools.ietf.org/html/rfc8460) if the user has set a config option.
# Skip if the rules below if the user has set a custom _smtp._tls record. # Skip if the rules below if the user has set a custom _smtp._tls record.
if env.get("MTA_STS_TLSRPT_RUA") and not has_rec("_smtp._tls", "TXT", prefix="v=TLSRPTv1;"): if env.get("MTA_STS_TLSRPT_RUA") and not has_rec("_smtp._tls", "TXT", prefix="v=TLSRPTv1;"):
mta_sts_records.append(("_smtp._tls", "TXT", "v=TLSRPTv1; rua=" + env["MTA_STS_TLSRPT_RUA"], "Optional. Enables MTA-STS reporting.")) mta_sts_records.append(("_smtp._tls", "TXT", "v=TLSRPTv1; rua=" + env["MTA_STS_TLSRPT_RUA"], "Optional. Enables MTA-STS reporting.", None))
for qname, rtype, value, explanation in mta_sts_records: for qname, rtype, value, explanation in mta_sts_records:
if not has_rec(qname, rtype): if not has_rec(qname, rtype):
records.append((qname, rtype, value, explanation)) records.append((qname, rtype, value, explanation, None))
# Add no-mail-here records for any qname that has an A or AAAA record # Add no-mail-here records for any qname that has an A or AAAA record
# but no MX record. This would include domain itself if domain is a # but no MX record. This would include domain itself if domain is a
# non-mail domain and also may include qnames from custom DNS records. # non-mail domain and also may include qnames from custom DNS records.
# Do this once at the end of generating a zone. # Do this once at the end of generating a zone.
if is_zone: if is_zone:
qnames_with_a = set(qname for (qname, rtype, value, explanation) in records if rtype in ("A", "AAAA")) qnames_with_a = set(qname for (qname, rtype, value, explanation, ttl) in records if rtype in ("A", "AAAA"))
qnames_with_mx = set(qname for (qname, rtype, value, explanation) in records if rtype == "MX") qnames_with_mx = set(qname for (qname, rtype, value, explanation, ttl) in records if rtype == "MX")
for qname in qnames_with_a - qnames_with_mx: for qname in qnames_with_a - qnames_with_mx:
# Mark this domain as not sending mail with hard-fail SPF and DMARC records. # Mark this domain as not sending mail with hard-fail SPF and DMARC records.
d = (qname+"." if qname else "") + domain d = (qname+"." if qname else "") + domain
if not has_rec(qname, "TXT", prefix="v=spf1 "): if not has_rec(qname, "TXT", prefix="v=spf1 "):
records.append((qname, "TXT", 'v=spf1 -all', "Recommended. Prevents use of this domain name for outbound mail by specifying that no servers are valid sources for mail from @%s. If you do send email from this domain name you should either override this record such that the SPF rule does allow the originating server, or, take the recommended approach and have the box handle mail for this domain (simply add any receiving alias at this domain name to make this machine treat the domain name as one of its mail domains)." % d)) records.append((qname, "TXT", 'v=spf1 -all', "Recommended. Prevents use of this domain name for outbound mail by specifying that no servers are valid sources for mail from @%s. If you do send email from this domain name you should either override this record such that the SPF rule does allow the originating server, or, take the recommended approach and have the box handle mail for this domain (simply add any receiving alias at this domain name to make this machine treat the domain name as one of its mail domains)." % d, None))
if not has_rec("_dmarc" + ("."+qname if qname else ""), "TXT", prefix="v=DMARC1; "): if not has_rec("_dmarc" + ("."+qname if qname else ""), "TXT", prefix="v=DMARC1; "):
records.append(("_dmarc" + ("."+qname if qname else ""), "TXT", 'v=DMARC1; p=reject', "Recommended. Prevents use of this domain name for outbound mail by specifying that the SPF rule should be honoured for mail from @%s." % d)) records.append(("_dmarc" + ("."+qname if qname else ""), "TXT", 'v=DMARC1; p=reject', "Recommended. Prevents use of this domain name for outbound mail by specifying that the SPF rule should be honoured for mail from @%s." % d, None))
# And with a null MX record (https://explained-from-first-principles.com/email/#null-mx-record) # And with a null MX record (https://explained-from-first-principles.com/email/#null-mx-record)
if not has_rec(qname, "MX"): if not has_rec(qname, "MX"):
records.append((qname, "MX", '0 .', "Recommended. Prevents use of this domain name for incoming mail.")) records.append((qname, "MX", '0 .', "Recommended. Prevents use of this domain name for incoming mail.", None))
# Sort the records. The None records *must* go first in the nsd zone file. Otherwise it doesn't matter. # Sort the records. The None records *must* go first in the nsd zone file. Otherwise it doesn't matter.
records.sort(key = lambda rec : list(reversed(rec[0].split(".")) if rec[0] is not None else "")) records.sort(key = lambda rec : list(reversed(rec[0].split(".")) if rec[0] is not None else ""))
@ -492,24 +496,26 @@ def write_nsd_zone(domain, zonefile, records, env, force):
zone = """ zone = """
$ORIGIN {domain}. $ORIGIN {domain}.
$TTL 86400 ; default time to live $TTL {ttl} ; default time to live
@ IN SOA ns1.{primary_domain}. hostmaster.{primary_domain}. ( @ IN SOA ns1.{primary_domain}. hostmaster.{primary_domain}. (
__SERIAL__ ; serial number __SERIAL__ ; serial number
7200 ; Refresh (secondary nameserver update interval) 7200 ; Refresh (secondary nameserver update interval)
86400 ; Retry (when refresh fails, how often to try again) {ttl} ; Retry (when refresh fails, how often to try again)
1209600 ; Expire (when refresh fails, how long secondary nameserver will keep records around anyway) 1209600 ; Expire (when refresh fails, how long secondary nameserver will keep records around anyway)
86400 ; Negative TTL (how long negative responses are cached) {ttl} ; Negative TTL (how long negative responses are cached)
) )
""" """
# Replace replacement strings. # Replace replacement strings.
zone = zone.format(domain=domain, primary_domain=env["PRIMARY_HOSTNAME"]) zone = zone.format(domain=domain, primary_domain=env["PRIMARY_HOSTNAME"], ttl=DEFAULT_TTL)
# Add records. # Add records.
for subdomain, querytype, value, explanation in records: for subdomain, querytype, value, explanation, ttl in records:
if subdomain: if subdomain:
zone += subdomain zone += subdomain
if ttl is not None:
zone += "\t" + str(ttl)
zone += "\tIN\t" + querytype + "\t" zone += "\tIN\t" + querytype + "\t"
if querytype == "TXT": if querytype == "TXT":
# Divide into 255-byte max substrings. # Divide into 255-byte max substrings.
@ -811,34 +817,42 @@ def get_custom_dns_config(env, only_real_records=False):
except: except:
return [ ] return [ ]
for qname, value in custom_dns.items(): for qname, entry in custom_dns.items():
if qname == "_secondary_nameserver" and only_real_records: continue # skip fake record if qname == "_secondary_nameserver" and only_real_records: continue # skip fake record
# Short form. Mapping a domain name to a string is short-hand # Short form. Mapping a domain name to a string is short-hand
# for creating A records. # for creating A records.
if isinstance(value, str): if isinstance(entry, str):
values = [("A", value)] values = [("A", entry)]
# A mapping creates multiple records. # A mapping creates multiple records.
elif isinstance(value, dict): elif isinstance(entry, dict):
values = value.items() values = entry.items()
# No other type of data is allowed. # No other type of data is allowed.
else: else:
raise ValueError() raise ValueError()
for rtype, value2 in values: for rtype, value in values:
if isinstance(value2, str): if isinstance(value, str):
yield (qname, rtype, value2) yield (qname, rtype, value, None)
elif isinstance(value2, list): elif isinstance(value, dict):
for value3 in value2: yield (qname, rtype, value.get("value"), value.get("ttl"))
yield (qname, rtype, value3) elif isinstance(value, list):
# No other type of data is allowed. for val in value:
if isinstance(val, str):
yield (qname, rtype, val, None)
elif isinstance(val, dict):
yield (qname, rtype, val.get("value"), val.get("ttl"))
else:
# No other type of data is allowed.
raise ValueError()
else: else:
# No other type of data is allowed.
raise ValueError() raise ValueError()
def filter_custom_records(domain, custom_dns_iter): def filter_custom_records(domain, custom_dns_iter):
for qname, rtype, value in custom_dns_iter: for qname, rtype, value, ttl in custom_dns_iter:
# We don't count the secondary nameserver config (if present) as a record - that would just be # We don't count the secondary nameserver config (if present) as a record - that would just be
# confusing to users. Instead it is accessed/manipulated directly via (get/set)_custom_dns_config. # confusing to users. Instead it is accessed/manipulated directly via (get/set)_custom_dns_config.
if qname == "_secondary_nameserver": continue if qname == "_secondary_nameserver": continue
@ -856,10 +870,10 @@ def filter_custom_records(domain, custom_dns_iter):
else: else:
qname = qname[0:len(qname)-len("." + domain)] qname = qname[0:len(qname)-len("." + domain)]
yield (qname, rtype, value) yield (qname, rtype, value, ttl)
def write_custom_dns_config(config, env): def write_custom_dns_config(config, env):
# We get a list of (qname, rtype, value) triples. Convert this into a # We get a list of (qname, rtype, value, ttl) triples. Convert this into a
# nice dictionary format for storage on disk. # nice dictionary format for storage on disk.
from collections import OrderedDict from collections import OrderedDict
config = list(config) config = list(config)
@ -871,8 +885,8 @@ def write_custom_dns_config(config, env):
if qname in seen_qnames: continue if qname in seen_qnames: continue
seen_qnames.add(qname) seen_qnames.add(qname)
records = [(rec[1], rec[2]) for rec in config if rec[0] == qname] records = [(rec[1], rec[2], rec[3]) for rec in config if rec[0] == qname]
if len(records) == 1 and records[0][0] == "A": if len(records) == 1 and records[0][0] == "A" and records[0][2] is None:
dns[qname] = records[0][1] dns[qname] = records[0][1]
else: else:
dns[qname] = OrderedDict() dns[qname] = OrderedDict()
@ -883,7 +897,7 @@ def write_custom_dns_config(config, env):
if rtype in seen_rtypes: continue if rtype in seen_rtypes: continue
seen_rtypes.add(rtype) seen_rtypes.add(rtype)
values = [rec[1] for rec in records if rec[0] == rtype] values = [(rec[1] if rec[2] is None else {"value": rec[1], "ttl": min(max(TTL_MIN, rec[2]), TTL_MAX)}) for rec in records if rec[0] == rtype]
if len(values) == 1: if len(values) == 1:
values = values[0] values = values[0]
dns[qname][rtype] = values dns[qname][rtype] = values
@ -893,7 +907,7 @@ def write_custom_dns_config(config, env):
with open(os.path.join(env['STORAGE_ROOT'], 'dns/custom.yaml'), "w") as f: with open(os.path.join(env['STORAGE_ROOT'], 'dns/custom.yaml'), "w") as f:
f.write(config_yaml) f.write(config_yaml)
def set_custom_dns_record(qname, rtype, value, action, env): def set_custom_dns_record(qname, rtype, value, action, env, ttl=None):
# validate qname # validate qname
for zone, fn in get_dns_zones(env): for zone, fn in get_dns_zones(env):
# It must match a zone apex or be a subdomain of a zone # It must match a zone apex or be a subdomain of a zone
@ -939,14 +953,14 @@ def set_custom_dns_record(qname, rtype, value, action, env):
newconfig = [] newconfig = []
made_change = False made_change = False
needs_add = True needs_add = True
for _qname, _rtype, _value in config: for _qname, _rtype, _value, _ttl in config:
if action == "add": if action == "add":
if (_qname, _rtype, _value) == (qname, rtype, value): if (_qname, _rtype, _value) == (qname, rtype, value):
# Record already exists. Bail. # Record already exists. Bail.
return False return False
elif action == "set": elif action == "set":
if (_qname, _rtype) == (qname, rtype): if (_qname, _rtype) == (qname, rtype):
if _value == value: if _value == value and _ttl == ttl:
# Flag that the record already exists, don't # Flag that the record already exists, don't
# need to add it. # need to add it.
needs_add = False needs_add = False
@ -967,10 +981,10 @@ def set_custom_dns_record(qname, rtype, value, action, env):
raise ValueError("Invalid action: " + action) raise ValueError("Invalid action: " + action)
# Preserve this record. # Preserve this record.
newconfig.append((_qname, _rtype, _value)) newconfig.append((_qname, _rtype, _value, _ttl))
if action in ("add", "set") and needs_add and value is not None: if action in ("add", "set") and needs_add and value is not None:
newconfig.append((qname, rtype, value)) newconfig.append((qname, rtype, value, ttl))
made_change = True made_change = True
if made_change: if made_change:
@ -985,7 +999,7 @@ def get_secondary_dns(custom_dns, mode=None):
resolver.timeout = 10 resolver.timeout = 10
values = [] values = []
for qname, rtype, value in custom_dns: for qname, rtype, value, ttl in custom_dns:
if qname != '_secondary_nameserver': continue if qname != '_secondary_nameserver': continue
for hostname in value.split(" "): for hostname in value.split(" "):
hostname = hostname.strip() hostname = hostname.strip()
@ -1052,7 +1066,7 @@ def set_secondary_dns(hostnames, env):
def get_custom_dns_records(custom_dns, qname, rtype): def get_custom_dns_records(custom_dns, qname, rtype):
for qname1, rtype1, value in custom_dns: for qname1, rtype1, value, ttl in custom_dns:
if qname1 == qname and rtype1 == rtype: if qname1 == qname and rtype1 == rtype:
yield value yield value
return None return None

33
management/templates/custom-dns.html
View File

@ -44,9 +44,19 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="customdnsValue" class="col-sm-1 control-label">Value</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" class="form-control" id="customdnsValue" placeholder=""> <table>
<tr style="width: 100%;">
<td style="width: 75%;">
<label for="customdnsValue" class="control-label">Value</label>
<input type="text" class="form-control" id="customdnsValue" placeholder="">
</td>
<td style="width: 25%;">
<label for="customdnsTtl" class="col-sm-1 control-label">TTL</label>
<input type="number" class="form-control" style="margin-left: 5pt;" id="customdnsTtl" placeholder="default">
</td>
</tr>
</table>
<div id="customdnsTypeHint" class="text-info" style="margin-top: .5em"></div> <div id="customdnsTypeHint" class="text-info" style="margin-top: .5em"></div>
</div> </div>
</div> </div>
@ -57,7 +67,7 @@
</div> </div>
</form> </form>
<div style="text-align: right; font-size; 90%; margin-top: 1em;"> <div style="text-align: right; font-size: 90%; margin-top: 1em;">
sort by: sort by:
<a href="#" onclick="window.miab_custom_dns_data_sort_order='qname'; show_current_custom_dns_update_after_sort(); return false;">domain name</a> <a href="#" onclick="window.miab_custom_dns_data_sort_order='qname'; show_current_custom_dns_update_after_sort(); return false;">domain name</a>
| |
@ -68,10 +78,11 @@
<th>Domain Name</th> <th>Domain Name</th>
<th>Record Type</th> <th>Record Type</th>
<th>Value</th> <th>Value</th>
<th>TTL</th>
<th></th> <th></th>
</thead> </thead>
<tbody> <tbody>
<tr><td colspan="4">Loading...</td></tr> <tr><td colspan="5">Loading...</td></tr>
</tbody> </tbody>
</table> </table>
@ -214,7 +225,7 @@ function show_current_custom_dns_update_after_sort() {
var last_zone = null; var last_zone = null;
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
if (sort_key == "qname" && data[i].zone != last_zone) { if (sort_key == "qname" && data[i].zone != last_zone) {
var r = $("<tr><th colspan=4 style='background-color: #EEE'></th></tr>"); var r = $("<tr><th colspan=5 style='background-color: #EEE'></th></tr>");
r.find("th").text(data[i].zone); r.find("th").text(data[i].zone);
tbody.append(r); tbody.append(r);
last_zone = data[i].zone; last_zone = data[i].zone;
@ -228,6 +239,11 @@ function show_current_custom_dns_update_after_sort() {
tr.append($('<td class="long"/>').text(data[i].qname)); tr.append($('<td class="long"/>').text(data[i].qname));
tr.append($('<td/>').text(data[i].rtype)); tr.append($('<td/>').text(data[i].rtype));
tr.append($('<td class="long" style="max-width: 40em"/>').text(data[i].value)); tr.append($('<td class="long" style="max-width: 40em"/>').text(data[i].value));
if (data[i].ttl) {
tr.append($('<td/>').text(data[i].ttl));
} else {
tr.append($('<td/>').html('<i class="">default</i>'));
}
tr.append($('<td>[<a href="#" onclick="return delete_custom_dns_record(this)">delete</a>]</td>')); tr.append($('<td>[<a href="#" onclick="return delete_custom_dns_record(this)">delete</a>]</td>'));
} }
} }
@ -264,10 +280,15 @@ function do_set_custom_dns(qname, rtype, value, method) {
else else
qname = $('#customdnsZone').val(); qname = $('#customdnsZone').val();
rtype = $('#customdnsType').val(); rtype = $('#customdnsType').val();
value = $('#customdnsValue').val(); value = {
value: $('#customdnsValue').val(),
ttl: $('#customdnsTtl').val()
};
method = 'POST'; method = 'POST';
} }
console.log(value)
api( api(
"/dns/custom/" + qname + "/" + rtype, "/dns/custom/" + qname + "/" + rtype,
method, method,

2
management/web_update.py
View File

@ -52,7 +52,7 @@ def get_web_domains(env, include_www_redirects=True, include_auto=True, exclude_
def get_domains_with_a_records(env): def get_domains_with_a_records(env):
domains = set() domains = set()
dns = get_custom_dns_config(env) dns = get_custom_dns_config(env)
for domain, rtype, value in dns: for domain, rtype, value, ttl in dns:
if rtype == "CNAME" or (rtype in ("A", "AAAA") and value not in ("local", env['PUBLIC_IP'])): if rtype == "CNAME" or (rtype in ("A", "AAAA") and value not in ("local", env['PUBLIC_IP'])):
domains.add(domain) domains.add(domain)
return domains return domains