This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2739

hgweb: use parsed request to construct query parameters
ClosedPublic

Authored by indygreg on Mar 8 2018, 8:06 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGcfb9ef24968c: hgweb: use parsed request to construct query parameters
rHG0c1de2e87c6e: hgweb: use parsed request to construct query parameters
Summary

The way hgweb routes requests is kind of bonkers. If PATH_INFO is
set, we take the URL path after the repository. Otherwise, we take
the first part of the query string before "&" and the part before
";" in that.

We then kinda/sorta treat this as a path and route based on that.

This commit ports that code to use the parsed request object. This
required a new attribute on the parsed request to indicate whether
there is any PATH_INFO.

The new code still feels a bit convoluted for my liking. But we'll
need to rewrite more of the code before a better solution becomes
apparant. This code feels strictly better since we're no longer
doing low-level WSGI manipulation during routing.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Mar 8 2018, 8:06 PM
durin42 accepted this revision.Mar 9 2018, 2:04 PM
This revision is now accepted and ready to land.Mar 9 2018, 2:04 PM
Closed by commit rHG0c1de2e87c6e: hgweb: use parsed request to construct query parameters (authored by indygreg). · Explain WhyMar 9 2018, 2:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6745

mercurial/hgweb/hgweb_mod.py

if rctx.csp: if rctx.csp:
# hgwebdir may have added CSP header. Since we generate our own, # hgwebdir may have added CSP header. Since we generate our own,
# replace it. # replace it.
wsgireq.headers = [h for h in wsgireq.headers wsgireq.headers = [h for h in wsgireq.headers
if h[0] != 'Content-Security-Policy'] if h[0] != 'Content-Security-Policy']
wsgireq.headers.append(('Content-Security-Policy', rctx.csp)) wsgireq.headers.append(('Content-Security-Policy', rctx.csp))
if r'PATH_INFO' in wsgireq.env: if req.havepathinfo:
parts = wsgireq.env[r'PATH_INFO'].strip(r'/').split(r'/') query = req.dispatchpath
repo_parts = wsgireq.env.get(r'REPO_NAME', r'').split(r'/')
if parts[:len(repo_parts)] == repo_parts:
parts = parts[len(repo_parts):]
query = r'/'.join(parts)
else: else:
query = wsgireq.env[r'QUERY_STRING'].partition(r'&')[0] query = req.querystring.partition('&')[0].partition(';')[0]
query = query.partition(r';')[0]
# Route it to a wire protocol handler if it looks like a wire protocol # Route it to a wire protocol handler if it looks like a wire protocol
# request. # request.
protohandler = wireprotoserver.parsehttprequest(rctx, wsgireq, req, protohandler = wireprotoserver.parsehttprequest(rctx, wsgireq, req,
self.check_perm) self.check_perm)
if protohandler: if protohandler:
try: try:
if query: if query:
raise ErrorResponse(HTTP_NOT_FOUND) raise ErrorResponse(HTTP_NOT_FOUND)
return protohandler['dispatch']() return protohandler['dispatch']()
except ErrorResponse as inst: except ErrorResponse as inst:
return protohandler['handleerror'](inst) return protohandler['handleerror'](inst)
# translate user-visible url structure to internal structure # translate user-visible url structure to internal structure
args = query.split(r'/', 2) args = query.split('/', 2)
if 'cmd' not in wsgireq.form and args and args[0]: if 'cmd' not in wsgireq.form and args and args[0]:
cmd = args.pop(0) cmd = args.pop(0)
style = cmd.rfind('-') style = cmd.rfind('-')
if style != -1: if style != -1:
wsgireq.form['style'] = [cmd[:style]] wsgireq.form['style'] = [cmd[:style]]
cmd = cmd[style + 1:] cmd = cmd[style + 1:]
# avoid accepting e.g. style parameter as command # avoid accepting e.g. style parameter as command

mercurial/hgweb/request.py

advertisedurl = attr.ib() advertisedurl = attr.ib()
advertisedbaseurl = attr.ib() advertisedbaseurl = attr.ib()
# WSGI application path. # WSGI application path.
apppath = attr.ib() apppath = attr.ib()
# List of path parts to be used for dispatch. # List of path parts to be used for dispatch.
dispatchparts = attr.ib() dispatchparts = attr.ib()
# URL path component (no query string) used for dispatch. # URL path component (no query string) used for dispatch.
dispatchpath = attr.ib() dispatchpath = attr.ib()
# Whether there is a path component to this request. This can be true
# when ``dispatchpath`` is empty due to REPO_NAME muckery.
havepathinfo = attr.ib()
# Raw query string (part after "?" in URL). # Raw query string (part after "?" in URL).
querystring = attr.ib() querystring = attr.ib()
# List of 2-tuples of query string arguments. # List of 2-tuples of query string arguments.
querystringlist = attr.ib() querystringlist = attr.ib()
# Dict of query string arguments. Values are lists with at least 1 item. # Dict of query string arguments. Values are lists with at least 1 item.
querystringdict = attr.ib() querystringdict = attr.ib()
def parserequestfromenv(env): def parserequestfromenv(env):
else: else:
querystringdict[k] = [v] querystringdict[k] = [v]
return parsedrequest(url=fullurl, baseurl=baseurl, return parsedrequest(url=fullurl, baseurl=baseurl,
advertisedurl=advertisedfullurl, advertisedurl=advertisedfullurl,
advertisedbaseurl=advertisedbaseurl, advertisedbaseurl=advertisedbaseurl,
apppath=apppath, apppath=apppath,
dispatchparts=dispatchparts, dispatchpath=dispatchpath, dispatchparts=dispatchparts, dispatchpath=dispatchpath,
havepathinfo='PATH_INFO' in env,
querystring=querystring, querystring=querystring,
querystringlist=querystringlist, querystringlist=querystringlist,
querystringdict=querystringdict) querystringdict=querystringdict)
class wsgirequest(object): class wsgirequest(object):
"""Higher-level API for a WSGI request. """Higher-level API for a WSGI request.
WSGI applications are invoked with 2 arguments. They are used to WSGI applications are invoked with 2 arguments. They are used to