issue2550957: Duplicate emails (with patch).

Bcc and cc users passed to nosymessage are not properly recorded.
This results in duplicate emails. Patch by Trent Gamblin (trentgg).
Applied by and test added by John Rouillard.

Author: rouilj

CHANGES.txt

@@ -476,6 +476,10 @@ Fixed:
 - issue2550953: Patch: fix for context.is_view_ok check in jinja2 template
   Form controls are displayed when anonymous views indexes but is
   denied access. (patch by Anton Schur applied by John Rouillard)
+- issue2550957: Duplicate emails (with patch).
+  Bcc and cc users passed to nosymessage are not properly recorded.
+  This results in duplicate emails. (patch by Trent Gamblin (trentgg)
+  applied by John Rouillard).
 
 2016-01-11: 1.5.1
 

roundup/roundupdb.py

@@ -330,6 +330,7 @@ def good_recipient(userid):
         for userid in cc + self.get(issueid, whichnosy):
             if good_recipient(userid):
                 add_recipient(userid, sendto)
+                seen_message[userid] = 1
         if encrypt and not pgproles:
             sendto['crypt'].extend (cc_emails)
         else:
@@ -339,6 +340,7 @@ def good_recipient(userid):
         for userid in bcc:
             if good_recipient(userid):
                 add_recipient(userid, bcc_sendto)
+                seen_message[userid] = 1
         if encrypt and not pgproles:
             bcc_sendto['crypt'].extend (bcc_emails)
         else:

test/test_mailgw.py

@@ -1706,6 +1706,101 @@ def testNosyGeneration(self):
 _______________________________________________________________________
 ''')
 
+    def testNosyMessageCcBccEtc(self):
+        self.doNewIssue()
+        oldvalues = self.db.getnode('issue', '1').copy()
+        oldvalues['assignedto'] = None
+        # reconstruct old behaviour: This would reuse the
+        # database-handle from the doNewIssue above which has committed
+        # as user "Chef". So we close and reopen the db as that user.
+        #self.db.close() actually don't close 'cos this empties memorydb
+        self.db = self.instance.open('Chef')
+        self.db.issue.set('1', assignedto=self.chef_id)
+        self.db.commit()
+        # note user 3 is both in cc and bcc. The one in cc takes
+        # precedence and stops the bcc copy from being sent to user 3..
+        # new email is generated for bcc peoples: admin and kermit
+        # get it.
+        self.db.issue.nosymessage('1', None, oldvalues,
+                                  cc=['3','4', '5'], bcc=['1', '3', '5'],
+                                  cc_emails=['[email protected]'],
+                                  bcc_emails=["[email protected]"])
+        new_mail = ""
+        for line in self._get_mail().split("\n"):
+            if "Message-Id: " in line:
+                continue
+            if "Date: " in line:
+                continue
+            new_mail += line+"\n"
+
+        # new_mail is a mbox style string with 2 emails.
+        # we need to split the emails and compare.
+        new_mails=new_mail.split("\nFrom ")
+        # restore the "From " prefix removed from first line of
+        # second message by strip.
+        new_mails[1]="From " + new_mail.split("\nFrom ")[1]
+
+        self.compareMessages(new_mails[0], """
+FROM: [email protected]
+TO: [email protected], [email protected], [email protected], [email protected]
+Content-Type: text/plain; charset="utf-8"
+Subject: [issue1] Testing...
+To: [email protected], [email protected], [email protected], [email protected]
+From: "Bork, Chef" <[email protected]>
+X-Roundup-Name: Roundup issue tracker
+X-Roundup-Loop: hello
+X-Roundup-Issue-Status: unread
+X-Roundup-Version: 1.3.3
+In-Reply-To: <dummy_test_message_id>
+MIME-Version: 1.0
+Reply-To: Roundup issue tracker
+ <[email protected]>
+Content-Transfer-Encoding: quoted-printable
+
+
+Change by Bork, Chef <[email protected]>:
+
+
+----------
+assignedto:  -> Chef
+
+_______________________________________________________________________
+Roundup issue tracker <[email protected]>
+<http://tracker.example/cgi-bin/roundup.cgi/bugs/issue1>
+_______________________________________________________________________
+""")
+
+        self.compareMessages(new_mails[1], """
+FROM: [email protected]
+TO: [email protected], [email protected]
+Content-Type: text/plain; charset="utf-8"
+Subject: [issue1] Testing...
+To: [email protected], [email protected], [email protected], [email protected]
+From: "Bork, Chef" <[email protected]>
+X-Roundup-Name: Roundup issue tracker
+X-Roundup-Loop: hello
+X-Roundup-Issue-Status: unread
+X-Roundup-Version: 1.3.3
+In-Reply-To: <dummy_test_message_id>
+MIME-Version: 1.0
+Reply-To: Roundup issue tracker
+ <[email protected]>
+Content-Transfer-Encoding: quoted-printable
+
+
+Change by Bork, Chef <[email protected]>:
+
+
+----------
+assignedto:  -> Chef
+
+_______________________________________________________________________
+Roundup issue tracker <[email protected]>
+<http://tracker.example/cgi-bin/roundup.cgi/bugs/issue1>
+_______________________________________________________________________
+""")
+
+
     def testPropertyChangeOnly(self):
         self.doNewIssue()
         oldvalues = self.db.getnode('issue', '1').copy()