Merge b37d856c63 into 3d553961d3

Makefile

@@ -149,6 +149,7 @@ fixtures:
 	docker exec mail /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/amavis-virus.txt"
 	docker exec mail /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-alias-external.txt"
 	docker exec mail /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-alias-local.txt"
+	docker exec mail /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-alias-recipient-delimiter.txt"
 	docker exec mail /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-user.txt"
 	docker exec mail /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-user-and-cc-local-alias.txt"
 	docker exec mail /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-regexp-alias-external.txt"

target/postfix/main.cf

@@ -58,7 +58,7 @@ smtpd_sasl_local_domain = $myhostname
 broken_sasl_auth_clients = yes
 
 # Mail directory
-virtual_transport = lmtp:unix:/var/run/dovecot/lmtp
+virtual_transport = dovecot
 virtual_mailbox_domains = /etc/postfix/vhost
 virtual_mailbox_maps = texthash:/etc/postfix/vmailbox
 virtual_alias_maps = texthash:/etc/postfix/virtual

target/postfix/master.cf

@@ -62,6 +62,8 @@ scalemail-backend unix	-	n	n	-	2	pipe
 mailman   unix  -       n       n       -       -       pipe
   flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
   ${nexthop} ${user}
+dovecot   unix  -       n       n       -       -       pipe
+  flags=DRhu user=docker:docker argv=/usr/lib/dovecot/deliver -f ${sender} -a ${recipient} -d ${user}@${nexthop}
 
 
 #

test/config/postfix-main.cf

@@ -1,2 +1,3 @@
+recipient_delimiter = -
 max_idle = 600s
-readme_directory = /tmp
+readme_directory = /tmp

test/email-templates/existing-alias-recipient-delimiter.txt

@@ -0,0 +1,12 @@
+HELO mail.external.tld
+MAIL FROM: user@external.tld
+RCPT TO: alias1-test@localhost.localdomain
+DATA
+From: Docker Mail Server <dockermailserver@external.tld>
+To: Existing Local Alias <alias1-test@localhost.localdomain>
+Date: Sat, 22 May 2010 07:43:25 -0400
+Subject: Test Message
+This is a test mail.
+
+.
+QUIT

test/tests.bats

@@ -261,9 +261,9 @@ load 'test_helper/bats-assert/load'
 }
 
 @test "checking smtp: delivers mail to existing account" {
-  run docker exec mail /bin/sh -c "grep 'postfix/lmtp' /var/log/mail/mail.log | grep 'status=sent' | grep ' Saved)' | wc -l"
+  run docker exec mail /bin/sh -c "grep 'postfix/pipe' /var/log/mail/mail.log | grep 'status=sent (delivered via dovecot service)' | wc -l"
   assert_success
-  assert_output 6
+  assert_output 7
 }
 
 @test "checking smtp: delivers mail to existing alias" {
@@ -272,6 +272,15 @@ load 'test_helper/bats-assert/load'
   assert_output 1
 }
 
+@test "checking smtp: delivers mail to existing alias with recipient delimiter" {
+  run docker exec mail /bin/sh -c "grep 'to=<user1-test@localhost.localdomain>, orig_to=<alias1-test@localhost.localdomain>' /var/log/mail/mail.log | grep 'status=sent' | wc -l"
+  assert_success
+  assert_output 1
+
+  run docker exec mail /bin/sh -c "grep 'to=<user1-test@localhost.localdomain>' /var/log/mail/mail.log | grep 'status=bounced'"
+  assert_failure
+}
+
 @test "checking smtp: delivers mail to existing catchall" {
   run docker exec mail /bin/sh -c "grep 'to=<user1@localhost.localdomain>, orig_to=<wildcard@localdomain2.com>' /var/log/mail/mail.log | grep 'status=sent' | wc -l"
   assert_success
@@ -287,7 +296,7 @@ load 'test_helper/bats-assert/load'
 @test "checking smtp: user1 should have received 5 mails" {
   run docker exec mail /bin/sh -c "ls -A /var/mail/localhost.localdomain/user1/new | wc -l"
   assert_success
-  assert_output 5
+  assert_output 6
 }
 
 @test "checking smtp: rejects mail to unknown user" {