From ff11e4868311b6ad846d18bf79f3b53cfd04f916 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Aug 16 2015 16:16:57 +0000
Subject: Ensure there is no new line character on the msg-id and improve logging


This fixes https://pagure.io/pagure/issue/344

---

diff --git a/milters/comment_email_milter.py b/milters/comment_email_milter.py
index ca5237f..83c4026 100644
--- a/milters/comment_email_milter.py
+++ b/milters/comment_email_milter.py
@@ -120,6 +120,9 @@ class PagureMilter(Milter.Base):
             self.log('No In-Reply-To, keep going')
             return Milter.CONTINUE
 
+        # Ensure we don't get extra lines in the message-id
+        msg_id = msg_id.split('\n')[0].strip()
+
         self.log('msg-ig %s' % msg_id)
         self.log('To %s' % msg['to'])
         self.log('From %s' % msg['From'])
@@ -142,8 +145,10 @@ class PagureMilter(Milter.Base):
         msg_id = clean_item(msg_id)
 
         if msg_id and '-ticket-' in msg_id:
+            self.log('Processing issue')
             return self.handle_ticket_email(msg, msg_id)
         elif msg_id and '-pull-request-' in msg_id:
+            self.log('Processing pull-request')
             return self.handle_request_email(msg, msg_id)
         else:
             self.log('Not a pagure ticket or pull-request email, let it go')