This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2735

hgweb: use computed base URL from parsed request
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG1e2194e0ef62: hgweb: use computed base URL from parsed request
rHG56154c4626b9: hgweb: use computed base URL from parsed request
Summary

Let's not reinvent URL construction in a function that runs the
templater.

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:00 PM
This revision is now accepted and ready to land.Mar 9 2018, 2:00 PM
Closed by commit rHG56154c4626b9: hgweb: use computed base URL from parsed request (authored by indygreg). · Explain WhyMar 9 2018, 2:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/hgweb_mod.py (18 lines)

Diff 6741

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): def templater(self, wsgireq, 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
proto = wsgireq.env.get('wsgi.url_scheme')
if proto == 'https':
proto = 'https'
default_port = '443'
else:
proto = 'http'
default_port = '80'
port = wsgireq.env[r'SERVER_PORT']
port = port != default_port and (r':' + port) or r''
urlbase = r'%s://%s%s' % (proto, wsgireq.env[r'SERVER_NAME'], port)
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 pycompat.sysbytes(wsgireq.url) + 'static/') or pycompat.sysbytes(wsgireq.url) + 'static/')
if not staticurl.endswith('/'): if not staticurl.endswith('/'):
staticurl += '/' staticurl += '/'
# some functions for the templater # some functions for the templater
# 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': pycompat.sysbytes(wsgireq.url), 'url': pycompat.sysbytes(wsgireq.url),
'logourl': logourl, 'logourl': logourl,
'logoimg': logoimg, 'logoimg': logoimg,
'staticurl': staticurl, 'staticurl': staticurl,
'urlbase': urlbase, 'urlbase': req.advertisedbaseurl,
'repo': self.reponame, 'repo': self.reponame,
'encoding': encoding.encoding, 'encoding': encoding.encoding,
'motd': motd, 'motd': motd,
'sessionvars': sessionvars, 'sessionvars': sessionvars,
'pathdef': makebreadcrumb(pycompat.sysbytes(wsgireq.url)), 'pathdef': makebreadcrumb(pycompat.sysbytes(wsgireq.url)),
'style': style, 'style': style,
'nonce': self.nonce, 'nonce': self.nonce,
} }
wsgireq.form['node'] = [fn[:-len(ext)]] wsgireq.form['node'] = [fn[:-len(ext)]]
wsgireq.form['type'] = [type_] wsgireq.form['type'] = [type_]
else: else:
cmd = wsgireq.form.get('cmd', [''])[0] cmd = wsgireq.form.get('cmd', [''])[0]
# process the web interface request # process the web interface request
try: try:
tmpl = rctx.templater(wsgireq) tmpl = rctx.templater(wsgireq, 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 == '':