Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: sitescripts/submit_email/web/submit_email.py

Issue 29323033: Issue 2846 - Service for processing Microsoft Edge announcement subscription (Closed)
Patch Set: Default to adblockbrowser Created Aug. 19, 2015, 1:49 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sitescripts/submit_email/template/edge_verification.mail ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # coding: utf-8 1 # coding: utf-8
2 2
3 # This file is part of the Adblock Plus web scripts, 3 # This file is part of the Adblock Plus web scripts,
4 # Copyright (C) 2006-2015 Eyeo GmbH 4 # Copyright (C) 2006-2015 Eyeo GmbH
5 # 5 #
6 # Adblock Plus is free software: you can redistribute it and/or modify 6 # Adblock Plus is free software: you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License version 3 as 7 # it under the terms of the GNU General Public License version 3 as
8 # published by the Free Software Foundation. 8 # published by the Free Software Foundation.
9 # 9 #
10 # Adblock Plus is distributed in the hope that it will be useful, 10 # Adblock Plus is distributed in the hope that it will be useful,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 start_response, 400, 42 start_response, 400,
43 'Please enter a valid email address.' 43 'Please enter a valid email address.'
44 ) 44 )
45 45
46 config = get_config() 46 config = get_config()
47 params = [('email', email), ('signature', sign(config, email))] 47 params = [('email', email), ('signature', sign(config, email))]
48 lang = data.get('lang') 48 lang = data.get('lang')
49 if lang: 49 if lang:
50 params.append(('lang', lang)) 50 params.append(('lang', lang))
51 51
52 product = data.get('product', 'adblockbrowser')
Sebastian Noack 2015/08/19 15:02:47 Nit: Since we use the same default below, mind sto
Oleksandr 2015/08/19 15:11:24 Done.
53 email_template = product + '_verification_email_template'
54 params.append(('product', product))
55
52 sendMail( 56 sendMail(
53 config.get('submit_email', 'verification_email_template'), 57 config.get('submit_email', email_template),
54 { 58 {
55 'recipient': email, 59 'recipient': email,
56 'verification_url': '%s?%s' % ( 60 'verification_url': '%s?%s' % (
57 urljoin(wsgiref.util.application_uri(environ), VERIFICATION_PATH), 61 urljoin(wsgiref.util.application_uri(environ), VERIFICATION_PATH),
58 urlencode(params) 62 urlencode(params)
59 ) 63 )
60 } 64 }
61 ) 65 )
62 66
63 return send_simple_response( 67 return send_simple_response(
64 start_response, 200, 68 start_response, 200,
65 'A confirmation email has been sent. Please check ' 69 'A confirmation email has been sent. Please check '
66 'your email and click the confirmation link.' 70 'your email and click the confirmation link.'
67 ) 71 )
68 72
69 @url_handler(VERIFICATION_PATH) 73 @url_handler(VERIFICATION_PATH)
70 def verify_email(environ, start_response): 74 def verify_email(environ, start_response):
71 config = get_config() 75 config = get_config()
72 params = dict(parse_qsl(environ.get('QUERY_STRING', ''))) 76 params = dict(parse_qsl(environ.get('QUERY_STRING', '')))
73 77
74 email = params.get('email', '') 78 email = params.get('email', '')
75 signature = params.get('signature', '') 79 signature = params.get('signature', '')
76 if sign(config, email) != signature: 80 if sign(config, email) != signature:
77 return send_simple_response( 81 return send_simple_response(
78 start_response, 403, 82 start_response, 403,
79 'Invalid signature in verification request.' 83 'Invalid signature in verification request.'
80 ) 84 )
81 85
82 filename = config.get('submit_email', 'filename') 86 product = params.get('product', 'adblockbrowser')
87 filename = config.get('submit_email', product + '_filename')
88
83 with open(filename, 'ab', 0) as file: 89 with open(filename, 'ab', 0) as file:
84 fcntl.lockf(file, fcntl.LOCK_EX) 90 fcntl.lockf(file, fcntl.LOCK_EX)
85 try: 91 try:
86 print >>file, email 92 print >>file, email
87 finally: 93 finally:
88 fcntl.lockf(file, fcntl.LOCK_UN) 94 fcntl.lockf(file, fcntl.LOCK_UN)
89 95
90 location = config.get('submit_email', 'successful_verification_redirect_locati on') 96 location = config.get('submit_email', 'successful_verification_redirect_locati on')
91 location = location.format(lang=quote(params.get('lang') or 'en', '')) 97 location = location.format(lang=quote(params.get('lang') or 'en', ''))
92 start_response('303 See Other', [('Location', location)]) 98 start_response('303 See Other', [('Location', location)])
93 return [] 99 return []
OLDNEW
« no previous file with comments | « sitescripts/submit_email/template/edge_verification.mail ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld