Tell user where to register in mail about user being unknown...

...if tracker allows anonymous web access + user creation.

Author: Erik Forsberg

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.188 2007-05-12 16:14:54 forsberg Exp $
+$Id: mailgw.py,v 1.189 2007-09-01 16:14:21 forsberg Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -906,8 +906,18 @@ def handle_message(self, message):
             if author == anonid:
                 # we're anonymous and we need to be a registered user
                 from_address = from_list[0][1]
+                registration_info = ""
+                if self.db.security.hasPermission('Web Access', author) and \
+                   self.db.security.hasPermission('Create', anonid, 'user'):
+                    tracker_web = self.instance.config.TRACKER_WEB
+                    registration_info = """ Please register at:
+
+%(tracker_web)suser?template=register
+
+...before sending mail to the tracker.""" % locals()
+                        
                 raise Unauthorized, _("""
-You are not a registered user.
+You are not a registered user.%(registration_info)s
 
 Unknown address: %(from_address)s
 """) % locals()

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.85 2007-02-15 03:09:53 richard Exp $
+# $Id: test_mailgw.py,v 1.86 2007-09-01 16:14:21 forsberg Exp $
 
 # TODO: test bcc
 
@@ -766,7 +766,48 @@ def testNewUserAuthor(self):
 
 This is a test submission of a new issue.
 '''
-        self.assertRaises(Unauthorized, self._handle_mail, message)
+        try:
+            self._handle_mail(message)
+        except Unauthorized, value:
+            body_diff = self.compareMessages(str(value), """
+You are not a registered user. 
+
+Unknown address: [email protected]
+""")
+
+            assert not body_diff, body_diff
+
+        else:
+            raise AssertionError, "Unathorized not raised when handling mail"
+
+        # Add Web Access role to anonymous, and try again to make sure
+        # we get a "please register at:" message this time.
+        p = [
+            self.db.security.getPermission('Create', 'user'),
+            self.db.security.getPermission('Web Access', None),
+        ]
+
+        self.db.security.role['anonymous'].permissions=p
+
+        try:
+            self._handle_mail(message)
+        except Unauthorized, value:
+            body_diff = self.compareMessages(str(value), """
+You are not a registered user. Please register at:
+
+http://tracker.example/cgi-bin/roundup.cgi/bugs/user?template=register
+
+...before sending mail to the tracker.
+
+Unknown address: [email protected]
+""")
+
+            assert not body_diff, body_diff
+
+        else:
+            raise AssertionError, "Unathorized not raised when handling mail"
+
+        # Make sure list of users is the same as before.
         m = self.db.user.list()
         m.sort()
         self.assertEqual(l, m)