This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3978

hgweb: strip trailing '/' in apppath before appending '/static/'
ClosedPublic

Authored by ced on Jul 25 2018, 4:27 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG258d90f69076: hgweb: strip trailing '/' in apppath before appending '/static/' (issue5943)

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

ced created this revision.Jul 25 2018, 4:27 AM
yuja added a subscriber: yuja.Jul 25 2018, 8:42 AM

Queued for stable, thanks.

Closed by commit rHG258d90f69076: hgweb: strip trailing '/' in apppath before appending '/static/' (issue5943) (authored by ced). · Explain WhyJul 25 2018, 8:50 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9665

mercurial/hgweb/hgweb_mod.py

return webutil.archivelist(self.repo.ui, nodeid) return webutil.archivelist(self.repo.ui, nodeid)
def templater(self, 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.rstrip('/') + '/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')

mercurial/hgweb/hgwebdir_mod.py

self.templatepath) self.templatepath)
if style == styles[0]: if style == styles[0]:
vars['style'] = style vars['style'] = style
sessionvars = webutil.sessionvars(vars, r'?') sessionvars = webutil.sessionvars(vars, r'?')
logourl = config('web', 'logourl') logourl = config('web', 'logourl')
logoimg = config('web', 'logoimg') logoimg = config('web', 'logoimg')
staticurl = (config('web', 'staticurl') staticurl = (config('web', 'staticurl')
or req.apppath + '/static/') or req.apppath.rstrip('/') + '/static/')
if not staticurl.endswith('/'): if not staticurl.endswith('/'):
staticurl += '/' staticurl += '/'
defaults = { defaults = {
"encoding": encoding.encoding, "encoding": encoding.encoding,
"motd": motd, "motd": motd,
"url": req.apppath + '/', "url": req.apppath + '/',
"logourl": logourl, "logourl": logourl,
"logoimg": logoimg, "logoimg": logoimg,
"staticurl": staticurl, "staticurl": staticurl,
"sessionvars": sessionvars, "sessionvars": sessionvars,
"style": style, "style": style,
"nonce": nonce, "nonce": nonce,
} }
tmpl = templater.templater.frommapfile(mapfile, defaults=defaults) tmpl = templater.templater.frommapfile(mapfile, defaults=defaults)
return tmpl return tmpl