Issue 2846 - Service for processing Microsoft Edge announcement subscription

sitescripts/submit_email/web/submit_email.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,
@@ skipping 31 matching lines @@
       start_response, 400,
       'Please enter a valid email address.'
     )
 
   config = get_config()
   params = [('email', email), ('signature', sign(config, email))]
   lang = data.get('lang')
   if lang:
     params.append(('lang', lang))
 
+  if data.get('edge', '') == '':

[Sebastian Noack, 2015/08/12 08:53:03]

I'd rather not hard-code "edge" here. How about calling the parameter "product",
adding its value to the template name, and the filename below? That way the code
here can be agnostic of the actual products, and adding new ones will be just a
matter of adding a new template, and changing the config.

+    email_template = 'verification_email_template'
+  else:
+    email_template = 'edge_verification_email_template'
+    params.append(('edge', 'true'))
+
   sendMail(
-    config.get('submit_email', 'verification_email_template'),
+    config.get('submit_email', email_template),
     {
       'recipient': email,
       'verification_url': '%s?%s' % (
         urljoin(wsgiref.util.application_uri(environ), VERIFICATION_PATH),
         urlencode(params)
       )
     }
   )
 
   return send_simple_response(
     start_response, 200,
     'A confirmation email has been sent. Please check '
     'your email and click the confirmation link.'
   )
 
 @url_handler(VERIFICATION_PATH)
 def verify_email(environ, start_response):
   config = get_config()
   params = dict(parse_qsl(environ.get('QUERY_STRING', '')))
 
   email = params.get('email', '')
   signature = params.get('signature', '')
   if sign(config, email) != signature:
     return send_simple_response(
       start_response, 403,
       'Invalid signature in verification request.'
     )
 
-  filename = config.get('submit_email', 'filename')
+  if params.get('edge', '') == 'true':
+    filename = config.get('submit_email', 'edge_filename')
+  else:
+    filename = config.get('submit_email', 'filename')
+
   with open(filename, 'ab', 0) as file:
     fcntl.lockf(file, fcntl.LOCK_EX)
     try:
       print >>file, email
     finally:
       fcntl.lockf(file, fcntl.LOCK_UN)
 
   location = config.get('submit_email', 'successful_verification_redirect_location')
   location = location.format(lang=quote(params.get('lang') or 'en', ''))
   start_response('303 See Other', [('Location', location)])
   return []