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

Delta Between Two Patch Sets: sitescripts/reports/web/updateReport.py

Issue 29993614: Issue 2267 - Unify form handling by reusing form_handler() (Closed) Base URL: https://hg.adblockplus.org/sitescripts/
Left Patch Set: Created Jan. 30, 2019, 11:43 p.m.
Right Patch Set: Remove unnecessary checks Created Feb. 8, 2019, 1:32 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « sitescripts/reports/tests/test_updateReport.py ('k') | tox.ini » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # This file is part of the Adblock Plus web scripts, 1 # This file is part of the Adblock Plus web scripts,
2 # Copyright (C) 2006-present eyeo GmbH 2 # Copyright (C) 2006-present eyeo GmbH
3 # 3 #
4 # Adblock Plus is free software: you can redistribute it and/or modify 4 # Adblock Plus is free software: you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License version 3 as 5 # it under the terms of the GNU General Public License version 3 as
6 # published by the Free Software Foundation. 6 # published by the Free Software Foundation.
7 # 7 #
8 # Adblock Plus is distributed in the hope that it will be useful, 8 # Adblock Plus is distributed in the hope that it will be useful,
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # GNU General Public License for more details. 11 # GNU General Public License for more details.
12 # 12 #
13 # You should have received a copy of the GNU General Public License 13 # You should have received a copy of the GNU General Public License
14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
15 15
16 import re 16 import re
17 import random 17 import random
18 from urlparse import parse_qsl 18 from sitescripts.utils import get_config, get_template
19 from sitescripts.utils import get_config, get_template, setupStderr 19 from sitescripts.web import url_handler, form_handler
20 from sitescripts.web import url_handler
21 from sitescripts.reports.utils import (calculateReportSecret, 20 from sitescripts.reports.utils import (calculateReportSecret,
22 calculateReportSecret_compat, getReport, 21 calculateReportSecret_compat, getReport,
23 saveReport, sendUpdateNotification, 22 saveReport, sendUpdateNotification,
24 getUserId, updateUserUsefulness) 23 getUserId, updateUserUsefulness)
25 24
25 GUID_REGEX = r'^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$'
26
26 27
27 @url_handler('/updateReport') 28 @url_handler('/updateReport')
28 def handleRequest(environ, start_response): 29 @form_handler
29 30 def handleRequest(environ, start_response, params):
30 setupStderr(environ['wsgi.errors'])
31
32 if environ['REQUEST_METHOD'].upper() != 'POST' or not environ.get('CONTENT_T YPE', '').startswith('application/x-www-form-urlencoded'):
33 return showError('Unsupported request method', start_response)
34
35 try:
36 request_body_length = int(environ['CONTENT_LENGTH'])
37 except:
38 return showError('Invalid or missing Content-Length header', start_respo nse)
39
40 request_body = environ['wsgi.input'].read(request_body_length)
41 params = {}
42 for key, value in parse_qsl(request_body):
43 params[key] = value.decode('utf-8')
44
45 guid = params.get('guid', '').lower() 31 guid = params.get('guid', '').lower()
46 if not re.match(r'^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$' , guid): 32 if not re.match(GUID_REGEX, guid):
47 return showError('Invalid or missing report GUID', start_response) 33 return showError('Invalid or missing report GUID', start_response)
48 34
49 reportData = getReport(guid) # WSGIAppError: OperationalError(2003, "Can't connect to MySQL server on 'localhost' ([Errno 111] Connection refused)") 35 reportData = getReport(guid)
50 36
51 if reportData == None: 37 if reportData is None:
52 return showError('Report does not exist', start_response) 38 return showError('Report does not exist', start_response)
53 39
54 secret = calculateReportSecret(guid) 40 secret = calculateReportSecret(guid)
55 if params.get('secret', '') != secret and params.get('secret', '') != calcul ateReportSecret_compat(guid): 41 if (params.get('secret', '') != secret and
42 params.get('secret', '') != calculateReportSecret_compat(guid)):
56 return showError('Wrong secret value', start_response) 43 return showError('Wrong secret value', start_response)
57 44
58 reportData['status'] = params.get('status', '') 45 reportData['status'] = params.get('status', '')
59 if len(reportData['status']) > 1024: 46 if len(reportData['status']) > 1024:
60 reportData['status'] = reportData['status'][:1024] 47 reportData['status'] = reportData['status'][:1024]
61 48
62 oldusefulness = reportData.get('usefulness', '0') 49 oldusefulness = reportData.get('usefulness', '0')
63 reportData['usefulness'] = params.get('usefulness', '0') 50 reportData['usefulness'] = params.get('usefulness', '0')
51
64 if 'email' in reportData: 52 if 'email' in reportData:
65 updateUserUsefulness(getUserId(reportData['email']), reportData['usefuln ess'], oldusefulness) 53 updateUserUsefulness(getUserId(reportData['email']),
54 reportData['usefulness'], oldusefulness)
66 55
67 saveReport(guid, reportData) # WSGIAppError: OperationalError(2003, "Can't connect to MySQL server on 'localhost' ([Errno 111] Connection refused)") 56 saveReport(guid, reportData)
68 57
69 if params.get('notify', '') and 'email' in reportData: 58 if params.get('notify', '') and 'email' in reportData:
70 email = reportData['email'] 59 email = reportData['email']
71 email = re.sub(r' at ', r'@', email) 60 email = re.sub(r' at ', r'@', email)
72 email = re.sub(r' dot ', r'.', email) 61 email = re.sub(r' dot ', r'.', email)
73 if re.match(r'^[\w.%+-]+@[\w.%+-]+(\.[\w.%+-]+)+', email): 62 if re.match(r'^[\w.%+-]+@[\w.%+-]+(\.[\w.%+-]+)+', email):
74 sendUpdateNotification({ 63 sendUpdateNotification({
75 'email': email, 64 'email': email,
76 'url': get_config().get('reports', 'urlRoot') + guid, 65 'url': get_config().get('reports', 'urlRoot') + guid,
77 'status': reportData['status'], 66 'status': reportData['status'],
78 }) 67 })
79 68
80 newURL = get_config().get('reports', 'urlRoot') + guid 69 newURL = get_config().get('reports', 'urlRoot') + guid
81 newURL += '?updated=' + str(int(random.uniform(0, 10000))) 70 newURL += '?updated=' + str(int(random.uniform(0, 10000)))
82 newURL += '#secret=' + secret 71 newURL += '#secret=' + secret
83 start_response('302 Found', [('Location', newURL.encode('utf-8'))]) 72 start_response('302 Found', [('Location', newURL.encode('utf-8'))])
84 return [] 73 return []
85 74
86 75
87 def showError(message, start_response): 76 def showError(message, start_response):
88 template = get_template(get_config().get('reports', 'errorTemplate')) 77 template = get_template(get_config().get('reports', 'errorTemplate'))
89 start_response('400 Processing Error', [('Content-Type', 'application/xhtml+ xml; charset=utf-8')]) 78 start_response('400 Processing Error',
79 [('Content-Type', 'application/xhtml+xml; charset=utf-8')])
90 return [template.render({'message': message}).encode('utf-8')] 80 return [template.render({'message': message}).encode('utf-8')]
LEFTRIGHT

Powered by Google App Engine
This is Rietveld