[PATCH] Email address in user preferences is not honored when user name contains an "@"

[Robert Widhopf-Fenk]

We are using ​http://modauthkerb.sourceforge.net/ for single sign on and this generates user names of the form USER@REALM. Users have set their email addresses in the preferences, but they are not used as the user name already contains an "@" and is considered as an email address.

The following patch against 0.11.1 changes the code to honor the email address if one is given and to do the other guessing only if there is none.

notification.

@@ -277 +277 @@
                 return False
             return True
 
-        if not is_email(address):
-            if address == 'anonymous':
+        if address == 'anonymous':
+            return None
+
+        if self.email_map.has_key(address):
+            address = self.email_map[address]
+        elif not is_email(address) and NotifyEmail.nodomaddr_re.match(address):
+            if self.config.getbool('notification', 'use_short_addr'):
+                return address
+            domain = self.config.get('notification', 'smtp_default_domain')
+            if domain:
+                address = "%s@%s" % (address, domain)
+            else:
+                self.env.log.info("Email address w/o domain: %s" % address)
                 return None
-            if self.email_map.has_key(address):
-                address = self.email_map[address]
-            elif NotifyEmail.nodomaddr_re.match(address):
-                if self.config.getbool('notification', 'use_short_addr'):
-                    return address
-                domain = self.config.get('notification', 'smtp_default_domain')
-                if domain:
-                    address = "%s@%s" % (address, domain)
-                else:
-                    self.env.log.info("Email address w/o domain: %s" % address)
-                    return None
 
         mo = self.shortaddr_re.search(address)
         if mo:

[Thijs Triemstra <lists@…>]

I tested the patch but couldn't see any difference, it always tried to send to my_email @ [smtp_default_domain]. Here's the same patch against 0.12-stable.

trac/notification.py

@@ -355 +355 @@
                 return False
             return True
 
-        if not is_email(address):
-            if address == 'anonymous':
+        if address == 'anonymous':
+            return None
+        if self.email_map.has_key(address):
+            address = self.email_map[address]
+        elif not is_email(address) and NotifyEmail.nodomaddr_re.match(address):
+            if self.config.getbool('notification', 'use_short_addr'):
+                return address
+            domain = self.config.get('notification', 'smtp_default_domain')
+            if domain:
+                address = "%s@%s" % (address, domain)
+            else:
+                self.env.log.info("Email address w/o domain: %s" % address)
                 return None
-            if self.email_map.has_key(address):
-                address = self.email_map[address]
-            elif NotifyEmail.nodomaddr_re.match(address):
-                if self.config.getbool('notification', 'use_short_addr'):
-                    return address
-                domain = self.config.get('notification', 'smtp_default_domain')
-                if domain:
-                    address = "%s@%s" % (address, domain)
-                else:
-                    self.env.log.info("Email address w/o domain: %s" % address)
-                    return None
 
         mo = self.shortaddr_re.search(address)
         if mo:

[Thijs Triemstra <lists@…>]

Replying to Thijs Triemstra <lists@…>:

to send to my_email @ [smtp_default_domain].

I meant my_trac_username @ [smtp_default_domain].

[Remy Blank]

Give the e-mail address priorty over guessing from the user name.

[Remy Blank]

Replying to Thijs Triemstra <lists@…>:

I tested the patch but couldn't see any difference, it always tried to send to my_email @ [smtp_default_domain]. Here's the same patch against 0.12-stable.

I must have misunderstood your comment, because I thought your patch didn't fix the issue. I came up with exactly the same fix (in 8356-email-priority-r10321.patch​), and it passes the modified test case that checks for this.

Could you please test again if this patch solves the issue for you? The symptoms you describe may be unrelated.

[Thijs Triemstra <lists@…>]

Like I wrote in comment 5, I wasn't able to see a difference with the patch but I didn't have modauthkerb installed either so I'll leave it up to you rblank.

[Remy Blank]

Thanks for the feedback. Patch applied in [10347].