Merge lp:~sakuag333/mailman/lmtp-duplicate-id into lp:mailman

[Sandesh Kumar Agrawal]

I made changes in lmtp.py
Before lmtp runner enqueues a new message to some queue, it checks if some message with the same id is present in the message store or not using get_message_by_id(), and rejects if the new message has dupliacate id.

[Sumana Harihareswara (sumanah)]

Just for reference, it looks like this branch is actually NOT merged into trunk, despite what Launchpad says (status:merged). Revision 7202 was about something completely different.

[Barry Warsaw (barry)]

I moved it back to WIP.

[Aanand (aanand0071)]

I had to ask whether this bug is still open to work on?As i wish to fix it.

Unmerged revisions

=== modified file 'src/mailman/core/switchboard.py'
--- src/mailman/core/switchboard.py	2013-01-01 14:05:42 +0000
+++ src/mailman/core/switchboard.py	2013-01-11 19:03:25 +0000
@@ -90,9 +90,17 @@
             'Not a power of 2: {0}'.format(numslices))
         self.name = name
         self.queue_directory = queue_directory
+        self.non_queue_runner={'lmtp','rest'}
         # If configured to, create the directory if it doesn't yet exist.
         if config.create_paths:
-            makedirs(self.queue_directory, 0770)
+            for directory in self.queue_directory.split():
+            	is_non_queue_runner=False
+            	for queue in self.non_queue_runner:
+            		if queue in directory:
+            			is_non_queue_runner=True
+            			break
+            	if not(is_non_queue_runner):
+            		makedirs(directory,0770)
         # Fast track for no slices
         self._lower = None
         self._upper = None
@@ -143,11 +151,11 @@
         data['_parsemsg'] = (protocol == 0)
         # Write to the pickle file the message object and metadata.
         with open(tmpfile, 'w') as fp:
-            fp.write(msgsave)
-            cPickle.dump(data, fp, protocol)
-            fp.flush()
-            os.fsync(fp.fileno())
-        os.rename(tmpfile, filename)
+          	fp.write(msgsave)
+            	cPickle.dump(data, fp, protocol)
+            	fp.flush()
+            	os.fsync(fp.fileno())
+       	os.rename(tmpfile, filename)
         return filebase
 
     def dequeue(self, filebase):

=== modified file 'src/mailman/runners/lmtp.py'
--- src/mailman/runners/lmtp.py	2013-01-01 14:05:42 +0000
+++ src/mailman/runners/lmtp.py	2013-01-11 19:03:25 +0000
@@ -49,6 +49,7 @@
 
 from email.utils import parseaddr
 from zope.component import getUtility
+from mailman.interfaces.messages import IMessageStore
 
 from mailman.config import config
 from mailman.core.runner import Runner
@@ -97,6 +98,7 @@
 ERR_502 = b'502 Error: command HELO not implemented'
 ERR_550 = b'550 Requested action not taken: mailbox unavailable'
 ERR_550_MID = b'550 No Message-ID header provided'
+ERR_DUP = b'Duplicate Message ID'
 
 # XXX Blech
 smtpd.__version__ = b'Python LMTP runner 1.0'
@@ -181,10 +183,13 @@
         # Do basic post-processing of the message, checking it for defects or
         # other missing information.
         message_id = msg.get('message-id')
+        message_store = getUtility(IMessageStore)
         if message_id is None:
             return ERR_550_MID
         if msg.defects:
             return ERR_501
+        if message_store.get_message_by_id(message_id):
+            return ERR_DUP
         msg.original_size = len(data)
         add_message_hash(msg)
         msg['X-MailFrom'] = mailfrom