[or-cvs] [bridgedb/master] Do not fail on messages with no message-id

[Nick Mathewson]

Author: Nick Mathewson <nickm at torproject.org>
Date: Mon, 12 Oct 2009 16:27:58 -0400
Subject: Do not fail on messages with no message-id
Commit: da1f0bc8e1ddfd21afc849c8801866e12362af43

---
 TODO                   |    2 +-
 lib/bridgedb/Server.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index 6baa149..c76e9a1 100644
--- a/TODO
+++ b/TODO
@@ -23,7 +23,7 @@ X Make the 'magic word' for the email configurable, case-tolerant,
   html-tolerant, and punctuation-tolerant
   X for bonus points, make it base64-tolerant
 - make all the rest of the email options configurable.
-- bug: the email handler gets really upset when the email doesn't have
+o bug: the email handler gets really upset when the email doesn't have
   a message-id header in it.
 o When we hit the end of a period, forget email address history.
 X When sending bridges to an email address in the history, check for
diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py
index d45907b..fb118fa 100644
--- a/lib/bridgedb/Server.py
+++ b/lib/bridgedb/Server.py
@@ -187,7 +187,7 @@ def getMailResponse(lines, ctx):
     if not subject: subject = "[no subject]"
     clientFromAddr = msg.getaddr("From")
     clientSenderAddr = msg.getaddr("Sender")
-    msgID = msg.getheader("Message-ID")
+    msgID = msg.getheader("Message-ID", None)
     if clientSenderAddr and clientSenderAddr[1]:
         clientAddr = clientSenderAddr[1]
     elif clientFromAddr and clientFromAddr[1]:
-- 
1.5.6.5