mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
1b1877f025
* chore: Extract letsencrypt logic into methods This allows other scripts to share the functionality to discover the correct letsencrypt folder from the 3 possible locations (where specific order is important). As these methods should now return a string value, the `return 1` after a panic is now dropped. * chore: Update comments The todo is resolved with this PR, `_setup_ssl` will be called by both cert conditional statements with purpose for each better documented to maintainers at the start of the logic block. * refactor: Defer most logic to helper/ssl.sh The loop is no longer required, extraction is delegated to `_setup_ssl` now. For the change event prevention, we retrieve the relevant FQDN via the new helper method, beyond that it's just indentation diff. `check-for-changes.sh` adjusted to allow locally scoped var declarations by wrapping a function. Presently no loop control flow is needed so this seems fine. Made it clear that `CHANGED` is local and `CHKSUM_FILE` is not. Panic scope doesn't require `SSL_TYPE` for context, it's clearly`letsencrypt`. * fix: Correctly match wildcard results Now that the service configs are properly updated, when the services restart they will return a cert with the SAN `DNS:*.example.test`, which is valid for `mail.example.test`, however the test function did not properly account for this in the regexp query. Resolved by truncating the left-most DNS label from FQDN and adding a third check to match a returned wildcard DNS result. Extracted out the common logic to create the regexp query and renamed the methods to communicate more clearly that they check the FQDN is supported, not necessarily explicitly listed by the cert. * tests(letsencrypt): Enable remaining tests These will now pass. Adjusted comments accordingly. Added an additional test on a fake FQDN that should still be valid to a wildcard cert (SNI validation in a proper setup would reject the connection afterwards). Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> |
||
|---|---|---|
| .. | ||
| bats@54e965fa9d | ||
| config | ||
| docker-openldap | ||
| linting | ||
| test-files | ||
| test_helper | ||
| default_relay_host.bats | ||
| dovecot_inet_protocol.bats | ||
| helper-functions.bats | ||
| mail_changedetector.bats | ||
| mail_disabled_clamav_spamassassin.bats | ||
| mail_dnsbl.bats | ||
| mail_fail2ban.bats | ||
| mail_fetchmail.bats | ||
| mail_fetchmail_parallel.bats | ||
| mail_hostname.bats | ||
| mail_lmtp_ip.bats | ||
| mail_pop3.bats | ||
| mail_postfix_inet.bats | ||
| mail_postscreen.bats | ||
| mail_privacy.bats | ||
| mail_quotas_disabled.bats | ||
| mail_smtponly.bats | ||
| mail_spam_bounced.bats | ||
| mail_spam_junk_folder.bats | ||
| mail_special_use_folders.bats | ||
| mail_ssl_letsencrypt.bats | ||
| mail_ssl_manual.bats | ||
| mail_time.bats | ||
| mail_tls_dhparams.bats | ||
| mail_undef_spam_subject.bats | ||
| mail_with_imap.bats | ||
| mail_with_ldap.bats | ||
| mail_with_mdbox.bats | ||
| mail_with_postgrey.bats | ||
| mail_with_postgrey_disabled_by_default.bats | ||
| mail_with_relays.bats | ||
| mail_with_sdbox.bats | ||
| no_container.bats | ||
| open_dkim.bats | ||
| permit_docker.bats | ||
| security_tls_cipherlists.bats | ||
| sedfile.bats | ||
| test_helper.bats | ||
| tests.bats | ||