pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: correctly extract email from email field in computed blacklist fields

Browse Source 
Purpose of this commit is to correctly extract email address from the email
field of models inheriting from the blacklist mixin. Indeed email field
could contain a formatted address like "Raoul Grosbedon <RAOUL@example.com>".
Related blacklist entry would be raoul@example.com. We have to extract
the email from the email field and lowerize it in the SQL query or the
computation in order to have a fully working blacklist mixin. This fixes
some bits left at commit 2ff9b379ef.

This commit is related to task ID 33224 (original blacklist implementation
done for v12) and its PR #25966 as well as task ID 1889703 (tests and fixes)
and its PR #27330. Done with collaboration of @dbeguin.
This commit is contained in:
Thibault Delavallée
2018-10-02 16:52:30 +02:00
parent bbe4690066
commit 2b73bed880
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/models/mail_blacklist.py
+10 -12
View File
@@ -124,16 +124,17 @@ class MailBlackListMixin(models.AbstractModel):
if value:
query = """
SELECT m.id
FROM mail_blacklist bl
JOIN %s m on (LOWER(m.%s) = LOWER(bl.email) AND bl.active)
FROM mail_blacklist bl
JOIN %s m
ON (LOWER(substring(m.%s, '([^ ,;<@]+@[^> ,;]+)')) = bl.email AND bl.active)
"""
else:
query = """
SELECT m.id
SELECT m.id
FROM %s m
LEFT JOIN mail_blacklist bl
ON (LOWER(m.%s) = LOWER(bl.email) AND bl.active)
WHERE bl.id IS NULL
LEFT JOIN mail_blacklist bl
ON (LOWER(substring(m.%s, '([^ ,;<@]+@[^> ,;]+)')) = bl.email AND bl.active)
WHERE bl.id IS NULL
"""
self._cr.execute(query % (self._table, email_field))
res = self._cr.fetchall()
@@ -147,10 +148,7 @@ class MailBlackListMixin(models.AbstractModel):
[email_field] = self._primary_email
# TODO : Should remove the sudo as compute_sudo defined on methods.
# But if user doesn't have access to mail.blacklist, doen't work without sudo().
BL_sudo = self.env['mail.blacklist'].sudo()
emails_lower = [(email or '').lower() for email in self.mapped(email_field)]
blacklist = set(e.lower()
for e in BL_sudo.search([('email', 'in', emails_lower)]).mapped('email'))
sanitized = [self.env['mail.blacklist']._sanitize_email(email) for email in self.mapped(email_field)]
blacklist = set(self.env['mail.blacklist'].sudo().search([('email', 'in', sanitized)]).mapped('email'))
for record in self:
email_lower = (record[email_field] or '').lower()
record.is_blacklisted = email_lower in blacklist
record.is_blacklisted = self.env['mail.blacklist']._sanitize_email(record[email_field]) in blacklist