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

Side by Side Diff: sitescripts/formmail/web/formmail2.py

Issue 29374647: Issue 4814 - Adds csv log to formmail2 (Closed) Base URL: https://hg.adblockplus.org/sitescripts
Patch Set: Created March 23, 2017, 6:50 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/formmail/test/test_formmail2.py ('k') | tox.ini » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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-2017 eyeo GmbH 2 # Copyright (C) 2006-2017 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 from __future__ import print_function
17
18 import os
19 import sys
16 import datetime 20 import datetime
21 import traceback
17 import collections 22 import collections
23 from csv import DictWriter, DictReader
24
25 import jinja2
18 26
19 from sitescripts.utils import (get_config, sendMail, encode_email_address, 27 from sitescripts.utils import (get_config, sendMail, encode_email_address,
20 get_template) 28 get_template)
21 from sitescripts.web import registerUrlHandler, form_handler 29 from sitescripts.web import registerUrlHandler, form_handler
22 30
23 31
24 def get_config_items(): 32 def get_config_items():
25 config = get_config() 33 config = get_config()
26 default_keys = set(config.defaults()) 34 default_keys = set(config.defaults())
27 for name, value in config.items('formmail2'): 35 for name, value in config.items('formmail2'):
(...skipping 18 matching lines...) Expand all
46 store_value(conf_dict, path, value) 54 store_value(conf_dict, path, value)
47 return conf_dict 55 return conf_dict
48 56
49 57
50 def make_error(spec, check_type, default_message): 58 def make_error(spec, check_type, default_message):
51 if check_type in spec: 59 if check_type in spec:
52 return spec[check_type].value 60 return spec[check_type].value
53 return default_message 61 return default_message
54 62
55 63
64 def log_formfield_error(parameters, log_path):
65 err_file = os.path.basename(log_path) + '_error'
66 err_path = os.path.join(os.path.dirname(log_path), err_file)
67 if os.path.isfile(err_path):
68 with open(err_path, 'a') as error_log:
69 writer = DictWriter(error_log, fieldnames=parameters.keys())
70 writer.writerow(parameters)
71 raise Exception('Field names have changed, error log '
72 'appended to ' + err_path)
73 with open(err_path, 'w') as error_log:
74 writer = DictWriter(error_log, fieldnames=parameters.keys())
75 writer.writeheader()
76 writer.writerow(parameters)
77 raise Exception('Field names have changed, error log '
78 'written to ' + err_path)
79
80
81 def log_formdata(params, path):
82 if os.path.isfile(path):
83 with open(path, 'ab+') as formlog:
84 formlog.seek(0)
85 reader = DictReader(formlog)
86 if reader.fieldnames != params.keys():
87 log_formfield_error(params, path)
88 formlog.seek(os.SEEK_END)
89 writer = DictWriter(formlog, fieldnames=params.keys())
90 writer.writerow(params)
91 return
92 with open(path, 'w') as new_formlog:
93 writer = DictWriter(new_formlog, fieldnames=params.keys())
94 writer.writeheader()
95 writer.writerow(params)
96 return
97
98
99 def validate_fields(fields, params):
100 errors = []
101 for field, spec in fields.items():
102 if 'mandatory' in spec.value and field not in params:
103 errors.append(make_error(spec, 'mandatory',
104 'No {} entered'.format(field)))
105 if 'email' in spec.value and field in params:
106 try:
107 params[field] = encode_email_address(params[field])
108 except ValueError:
109 errors.append(make_error(spec, 'email', 'Invalid email'))
110
111 unexpected_fields = ' '.join(set(params.keys()) - set(fields.keys()))
112 if unexpected_fields:
113 errors.append('Unexpected field/fields: ' + str(unexpected_fields))
114 return errors
115
116
56 def make_handler(name, config): 117 def make_handler(name, config):
57 try: 118 try:
58 url = config['url'].value 119 url = config['url'].value
59 except (KeyError, AttributeError): 120 except (KeyError, AttributeError):
60 raise Exception('No URL configured for form handler: ' + name) 121 raise Exception('No URL configured for form handler: ' + name)
61 try: 122 try:
62 template = config['template'].value 123 template = config['template'].value
63 get_template(template, autoescape=False) 124 get_template(template, autoescape=False)
64 except (KeyError, AttributeError): 125 except (KeyError, AttributeError):
65 raise Exception('No template configured for form handler: ' + name) 126 raise Exception('No template configured for form handler: ' + name)
127 except (jinja2.TemplateNotFound):
128 raise Exception('Template not found at: ' + template)
66 try: 129 try:
67 fields = config['fields'] 130 fields = config['fields']
68 for field, spec in fields.items(): 131 for field, spec in fields.items():
69 spec.value = {s.strip() for s in spec.value.split(',')} 132 spec.value = {s.strip() for s in spec.value.split(',')}
70 except KeyError: 133 except KeyError:
71 raise Exception('No fields configured for form handler: ' + name) 134 raise Exception('No fields configured for form handler: ' + name)
72 if len(fields) == 0: 135 if len(fields) == 0:
73 raise Exception('No fields configured for form handler: ' + name) 136 raise Exception('No fields configured for form handler: ' + name)
74 137
75 @form_handler 138 @form_handler
76 def handler(environ, start_response, params): 139 def handler(environ, start_response, params):
77 response_headers = [('Content-Type', 'text/plain; charset=utf-8')] 140 response_headers = [('Content-Type', 'text/plain; charset=utf-8')]
78 errors = [] 141 errors = validate_fields(fields, params)
79 for field, spec in fields.items():
80 if 'mandatory' in spec.value:
81 if field not in params.keys():
82 errors.append(make_error(spec, 'mandatory',
83 'No {} entered'.format(field)))
84 if 'email' in spec.value and field in params.keys():
85 try:
86 params[field] = encode_email_address(params[field])
87 except ValueError:
88 errors.append(make_error(spec, 'email', 'Invalid email'))
89 if errors: 142 if errors:
90 start_response('400 Bad Request', response_headers) 143 start_response('400 Bad Request', response_headers)
91 return '\n'.join(errors) 144 return '\n'.join(errors)
92 145 time = datetime.datetime.now()
93 template_args = { 146 template_args = {
94 'time': datetime.datetime.now(), 147 'time': time,
95 'fields': {field: params.get(field, '') for field in fields} 148 'fields': {field: params.get(field, '') for field in fields}
96 } 149 }
97 sendMail(template, template_args) 150 try:
151 sendMail(template, template_args)
152 except:
153 print(traceback.print_exc(), file=sys.stderr)
154 start_response('500 Server Error', response_headers)
155 return ''
156 finally:
157 if 'csv_log' in config:
158 params = {field: params.get(field, '').encode('utf8')
159 for field in fields}
160 params['time'] = time
161 log_formdata(params, config['csv_log'].value)
98 start_response('200 OK', response_headers) 162 start_response('200 OK', response_headers)
99 return '' 163 return ''
100 164
101 return url, handler 165 return url, handler
102 166
103 167
104 conf_dict = conf_parse(get_config_items()) 168 conf_dict = conf_parse(get_config_items())
105 for name, config in conf_dict.items(): 169 for name, config in conf_dict.items():
106 url, handler = make_handler(name, config) 170 url, handler = make_handler(name, config)
107 registerUrlHandler(url, handler) 171 registerUrlHandler(url, handler)
OLDNEW
« no previous file with comments | « sitescripts/formmail/test/test_formmail2.py ('k') | tox.ini » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld