Issue 2267 - Unify form handling by reusing form_handler() and encode_email_address()

sitescripts/formmail/web/formmail.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
-import re
-from sitescripts.utils import get_config, sendMail, setupStderr
-from sitescripts.web import url_handler, form_handler
+import datetime
+
+from sitescripts.utils import get_config, sendMail, encode_email_address
+from sitescripts.web import url_handler, form_handler, send_simple_response
 
 @url_handler('/formmail')
 @form_handler
 def handleRequest(environ, start_response, data):
-  setupStderr(environ['wsgi.errors'])
+  params = {name: data.get(name, '').strip() for name in ('name', 'email', 'subject', 'message')}
+  missing = [k for k, v in params.iteritems() if not v]
 
-  params = {}
-  for field in ('name', 'email', 'subject', 'message'):
-    value = data.get(field, '').strip()
+  if missing:
+    text = 'Missing fields: ' + ', '.join(missing)
+    return send_simple_response(start_response, 400, text)
 
-    if not value:
-      start_response('400 Bad request')
-      return ['No "%s" given' % field]
+  try:
+    params['email'] = encode_email_address(params['email'])
+  except ValueError:
+    return send_simple_response(start_response, 400, 'Invalid email address')
 
-    params[field] = value
-
-  if not re.match(r'^\w[\w.+!-]+@\w[\w.-]+\.[a-zA-Z]{2,6}$', params['email']):
-    start_response('400 Bad request')
-    return ['Invalid email address']
-
+  params['time'] = datetime.datetime.now()
   sendMail(get_config().get('formmail', 'template'), params)
 
-  start_response('200 OK')
-  return ['Message sent']
+  return send_simple_response(start_response, 200, 'Message sent')