| durin42 |
| hg-reviewers |
All responses now go through our modern response type. All code related
to response handling can be deleted.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/hgwebdir_mod.py (1 line) | |||
| M | mercurial/hgweb/request.py (101 lines) |
| res = wsgireq.res | res = wsgireq.res | ||||
| try: | try: | ||||
| self.refresh() | self.refresh() | ||||
| csp, nonce = cspvalues(self.ui) | csp, nonce = cspvalues(self.ui) | ||||
| if csp: | if csp: | ||||
| res.headers['Content-Security-Policy'] = csp | res.headers['Content-Security-Policy'] = csp | ||||
| wsgireq.headers.append(('Content-Security-Policy', csp)) | |||||
| virtual = req.dispatchpath.strip('/') | virtual = req.dispatchpath.strip('/') | ||||
| tmpl = self.templater(req, nonce) | tmpl = self.templater(req, nonce) | ||||
| ctype = tmpl('mimetype', encoding=encoding.encoding) | ctype = tmpl('mimetype', encoding=encoding.encoding) | ||||
| ctype = templater.stringify(ctype) | ctype = templater.stringify(ctype) | ||||
| # Global defaults. These can be overridden by any handler. | # Global defaults. These can be overridden by any handler. | ||||
| res.status = '200 Script output follows' | res.status = '200 Script output follows' | ||||
| # hgweb/request.py - An http request from either CGI or the standalone server. | # hgweb/request.py - An http request from either CGI or the standalone 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, 2006 Matt Mackall <mpm@selenic.com> | # Copyright 2005, 2006 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 socket | |||||
| import wsgiref.headers as wsgiheaders | import wsgiref.headers as wsgiheaders | ||||
| #import wsgiref.validate | #import wsgiref.validate | ||||
| from .common import ( | |||||
| ErrorResponse, | |||||
| statusmessage, | |||||
| ) | |||||
| from ..thirdparty import ( | from ..thirdparty import ( | ||||
| attr, | attr, | ||||
| ) | ) | ||||
| from .. import ( | from .. import ( | ||||
| error, | error, | ||||
| pycompat, | pycompat, | ||||
| util, | util, | ||||
| ) | ) | ||||
| self.err = wsgienv[r'wsgi.errors'] | self.err = wsgienv[r'wsgi.errors'] | ||||
| self.threaded = wsgienv[r'wsgi.multithread'] | self.threaded = wsgienv[r'wsgi.multithread'] | ||||
| self.multiprocess = wsgienv[r'wsgi.multiprocess'] | self.multiprocess = wsgienv[r'wsgi.multiprocess'] | ||||
| self.run_once = wsgienv[r'wsgi.run_once'] | self.run_once = wsgienv[r'wsgi.run_once'] | ||||
| self.env = wsgienv | self.env = wsgienv | ||||
| self.req = parserequestfromenv(wsgienv, inp, altbaseurl=altbaseurl) | self.req = parserequestfromenv(wsgienv, inp, altbaseurl=altbaseurl) | ||||
| self.res = wsgiresponse(self.req, start_response) | self.res = wsgiresponse(self.req, start_response) | ||||
| self._start_response = start_response | |||||
| self.server_write = None | |||||
| self.headers = [] | |||||
| def respond(self, status, type, filename=None, body=None): | |||||
| if not isinstance(type, str): | |||||
| type = pycompat.sysstr(type) | |||||
| if self._start_response is not None: | |||||
| self.headers.append((r'Content-Type', type)) | |||||
| if filename: | |||||
| filename = (filename.rpartition('/')[-1] | |||||
| .replace('\\', '\\\\').replace('"', '\\"')) | |||||
| self.headers.append(('Content-Disposition', | |||||
| 'inline; filename="%s"' % filename)) | |||||
| if body is not None: | |||||
| self.headers.append((r'Content-Length', str(len(body)))) | |||||
| for k, v in self.headers: | |||||
| if not isinstance(v, str): | |||||
| raise TypeError('header value must be string: %r' % (v,)) | |||||
| if isinstance(status, ErrorResponse): | |||||
| self.headers.extend(status.headers) | |||||
| status = statusmessage(status.code, pycompat.bytestr(status)) | |||||
| elif status == 200: | |||||
| status = '200 Script output follows' | |||||
| elif isinstance(status, int): | |||||
| status = statusmessage(status) | |||||
| # Various HTTP clients (notably httplib) won't read the HTTP | |||||
| # response until the HTTP request has been sent in full. If servers | |||||
| # (us) send a response before the HTTP request has been fully sent, | |||||
| # the connection may deadlock because neither end is reading. | |||||
| # | |||||
| # We work around this by "draining" the request data before | |||||
| # sending any response in some conditions. | |||||
| drain = False | |||||
| close = False | |||||
| # If the client sent Expect: 100-continue, we assume it is smart | |||||
| # enough to deal with the server sending a response before reading | |||||
| # the request. (httplib doesn't do this.) | |||||
| if self.env.get(r'HTTP_EXPECT', r'').lower() == r'100-continue': | |||||
| pass | |||||
| # Only tend to request methods that have bodies. Strictly speaking, | |||||
| # we should sniff for a body. But this is fine for our existing | |||||
| # WSGI applications. | |||||
| elif self.env[r'REQUEST_METHOD'] not in (r'POST', r'PUT'): | |||||
| pass | |||||
| else: | |||||
| # If we don't know how much data to read, there's no guarantee | |||||
| # that we can drain the request responsibly. The WSGI | |||||
| # specification only says that servers *should* ensure the | |||||
| # input stream doesn't overrun the actual request. So there's | |||||
| # no guarantee that reading until EOF won't corrupt the stream | |||||
| # state. | |||||
| if not isinstance(self.req.bodyfh, util.cappedreader): | |||||
| close = True | |||||
| else: | |||||
| # We /could/ only drain certain HTTP response codes. But 200 | |||||
| # and non-200 wire protocol responses both require draining. | |||||
| # Since we have a capped reader in place for all situations | |||||
| # where we drain, it is safe to read from that stream. We'll | |||||
| # either do a drain or no-op if we're already at EOF. | |||||
| drain = True | |||||
| if close: | |||||
| self.headers.append((r'Connection', r'Close')) | |||||
| if drain: | |||||
| assert isinstance(self.req.bodyfh, util.cappedreader) | |||||
| while True: | |||||
| chunk = self.req.bodyfh.read(32768) | |||||
| if not chunk: | |||||
| break | |||||
| self.server_write = self._start_response( | |||||
| pycompat.sysstr(status), self.headers) | |||||
| self._start_response = None | |||||
| self.headers = [] | |||||
| if body is not None: | |||||
| self.write(body) | |||||
| self.server_write = None | |||||
| def write(self, thing): | |||||
| if thing: | |||||
| try: | |||||
| self.server_write(thing) | |||||
| except socket.error as inst: | |||||
| if inst[0] != errno.ECONNRESET: | |||||
| raise | |||||
| def flush(self): | |||||
| return None | |||||
| def wsgiapplication(app_maker): | def wsgiapplication(app_maker): | ||||
| '''For compatibility with old CGI scripts. A plain hgweb() or hgwebdir() | '''For compatibility with old CGI scripts. A plain hgweb() or hgwebdir() | ||||
| can and should now be used as a WSGI application.''' | can and should now be used as a WSGI application.''' | ||||
| application = app_maker() | application = app_maker() | ||||
| def run_wsgi(env, respond): | def run_wsgi(env, respond): | ||||
| return application(env, respond) | return application(env, respond) | ||||
| return run_wsgi | return run_wsgi | ||||