Issue 2309 - Reorder Known Issue Sentences in FF Issue Reporter

sitescripts/reports/web/submitReport.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
-# Copyright (C) 2006-2015 Eyeo GmbH
+# Copyright (C) 2006-2016 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.
 #
@@ skipping 24 matching lines @@
   if not re.match(r'^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$', guid):
     return showError('Invalid or missing GUID', start_response)
 
   path = os.path.join(get_config().get('reports', 'dataPath'), guid + '.xml')
   if os.path.exists(path) or os.path.exists(path + '.tmp'):
     return showError('Duplicate GUID', start_response)
 
   try:
     request_size= int(environ['CONTENT_LENGTH'])
   except (KeyError, ValueError):
-    return showError('Invalid or missing Content-Length header', start_response)

[Sebastian Noack, 2015/04/14 06:30:59]

Status code should be 411, not 400 here.

[Wladimir Palant, 2016/02/10 15:43:42]

Done.

+    return showError('Invalid or missing Content-Length header', start_response,
+                     '411 Length Required')
 
   dir = os.path.dirname(path)
   if not os.path.exists(dir):
     os.makedirs(dir)
   try:
     file = open(path + '.tmp', 'wb')
     data = environ['wsgi.input'].read(request_size)
     file.write(data)
     file.close()
 
     knownIssues = knownIssuesParser.findMatches(data.splitlines(), params.get('lang', ['en-US'])[0])
 
     os.rename(path + '.tmp', path);
   except Exception, e:
     if os.path.isfile(path + '.tmp'):
       os.remove(path + '.tmp')
     raise e
 
   template = get_template(get_config().get('reports', 'submitResponseTemplate'))
   start_response('200 OK', [('Content-Type', 'application/xhtml+xml; charset=utf-8')])
   return [template.render({'url': get_config().get('reports', 'urlRoot') + guid, 'knownIssues': knownIssues}).encode('utf-8')]
 
-def showError(message, start_response):
+def showError(message, start_response, response_code='400 Processing Error'):
   template = get_template(get_config().get('reports', 'errorTemplate'))
-  start_response('400 Processing Error', [('Content-Type', 'application/xhtml+xml; charset=utf-8')])
+  start_response(response_code, [('Content-Type', 'application/xhtml+xml; charset=utf-8')])
   return [template.render({'message': message}).encode('utf-8')]