Merge pull request #122 from bryanjswift/recipient_delimiter

recipient_delimeter not working

roles/mailserver/files/etc_postfix_master.cf

@@ -126,6 +126,6 @@ mailman   unix  -       n       n       -       -       pipe
   ${nexthop} ${user}
 # spam protection
 dspam     unix  -       n       n       -       10      pipe
-  flags=Ru user=dspam argv=/usr/bin/dspam --deliver=innocent,spam --user $recipient -i -f $sender -- $recipient
+  flags=Ru user=dspam argv=/usr/bin/dspam --deliver=innocent,spam --user ${user}@${nexthop} -i -f $sender -- $recipient
 dovecot   unix  -       n       n       -       -       pipe
-  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/dovecot-lda -f ${sender} -d ${recipient}
+  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/dovecot-lda -f ${sender} -d ${user}@${nexthop}

tests.py

@@ -199,6 +199,16 @@ class MailTests(unittest.TestCase):
         s.quit()
         self.assertEmailReceived(subject)
 
+    def test_smtps_delimiter_to(self):
+        """Email sent to address with delimiter is delivered"""
+        import smtplib
+        msg, subject = new_message(TEST_ADDRESS, 'root+foo@sovereign.local')
+        s = smtplib.SMTP_SSL(TEST_SERVER, 465)
+        s.login(TEST_ADDRESS, TEST_PASSWORD)
+        s.sendmail(TEST_ADDRESS, ['root+foo@sovereign.local'], msg)
+        s.quit()
+        self.assertEmailReceived(subject)
+
     def test_smtps_requires_auth(self):
         """SMTPS with no authentication is rejected"""
         import smtplib