| durin42 |
| hg-reviewers |
The wsgiref.validate module contains useful functions for validating
that various WSGI data structures are proper.
This commit adds validation of the environment dict to our built-in
HTTP server, which turns an HTTP request into an environment dict.
The check discovered that we weren't always setting QUERY_STRING,
which would cause the cgi module to fall back to sys.argv. So we
change things to always set QUERY_STRING.
The check passes on Python 2 and 3.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/server.py (6 lines) |
| # hgweb/server.py - The standalone hg web server. | # hgweb/server.py - The standalone hg web server. | ||||
| # | # | ||||
| # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> | # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> | ||||
| # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import errno | import errno | ||||
| import os | import os | ||||
| import socket | import socket | ||||
| import sys | import sys | ||||
| import traceback | import traceback | ||||
| import wsgiref.validate | |||||
| from ..i18n import _ | from ..i18n import _ | ||||
| from .. import ( | from .. import ( | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| pycompat, | pycompat, | ||||
| util, | util, | ||||
| env[r'REQUEST_METHOD'] = self.command | env[r'REQUEST_METHOD'] = self.command | ||||
| env[r'SERVER_NAME'] = self.server.server_name | env[r'SERVER_NAME'] = self.server.server_name | ||||
| env[r'SERVER_PORT'] = str(self.server.server_port) | env[r'SERVER_PORT'] = str(self.server.server_port) | ||||
| env[r'REQUEST_URI'] = self.path | env[r'REQUEST_URI'] = self.path | ||||
| env[r'SCRIPT_NAME'] = pycompat.sysstr(self.server.prefix) | env[r'SCRIPT_NAME'] = pycompat.sysstr(self.server.prefix) | ||||
| env[r'PATH_INFO'] = pycompat.sysstr(path[len(self.server.prefix):]) | env[r'PATH_INFO'] = pycompat.sysstr(path[len(self.server.prefix):]) | ||||
| env[r'REMOTE_HOST'] = self.client_address[0] | env[r'REMOTE_HOST'] = self.client_address[0] | ||||
| env[r'REMOTE_ADDR'] = self.client_address[0] | env[r'REMOTE_ADDR'] = self.client_address[0] | ||||
| if query: | env[r'QUERY_STRING'] = query or r'' | ||||
| env[r'QUERY_STRING'] = query | |||||
| if pycompat.ispy3: | if pycompat.ispy3: | ||||
| if self.headers.get_content_type() is None: | if self.headers.get_content_type() is None: | ||||
| env[r'CONTENT_TYPE'] = self.headers.get_default_type() | env[r'CONTENT_TYPE'] = self.headers.get_default_type() | ||||
| else: | else: | ||||
| env[r'CONTENT_TYPE'] = self.headers.get_content_type() | env[r'CONTENT_TYPE'] = self.headers.get_content_type() | ||||
| length = self.headers.get('content-length') | length = self.headers.get('content-length') | ||||
| else: | else: | ||||
| env[r'wsgi.input'] = self.rfile | env[r'wsgi.input'] = self.rfile | ||||
| env[r'wsgi.errors'] = _error_logger(self) | env[r'wsgi.errors'] = _error_logger(self) | ||||
| env[r'wsgi.multithread'] = isinstance(self.server, | env[r'wsgi.multithread'] = isinstance(self.server, | ||||
| socketserver.ThreadingMixIn) | socketserver.ThreadingMixIn) | ||||
| env[r'wsgi.multiprocess'] = isinstance(self.server, | env[r'wsgi.multiprocess'] = isinstance(self.server, | ||||
| socketserver.ForkingMixIn) | socketserver.ForkingMixIn) | ||||
| env[r'wsgi.run_once'] = 0 | env[r'wsgi.run_once'] = 0 | ||||
| wsgiref.validate.check_environ(env) | |||||
| self.saved_status = None | self.saved_status = None | ||||
| self.saved_headers = [] | self.saved_headers = [] | ||||
| self.length = None | self.length = None | ||||
| self._chunked = None | self._chunked = None | ||||
| for chunk in self.server.application(env, self._start_response): | for chunk in self.server.application(env, self._start_response): | ||||
| self._write(chunk) | self._write(chunk) | ||||
| if not self.sent_headers: | if not self.sent_headers: | ||||
| self.send_headers() | self.send_headers() | ||||