Skip to content

Fixes to MTA STS logic as reported by Xombran in #2526 #2538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes to MTA STS logic as reported by Xombran in #2526 #2538

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions management/dns_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import dns.resolver

from utils import shell, load_env_vars_from_file, safe_domain_name, sort_domains, get_ssh_port
from ssl_certificates import get_ssl_certificates, check_certificate
from ssl_certificates import get_ssl_certificates, check_certificate, get_domain_ssl_files

# From https://stackoverflow.com/questions/3026957/how-to-validate-a-domain-name-using-regex-php/16491074#16491074
# This regular expression matches domain names according to RFCs, it also accepts fqdn with an leading dot,
Expand Down Expand Up @@ -376,7 +376,14 @@ def has_rec(qname, rtype, prefix=None):
return records

def is_domain_cert_signed_and_valid(domain, env):
cert = get_ssl_certificates(env).get(domain)
# Get all certificates known to the system.
all_certs = get_ssl_certificates(env)

# Use the SMART, wildcard-aware function to find the correct certificate for this domain.
# We set allow_missing_cert=True so it returns None instead of the default cert if no
# match is found.
cert = get_domain_ssl_files(domain, all_certs, env, allow_missing_cert=True, use_main_cert=False)

if not cert: return False # no certificate provisioned
cert_status = check_certificate(domain, cert['certificate'], cert['private-key'])
return cert_status[0] == 'OK'
Expand Down