Fix matching of incoming email addresses to the alternate_addresses field...

...of a user -- this would match substrings, e.g. if the user has
[email protected] as an alternate email and an incoming mail
is addressed to [email protected] this would (wrongly) match.

Note: I *think* I've seen this discussed somewhere but couldn't find it,
neither in the tracker nor in recent discussions on the mailinglists.
So if someone remembers an issue which now should be closed, please
tell me :-)

Author: Ralf Schlatterbeck

CHANGES.txt

@@ -8,12 +8,15 @@ Entries without name were done by Richard Jones.
 Features:
 Fixed:
 
-issue2550715: IndexError when requesting non-existing file via http.
+- issue2550715: IndexError when requesting non-existing file via http.
   Reported and fixed by C�dric Krier. (Bernhard)
-
-issue2550695: 'No sort or group' settings not retained when editing queries.
+- issue2550695: 'No sort or group' settings not retained when editing queries.
   Reported and fixed by John Kristensen. Tested by Satchidanand Haridas. 
   (Bernhard)
+- Fix matching of incoming email addresses to the alternate_addresses
+  field of a user -- this would match substrings, e.g. if the user has
+  [email protected] as an alternate email and an incoming mail
+  is addressed to [email protected] this would (wrongly) match. (Ralf)
 
 2011-07-15 1.4.19 (r4638)
 

roundup/mailgw.py

@@ -1666,7 +1666,17 @@ def uidFromAddress(db, address, create=1, **user_props):
     props = db.user.getprops()
     if props.has_key('alternate_addresses'):
         users = db.user.filter(None, {'alternate_addresses': address})
-        user = extractUserFromList(db.user, users)
+        # We want an exact match of the email, not just a substring
+        # match. Otherwise e.g. [email protected] would match
+        # [email protected] which is not what we want.
+        found_users = []
+        for u in users:
+            alt = db.user.get(u, 'alternate_addresses').split('\n')
+            for a in alt:
+                if a.strip().lower() == address.lower():
+                    found_users.append(u)
+                    break
+        user = extractUserFromList(db.user, found_users)
         if user is not None:
             return user
 

test/test_mailgw.py

@@ -2205,6 +2205,12 @@ def testUserAlternateLookup(self):
         self.assertEqual(uidFromAddress(self.db, ('', '[email protected]'), 0), i)
         self.assertEqual(uidFromAddress(self.db, ('', '[email protected]'), 0), i)
 
+    def testUserAlternateSubstringNomatch(self):
+        i = self.db.user.create(username='user1', address='[email protected]',
+                                alternate_addresses='[email protected]')
+        self.assertEqual(uidFromAddress(self.db, ('', '[email protected]'), 0), 0)
+        self.assertEqual(uidFromAddress(self.db, ('', '[email protected]'), 0), 0)
+
     def testUserCreate(self):
         i = uidFromAddress(self.db, ('', '[email protected]'), 1)
         self.assertNotEqual(uidFromAddress(self.db, ('', '[email protected]'), 1), i)