This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2784

hgweb: expose repo name on parsedrequest
ClosedPublic

Authored by indygreg on Mar 11 2018, 12:23 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8ddb5c354906: hgweb: expose repo name on parsedrequest
Summary

I'm not a fan of doing this because I want to find a better solution to
the REPO_NAME hack. But this change gets us a few steps closer to
eliminating use of wsgirequest. We can worry about fixing REPO_NAME
once wsgirequest is gone.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 11 2018, 12:23 AM
durin42 accepted this revision.Mar 12 2018, 5:07 PM
This revision is now accepted and ready to land.Mar 12 2018, 5:07 PM
Closed by commit rHG8ddb5c354906: hgweb: expose repo name on parsedrequest (authored by indygreg). · Explain WhyMar 12 2018, 5:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6920

mercurial/hgweb/hgweb_mod.py

untrusted=untrusted) untrusted=untrusted)
def archivelist(self, nodeid): def archivelist(self, nodeid):
allowed = self.configlist('web', 'allow_archive') allowed = self.configlist('web', 'allow_archive')
for typ, spec in self.archivespecs.iteritems(): for typ, spec in self.archivespecs.iteritems():
if typ in allowed or self.configbool('web', 'allow%s' % typ): if typ in allowed or self.configbool('web', 'allow%s' % typ):
yield {'type': typ, 'extension': spec[2], 'node': nodeid} yield {'type': typ, 'extension': spec[2], 'node': nodeid}
def templater(self, wsgireq, req): def templater(self, req):
# determine scheme, port and server name # determine scheme, port and server name
# this is needed to create absolute urls # this is needed to create absolute urls
logourl = self.config('web', 'logourl') logourl = self.config('web', 'logourl')
logoimg = self.config('web', 'logoimg') logoimg = self.config('web', 'logoimg')
staticurl = (self.config('web', 'staticurl') staticurl = (self.config('web', 'staticurl')
or req.apppath + '/static/') or req.apppath + '/static/')
if not staticurl.endswith('/'): if not staticurl.endswith('/'):
staticurl += '/' staticurl += '/'
# some functions for the templater # some functions for the templater
def motd(**map): def motd(**map):
yield self.config('web', 'motd') yield self.config('web', 'motd')
# figure out which style to use # figure out which style to use
vars = {} vars = {}
styles, (style, mapfile) = getstyle(wsgireq.req, self.config, styles, (style, mapfile) = getstyle(req, self.config,
self.templatepath) self.templatepath)
if style == styles[0]: if style == styles[0]:
vars['style'] = style vars['style'] = style
sessionvars = webutil.sessionvars(vars, '?') sessionvars = webutil.sessionvars(vars, '?')
if not self.reponame: if not self.reponame:
self.reponame = (self.config('web', 'name', '') self.reponame = (self.config('web', 'name', '')
or wsgireq.env.get('REPO_NAME') or req.reponame
or req.apppath or self.repo.root) or req.apppath
or self.repo.root)
def websubfilter(text): def websubfilter(text):
return templatefilters.websub(text, self.websubtable) return templatefilters.websub(text, self.websubtable)
# create the templater # create the templater
# TODO: export all keywords: defaults = templatekw.keywords.copy() # TODO: export all keywords: defaults = templatekw.keywords.copy()
defaults = { defaults = {
'url': req.apppath + '/', 'url': req.apppath + '/',
req.qsparams['node'] = fn[:-len(ext)] req.qsparams['node'] = fn[:-len(ext)]
req.qsparams['type'] = type_ req.qsparams['type'] = type_
else: else:
cmd = req.qsparams.get('cmd', '') cmd = req.qsparams.get('cmd', '')
# process the web interface request # process the web interface request
try: try:
tmpl = rctx.templater(wsgireq, req) tmpl = rctx.templater(req)
ctype = tmpl('mimetype', encoding=encoding.encoding) ctype = tmpl('mimetype', encoding=encoding.encoding)
ctype = templater.stringify(ctype) ctype = templater.stringify(ctype)
# check read permissions non-static content # check read permissions non-static content
if cmd != 'static': if cmd != 'static':
self.check_perm(rctx, wsgireq, None) self.check_perm(rctx, wsgireq, None)
if cmd == '': if cmd == '':

mercurial/hgweb/request.py

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 # Whether there is a path component to this request. This can be true
# when ``dispatchpath`` is empty due to REPO_NAME muckery. # when ``dispatchpath`` is empty due to REPO_NAME muckery.
havepathinfo = attr.ib() havepathinfo = attr.ib()
# The name of the repository being accessed.
reponame = attr.ib()
# Raw query string (part after "?" in URL). # Raw query string (part after "?" in URL).
querystring = attr.ib() querystring = attr.ib()
# multidict of query string parameters. # multidict of query string parameters.
qsparams = attr.ib() qsparams = attr.ib()
# wsgiref.headers.Headers instance. Operates like a dict with case # wsgiref.headers.Headers instance. Operates like a dict with case
# insensitive keys. # insensitive keys.
headers = attr.ib() headers = attr.ib()
# Request body input stream. # Request body input stream.
advertisedurl=advertisedfullurl, advertisedurl=advertisedfullurl,
advertisedbaseurl=advertisedbaseurl, advertisedbaseurl=advertisedbaseurl,
urlscheme=env['wsgi.url_scheme'], urlscheme=env['wsgi.url_scheme'],
remoteuser=env.get('REMOTE_USER'), remoteuser=env.get('REMOTE_USER'),
remotehost=env.get('REMOTE_HOST'), remotehost=env.get('REMOTE_HOST'),
apppath=apppath, apppath=apppath,
dispatchparts=dispatchparts, dispatchpath=dispatchpath, dispatchparts=dispatchparts, dispatchpath=dispatchpath,
havepathinfo='PATH_INFO' in env, havepathinfo='PATH_INFO' in env,
reponame=env.get('REPO_NAME'),
querystring=querystring, querystring=querystring,
qsparams=qsparams, qsparams=qsparams,
headers=headers, headers=headers,
bodyfh=bodyfh) bodyfh=bodyfh)
class wsgiresponse(object): class wsgiresponse(object):
"""Represents a response to a WSGI request. """Represents a response to a WSGI request.