Merge pull request #8206 from 4teamwork/es/TI-3214-fix-same-sender-and-receiver

No longer send activity mails with same sender and receiver

Author: elioschmutz

changes/TI-3214.bugfix

@@ -0,0 +1 @@
+Fallback to noreply from address if sender and receiver of notification emails are equal. [elioschmutz]

opengever/activity/mailer.py

@@ -98,11 +98,16 @@ def prepare_mail(self, subject=u'', to_userid=None, to_email=None,
         noreply_gever_address = api.portal.get().email_from_address
         from_mail = noreply_gever_address
 
+        if to_userid:
+            to_email = ogds_service().fetch_user(to_userid).email
+
         send_with_actor_from_address = api.portal.get_registry_record(
             name='send_with_actor_from_address', interface=IOGMailSettings)
 
         if actor:
-            if not send_with_actor_from_address:
+            is_same_sender_and_receiver = actor.email == to_email
+            use_actors_email_for_from = send_with_actor_from_address and not is_same_sender_and_receiver
+            if not use_actors_email_for_from:
                 # Set From: header to full name of actor, but 'noreply' address
                 # of the GEVER deployment. Sending mails with the From-address of
                 # the actor would lead to them getting rejected in modern mail
@@ -124,9 +129,6 @@ def prepare_mail(self, subject=u'', to_userid=None, to_email=None,
             msg['From'] = make_addr_header(
                 self.default_addr_header, noreply_gever_address, 'utf-8')
 
-        if to_userid:
-            to_email = ogds_service().fetch_user(to_userid).email
-
         recipients = []
         if to_email:
             msg['To'] = to_email

opengever/activity/tests/test_mail.py

@@ -8,6 +8,7 @@
 from opengever.activity.roles import TASK_RESPONSIBLE_ROLE
 from opengever.base.interfaces import IOGMailSettings
 from opengever.globalindex.model.task import Task
+from opengever.ogds.models.user_settings import UserSettings
 from opengever.task.activities import TaskAddedActivity
 from opengever.testing import IntegrationTestCase
 from plone import api
@@ -179,6 +180,34 @@ def test_from_address_with_send_with_actor_from_address_enabled(self, browser):
         mail = email.message_from_string(Mailing(self.portal).pop())
         self.assertEquals('Ziegler Robert <[email protected]>', get_header(mail, 'From'))
 
+    @browsing
+    def test_from_address_fallback_if_notify_own_action_and_send_with_actor_from_address_enabled(self, browser):
+        UserSettings.save_setting_for_user(
+            self.regular_user.getId(), 'notify_own_actions', True)
+
+        api.portal.set_registry_record(
+            'send_with_actor_from_address', True, IOGMailSettings)
+
+        self.login(self.dossier_responsible, browser)
+        self.create_task_via_browser(browser)
+        process_mail_queue()
+
+        # It uses the email address of the currently logged in user to send
+        # an email, if the recipients email is different.
+        mail = email.message_from_string(Mailing(self.portal).pop())
+        self.assertEquals('Ziegler Robert <[email protected]>', get_header(mail, 'From'))
+        self.assertEquals('[email protected]', get_header(mail, 'To'))
+
+        self.login(self.regular_user, browser)
+        self.create_task_via_browser(browser)
+        process_mail_queue()
+
+        # But it uses the portal email address, if the senders email is the same
+        # as the recipient email address. This avoids spam filters blocking the email.
+        mail = email.message_from_string(Mailing(self.portal).pop())
+        self.assertEquals('B\xc3\xa4rfuss K\xc3\xa4thi <test@localhost>', get_header(mail, 'From'))
+        self.assertEquals('[email protected]', get_header(mail, 'To'))
+
     @browsing
     def test_task_title_is_linked_to_resolve_notification_view(self, browser):
         self.login(self.dossier_responsible, browser)