[or-cvs] r15943: a more useful "you weren't using dkim, bounce" explanation. (projects/gettor)

[arma@xxxxxxxx]

Author: arma
Date: 2008-07-15 16:54:40 -0400 (Tue, 15 Jul 2008)
New Revision: 15943

Modified:
   projects/gettor/gettor.py
   projects/gettor/gettor_responses.py
Log:
a more useful "you weren't using dkim, bounce" explanation.


Modified: projects/gettor/gettor.py
===================================================================
--- projects/gettor/gettor.py	2008-07-15 16:51:38 UTC (rev 15942)
+++ projects/gettor/gettor.py	2008-07-15 20:54:40 UTC (rev 15943)
@@ -108,9 +108,19 @@
         # Reply with some help and bail out
         gettor_blacklist.blackList(replyTo, True)
         message = """
-        Sorry, You should send your request from a provider that implements DKIM.
-        This works with gmail and yahoo email. It is best done from an internet cafe.
-        We've blocked your address for a temporary (less than a day) time to prevent abuse.
+Hello! This is the "get tor" robot.
+
+Unfortunately, we won't answer you at this address. We only process
+requests from email services that support "DKIM", which is an email
+feature that lets us verify that the address in the "From" line is
+actually the one who sent the mail.
+
+Gmail and Yahoo Mail both use DKIM. You will have better luck sending
+us mail from one of those.
+
+(We apologize if you didn't ask for this mail. Since your email is from
+a service that doesn't use DKIM, we're sending a short explanation,
+and then we'll ignore this email address for the next day or so.)
         """
         gettor_responses.sendHelp(message, srcEmail, replyTo)
         syslog.syslog("gettor: Unsigned messaged to gettor. We issued some help about using DKIM.")

Modified: projects/gettor/gettor_responses.py
===================================================================
--- projects/gettor/gettor_responses.py	2008-07-15 16:51:38 UTC (rev 15942)
+++ projects/gettor/gettor_responses.py	2008-07-15 20:54:40 UTC (rev 15943)
@@ -33,7 +33,7 @@
     message = StringIO.StringIO()
     mime = MimeWriter.MimeWriter(message)
     mime.addheader('MIME-Version', '1.0')
-    mime.addheader('Subject', 'Your request has been processed')
+    mime.addheader('Subject', 'Re: Your "get tor" request')
     mime.addheader('To', recipient)
     mime.addheader('From', ourAddress)
     mime.startmultipartbody('mixed')
@@ -65,4 +65,3 @@
 
     return status
 
-