mailgw now accepts registration confirmation mail that uses otk

For example, the following could be in the subject line:

.-- key <32-char otk, such as Aj4euk4LZSAdwePohj90SME5SpopLETL>.

Author: Johannes Gijsbers

roundup/mailgw.py

@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception. 
 
-$Id: mailgw.py,v 1.127 2003-09-05 20:56:39 jlgijsbers Exp $
+$Id: mailgw.py,v 1.128 2003-09-06 10:21:18 jlgijsbers Exp $
 """
 
 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
@@ -514,9 +514,15 @@ def handle_message(self, message):
             # get the classname
             classname = m.group('classname')
             if classname is None:
-                # no classname, fallback on the default
-                if hasattr(self.instance.config, 'MAIL_DEFAULT_CLASS') and \
-                        self.instance.config.MAIL_DEFAULT_CLASS:
+                # no classname, check if this a registration confirmation email
+                # or fallback on the default class
+                otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
+                otk = otk_re.search(m.group('title')).group('otk')
+                if otk:
+                    self.db.confirm_registration(otk)
+                    return
+                elif hasattr(self.instance.config, 'MAIL_DEFAULT_CLASS') and \
+                         self.instance.config.MAIL_DEFAULT_CLASS:
                     classname = self.instance.config.MAIL_DEFAULT_CLASS
                 else:
                     # fail

test/test_mailgw.py

@@ -8,7 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id: test_mailgw.py,v 1.46 2003-05-06 21:49:20 kedder Exp $
+# $Id: test_mailgw.py,v 1.47 2003-09-06 10:21:03 jlgijsbers Exp $
 
 import unittest, cStringIO, tempfile, os, shutil, errno, imp, sys, difflib
 import rfc822
@@ -959,9 +959,30 @@ def testRFC2822(self):
         self.assertEqual(rfc2822.encode_header(ascii_header), ascii_header)
         self.assertEqual(rfc2822.encode_header(unicode_header), unicode_encoded)
 
+    def testRegistrationConfirmation(self):
+        otk = "Aj4euk4LZSAdwePohj90SME5SpopLETL"
+        self.db.otks.set(otk, username='johannes', __time='')
+        message = cStringIO.StringIO('''Content-Type: text/plain;
+  charset="iso-8859-1"
+From: Chef <[email protected]>
+To: [email protected]
+Cc: richard@test
+Message-Id: <dummy_test_message_id>
+Subject: Re: Complete your registration to Roundup issue tracker
+ -- key %s
+
+This is a test confirmation of registration.
+''' % otk)
+        handler = self.instance.MailGW(self.instance, self.db)
+        handler.trapExceptions = 0
+        handler.main(message)
+
+        self.db.user.lookup('johannes')
+    
 def suite():
     l = [unittest.makeSuite(MailgwTestCase),
     ]
+    l = [MailgwTestCase("testRegistrationConfirmation")]
     return unittest.TestSuite(l)