external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-20 02:52:11 +00:00
Code Issues Releases Wiki Activity

mta-sts, allow user to set custom tlsrpt record in dns without overwriting

Browse Source
This commit is contained in:
A. Schippers 2020-02-28 19:59:54 +01:00
parent 3b4ea80124
commit bc29e94811
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
management/dns_update.py
View File

@ -304,16 +304,17 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
records.append((qname, rtype, value, explanation)) records.append((qname, rtype, value, explanation))
# Adds autoconfiguration A records for all domains. # Adds autoconfiguration A records for all domains.
# This allows the following clients to automatically configure email addresses in the respective applications. # mta-sts.* - required A record for mta-sts (serving the policy)
# autodiscover.* - Z-Push ActiveSync Autodiscover
# autoconfig.* - Thunderbird Autoconfig
mta_sts_records = [ mta_sts_records = [
("mta-sts", "A", env["PUBLIC_IP"], "Provides MTA-STS support"), ("mta-sts", "A", env["PUBLIC_IP"], "Provides MTA-STS support"),
("mta-sts", "AAAA", env["PUBLIC_IPV6"], "Provides MTA-STS support"), ("mta-sts", "AAAA", env["PUBLIC_IPV6"], "Provides MTA-STS support"),
("_mta-sts", "TXT", "v=STSv1; id="+datetime.datetime.now().strftime("%Y%m%d%H%M%S")+"Z", "Enables MTA-STS support"), ("_mta-sts", "TXT", "v=STSv1; id="+datetime.datetime.now().strftime("%Y%m%d%H%M%S")+"Z", "Enables MTA-STS support")
("_smtp._tls", "TXT", "v=TLSRPTv1", "change to with v=TLSRPTv1; rua=mailto:email@addres for reporting")
] ]
# Skip if the user has set a custom _smtp._tls record.
if not has_rec("_smtp._tls", "TXT", prefix="v=TLSRPTv1;"):
mta_sts_records.append(("_smtp._tls", "TXT", "v=TLSRPTv1;", "change to a custom record like 'v=TLSRPTv1; rua=mailto:email@address' for reporting"))
for qname, rtype, value, explanation in mta_sts_records: for qname, rtype, value, explanation in mta_sts_records:
if value is None or value.strip() == "": continue # skip IPV6 if not set if value is None or value.strip() == "": continue # skip IPV6 if not set
if not has_rec(qname, rtype): if not has_rec(qname, rtype):