| durin42 |
| hg-reviewers |
The exception handler for ErrorResponse has more to do with the
wire protocol than the generic HTTP server. Move the code so it
lives alongside other wire protocol code.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| if protohandler: | if protohandler: | ||||
| cmd = protohandler['cmd'] | cmd = protohandler['cmd'] | ||||
| try: | try: | ||||
| if query: | if query: | ||||
| raise ErrorResponse(HTTP_NOT_FOUND) | raise ErrorResponse(HTTP_NOT_FOUND) | ||||
| if cmd in perms: | if cmd in perms: | ||||
| self.check_perm(rctx, req, perms[cmd]) | self.check_perm(rctx, req, perms[cmd]) | ||||
| except ErrorResponse as inst: | except ErrorResponse as inst: | ||||
| # A client that sends unbundle without 100-continue will | return protohandler['handleerror'](inst) | ||||
| # break if we respond early. | |||||
| if (cmd == 'unbundle' and | |||||
| (req.env.get('HTTP_EXPECT', | |||||
| '').lower() != '100-continue') or | |||||
| req.env.get('X-HgHttp2', '')): | |||||
| req.drain() | |||||
| else: | |||||
| req.headers.append((r'Connection', r'Close')) | |||||
| req.respond(inst, wireprotoserver.HGTYPE, | |||||
| body='0\n%s\n' % inst) | |||||
| return '' | |||||
| return protohandler['dispatch']() | return protohandler['dispatch']() | ||||
| # translate user-visible url structure to internal structure | # translate user-visible url structure to internal structure | ||||
| args = query.split('/', 2) | args = query.split('/', 2) | ||||
| if r'cmd' not in req.form and args and args[0]: | if r'cmd' not in req.form and args and args[0]: | ||||
| cmd = args.pop(0) | cmd = args.pop(0) | ||||
| return None | return None | ||||
| proto = webproto(req, repo.ui) | proto = webproto(req, repo.ui) | ||||
| return { | return { | ||||
| 'cmd': cmd, | 'cmd': cmd, | ||||
| 'proto': proto, | 'proto': proto, | ||||
| 'dispatch': lambda: _callhttp(repo, req, proto, cmd), | 'dispatch': lambda: _callhttp(repo, req, proto, cmd), | ||||
| 'handleerror': lambda ex: _handlehttperror(ex, req, cmd), | |||||
| } | } | ||||
| def _callhttp(repo, req, proto, cmd): | def _callhttp(repo, req, proto, cmd): | ||||
| def genversion2(gen, engine, engineopts): | def genversion2(gen, engine, engineopts): | ||||
| # application/mercurial-0.2 always sends a payload header | # application/mercurial-0.2 always sends a payload header | ||||
| # identifying the compression engine. | # identifying the compression engine. | ||||
| name = engine.wireprotosupport().name | name = engine.wireprotosupport().name | ||||
| assert 0 < len(name) < 256 | assert 0 < len(name) < 256 | ||||
| req.respond(HTTP_OK, HGTYPE, body=rsp) | req.respond(HTTP_OK, HGTYPE, body=rsp) | ||||
| return [] | return [] | ||||
| elif isinstance(rsp, wireproto.ooberror): | elif isinstance(rsp, wireproto.ooberror): | ||||
| rsp = rsp.message | rsp = rsp.message | ||||
| req.respond(HTTP_OK, HGERRTYPE, body=rsp) | req.respond(HTTP_OK, HGERRTYPE, body=rsp) | ||||
| return [] | return [] | ||||
| raise error.ProgrammingError('hgweb.protocol internal failure', rsp) | raise error.ProgrammingError('hgweb.protocol internal failure', rsp) | ||||
| def _handlehttperror(e, req, cmd): | |||||
| """Called when an ErrorResponse is raised during HTTP request processing.""" | |||||
| # A client that sends unbundle without 100-continue will | |||||
| # break if we respond early. | |||||
| if (cmd == 'unbundle' and | |||||
| (req.env.get('HTTP_EXPECT', | |||||
| '').lower() != '100-continue') or | |||||
| req.env.get('X-HgHttp2', '')): | |||||
| req.drain() | |||||
| else: | |||||
| req.headers.append((r'Connection', r'Close')) | |||||
| req.respond(e, HGTYPE, body='0\n%s\n' % e) | |||||
| return '' | |||||
| class sshserver(abstractserverproto): | class sshserver(abstractserverproto): | ||||
| def __init__(self, ui, repo): | def __init__(self, ui, repo): | ||||
| self._ui = ui | self._ui = ui | ||||
| self._repo = repo | self._repo = repo | ||||
| self._fin = ui.fin | self._fin = ui.fin | ||||
| self._fout = ui.fout | self._fout = ui.fout | ||||
| hook.redirect(True) | hook.redirect(True) | ||||