comparison mercurial/hgweb/hgweb_mod.py @ 36812:158d4ecc03c8

wireprotoserver: move all wire protocol handling logic out of hgweb

Previous patches from several days ago worked to isolate processing
of HTTP wire protocol requests to wireprotoserver. We still had a
little logic in hgweb. If feels like the right time to finish the
job.

This commit moves WSGI request servicing from hgweb to wireprotoserver.
The ugly dict holding the parsed request is no more. I think the new
code is cleaner.

As part of this, we now process wire protocol requests before the
block to obtain the "query" variable. This makes it clear that this
wonky "query" variable is not used by the wire protocol.

The wonkiest part about this code is the HTTP 404. I'm actually not
sure what all is going on here. It looks like the code is trying to
prevent URL with path components that specify a command from not
working. That part I grok. What I don't grok is why we need to send
a 404. I would think it would be OK to no-op and let another handler
try to service the request. But if we do this, we get some subrepo
test failures. So it looks like something is expecting the HTTP 404
and reacting to it in a specific way. It /might/ be possible to
change the behavior here. But it isn't something I'm comfortable
doing because I don't understand the problem space.

Differential Revision: https://phab.mercurial-scm.org/D2740

36811:cfb9ef24968c

            # replace it.
            wsgireq.headers = [h for h in wsgireq.headers
                               if h[0] != 'Content-Security-Policy']
            wsgireq.headers.append(('Content-Security-Policy', rctx.csp))

        if req.havepathinfo:
            query = req.dispatchpath
        else:
            query = req.querystring.partition('&')[0].partition(';')[0]

        # Route it to a wire protocol handler if it looks like a wire protocol
        # request.
        protohandler = wireprotoserver.parsehttprequest(rctx, wsgireq, req,
                                                        self.check_perm)

        if protohandler:
            try:
                if query:
                    raise ErrorResponse(HTTP_NOT_FOUND)

                return protohandler['dispatch']()
            except ErrorResponse as inst:
                return protohandler['handleerror'](inst)

        # translate user-visible url structure to internal structure

        args = query.split('/', 2)
        if 'cmd' not in wsgireq.form and args and args[0]:

36812:158d4ecc03c8

            # replace it.
            wsgireq.headers = [h for h in wsgireq.headers
                               if h[0] != 'Content-Security-Policy']
            wsgireq.headers.append(('Content-Security-Policy', rctx.csp))

        handled, res = wireprotoserver.handlewsgirequest(
            rctx, wsgireq, req, self.check_perm)
        if handled:
            return res

        if req.havepathinfo:
            query = req.dispatchpath
        else:
            query = req.querystring.partition('&')[0].partition(';')[0]

        # translate user-visible url structure to internal structure

        args = query.split('/', 2)
        if 'cmd' not in wsgireq.form and args and args[0]: