Merge pull request #133 from tilsammans/pop3s

Enabled POP3S for old-timeys who dig that

README.textile

@@ -28,6 +28,7 @@ h2. Services Provided
 What do you get if you point this thing at a VPS? All kinds of good stuff!
 
 * "IMAP":https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol over SSL via "Dovecot":http://dovecot.org/, complete with full text search provided by "Solr":https://lucene.apache.org/solr/.
+* "POP3":https://en.wikipedia.org/wiki/Post_Office_Protocol over SSL, also via Dovecot
 * "SMTP":https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol over SSL via Postfix, including a nice set of "DNSBLs":https://en.wikipedia.org/wiki/DNSBL to discard spam before it ever hits your filters.
 * Webmail via "Roundcube":http://www.roundcube.net/.
 * Mobile push notifications via "Z-Push":http://z-push.sourceforge.net/soswp/index.php?pages_id=1&t=home.

roles/common/tasks/ufw.yml

@@ -16,6 +16,7 @@
     - https/tcp
     - ssh/tcp
     - ssmtp/tcp
+    - pop3s/tcp
     - imaps/tcp
     - 5222/tcp  # xmpp c2s
     - 5269/tcp  # xmpp s2s

roles/mailserver/files/etc_dovecot_dovecot.conf

@@ -96,4 +96,4 @@ dict {
 # A config file can also tried to be included without giving an error if
 # it's not found:
 !include_try /usr/share/dovecot/protocols.d/*.protocol
-protocols = imap lmtp sieve
+protocols = imap lmtp sieve pop3

roles/mailserver/tasks/dovecot.yml

@@ -3,6 +3,7 @@
   with_items:
     - dovecot-core
     - dovecot-imapd
+    - dovecot-pop3d
     - dovecot-lmtpd
     - dovecot-managesieved
     - postgresql-9.1

roles/monitoring/files/etc_monit_conf.d_dovecot

@@ -3,4 +3,5 @@ check process dovecot with pidfile /var/run/dovecot/master.pid
   start program = "/etc/init.d/dovecot start"
   stop program = "/etc/init.d/dovecot stop"
   if failed port 993 type tcpssl sslauto protocol imap for 5 cycles then restart
-  if 3 restarts within 5 cycles then timeout
+  if failed port 995 type tcpssl sslauto protocol pop for 5 cycles then restart
+  if 3 restarts within 5 cycles then timeout

tests.py

@@ -161,8 +161,8 @@ def new_message(from_email, to_email):
 
 
 class MailTests(unittest.TestCase):
-    def assertEmailReceived(self, subject):
-        """Connects with IMAP and asserts the existance of an email, then deletes it"""
+    def assertIMAPReceived(self, subject):
+        """Connects with IMAP and asserts the existence of an email, then deletes it"""
         import imaplib
 
         sleep(1)
@@ -172,7 +172,7 @@ class MailTests(unittest.TestCase):
         m.login(TEST_ADDRESS, TEST_PASSWORD)
         m.select()
 
-        # Assert the message exist
+        # Assert the message exists
         typ, data = m.search(None, '(SUBJECT \"{}\")'.format(subject))
         self.assertTrue(len(data[0].split()), 1)
 
@@ -182,6 +182,26 @@ class MailTests(unittest.TestCase):
         m.close()
         m.logout()
 
+    def assertPOP3Received(self, subject):
+        """Connects with POP3S and asserts the existence of an email, then deletes it"""
+        import poplib
+
+        sleep(1)
+
+        # Login to POP3
+        mail = poplib.POP3_SSL(TEST_SERVER, 995)
+        mail.user(TEST_ADDRESS)
+        mail.pass_(TEST_PASSWORD)
+
+        # Assert the message exists
+        num = len(mail.list()[1])
+        resp, text, octets = mail.retr(num)
+        self.assertTrue("Subject: " + subject in text)
+
+        # Delete it and log out
+        mail.dele(num)
+        mail.quit()
+
     def test_imap_requires_ssl(self):
         """IMAP without SSL is NOT available"""
         import imaplib
@@ -189,6 +209,13 @@ class MailTests(unittest.TestCase):
         with self.assertRaisesRegexp(socket.timeout, 'timed out'):
             imaplib.IMAP4(TEST_SERVER, 143)
 
+    def test_pop3_requires_ssl(self):
+        """POP3 without SSL is NOT available"""
+        import poplib
+
+        with self.assertRaisesRegexp(socket.timeout, 'timed out'):
+            poplib.POP3(TEST_SERVER, 110)
+
     def test_smtps(self):
         """Email sent from an MUA via SMTPS is delivered"""
         import smtplib
@@ -197,7 +224,7 @@ class MailTests(unittest.TestCase):
         s.login(TEST_ADDRESS, TEST_PASSWORD)
         s.sendmail(TEST_ADDRESS, ['root@sovereign.local'], msg)
         s.quit()
-        self.assertEmailReceived(subject)
+        self.assertIMAPReceived(subject)
 
     def test_smtps_delimiter_to(self):
         """Email sent to address with delimiter is delivered"""
@@ -207,7 +234,7 @@ class MailTests(unittest.TestCase):
         s.login(TEST_ADDRESS, TEST_PASSWORD)
         s.sendmail(TEST_ADDRESS, ['root+foo@sovereign.local'], msg)
         s.quit()
-        self.assertEmailReceived(subject)
+        self.assertIMAPReceived(subject)
 
     def test_smtps_requires_auth(self):
         """SMTPS with no authentication is rejected"""
@@ -226,7 +253,7 @@ class MailTests(unittest.TestCase):
         s = smtplib.SMTP(TEST_SERVER, 25)
         s.sendmail('someone@example.com', [TEST_ADDRESS], msg)
         s.quit()
-        self.assertEmailReceived(subject)
+        self.assertIMAPReceived(subject)
 
     def test_smtp_tls(self):
         """Email sent from an MTA via SMTP+TLS is delivered"""
@@ -236,7 +263,7 @@ class MailTests(unittest.TestCase):
         s.starttls()
         s.sendmail('someone@example.com', [TEST_ADDRESS], msg)
         s.quit()
-        self.assertEmailReceived(subject)
+        self.assertIMAPReceived(subject)
 
     def test_smtps_headers(self):
         """Email sent from an MUA has DKIM and TLS headers"""
@@ -312,6 +339,16 @@ class MailTests(unittest.TestCase):
         m.close()
         m.logout()
 
+    def test_pop3s(self):
+        """Connects with POP3S and asserts the existance of an email, then deletes it"""
+        import smtplib
+        msg, subject = new_message(TEST_ADDRESS, 'root@sovereign.local')
+        s = smtplib.SMTP_SSL(TEST_SERVER, 465)
+        s.login(TEST_ADDRESS, TEST_PASSWORD)
+        s.sendmail(TEST_ADDRESS, ['root@sovereign.local'], msg)
+        s.quit()
+        self.assertPOP3Received(subject)
+
 
 class XMPPTests(unittest.TestCase):
     def test_xmpp_c2s(self):