From 70a5cc2f6feabc1c82d6d28c8a69e540d31ea5dc Mon Sep 17 00:00:00 2001 From: Morgan Kesler Date: Wed, 31 Aug 2016 08:43:53 -0400 Subject: [PATCH] Adding tests for manual SSL changes --- Makefile | 9 ++++++++- test/tests.bats | 27 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 17672ec8..1ff5a64c 100644 --- a/Makefile +++ b/Makefile @@ -75,6 +75,13 @@ run: -v "`pwd`/test":/tmp/docker-mailserver-test \ -e DISABLE_CLAMAV=1 \ -h mail.my-domain.com -t $(NAME) + docker run -d --name mail_manual_ssl \ + -v "`pwd`/test/config":/tmp/docker-mailserver \ + -v "`pwd`/test":/tmp/docker-mailserver-test \ + -e SSL_TYPE=manual \ + -e SSL_CERT_PATH=/tmp/docker-mailserver/letsencrypt/mail.my-domain.com/fullchain.pem \ + -e SSL_KEY_PATH=/tmp/docker-mailserver/letsencrypt/mail.my-domain.com/privkey.pem \ + -h mail.my-domain.com -t $(NAME) # Wait for containers to fully start sleep 20 @@ -104,4 +111,4 @@ tests: clean: # Remove running test containers - docker rm -f mail mail_pop3 mail_smtponly mail_fail2ban mail_fetchmail fail-auth-mailer mail_disabled_amavis mail_disabled_spamassassin mail_disabled_clamav + docker rm -f mail mail_pop3 mail_smtponly mail_fail2ban mail_fetchmail fail-auth-mailer mail_disabled_amavis mail_disabled_spamassassin mail_disabled_clamav mail_manual_ssl diff --git a/test/tests.bats b/test/tests.bats index 8be8f894..c929a362 100644 --- a/test/tests.bats +++ b/test/tests.bats @@ -433,6 +433,33 @@ [ "$status" -eq 0 ] } +@test "checking ssl: manual configuration is correct" { + run docker exec mail_manual_ssl /bin/sh -c 'grep -ir "/etc/postfix/ssl/cert" /etc/postfix/main.cf | wc -l' + [ "$status" -eq 0 ] + [ "$output" -eq 1 ] + run docker exec mail_manual_ssl /bin/sh -c 'grep -ir "/etc/postfix/ssl/cert" /etc/dovecot/conf.d/10-ssl.conf | wc -l' + [ "$status" -eq 0 ] + [ "$output" -eq 1 ] + run docker exec mail_manual_ssl /bin/sh -c 'grep -ir "/etc/postfix/ssl/key" /etc/postfix/main.cf | wc -l' + [ "$status" -eq 0 ] + [ "$output" -eq 1 ] + run docker exec mail_manual_ssl /bin/sh -c 'grep -ir "/etc/postfix/ssl/key" /etc/dovecot/conf.d/10-ssl.conf | wc -l' + [ "$status" -eq 0 ] + [ "$output" -eq 1 ] +} + +@test "checking ssl: manual configuration copied files correctly " { + run docker exec mail_manual_ssl /bin/sh -c 'cmp -s /etc/postfix/ssl/cert /tmp/docker-mailserver/letsencrypt/mail.my-domain.com/fullchain.pem' + [ "$status" -eq 0 ] + run docker exec mail_manual_ssl /bin/sh -c 'cmp -s /etc/postfix/ssl/key /tmp/docker-mailserver/letsencrypt/mail.my-domain.com/privkey.pem' + [ "$status" -eq 0 ] +} + +@test "checking ssl: manual cert works correctly" { + run docker exec mail_manual_ssl /bin/sh -c "timeout 1 openssl s_client -connect 0.0.0.0:587 -starttls smtp -CApath /etc/ssl/certs/ | grep 'Verify return code: 10 (certificate has expired)'" + [ "$status" -eq 0 ] +} + # # fail2ban #