This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5651

hgweb: don't use raw string for session vars
ClosedPublic

Authored by indygreg on Jan 22 2019, 9:45 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG46781c1b5049: hgweb: don't use raw string for session vars
Summary

This r'' is leaking into the templating layer and causing an
assertion failure.

The r'' was added in d1fccbd50fcd (October 2017). Similar code
in hgweb_mod.py was also changed in that changeset. hgweb_mod.py was
updated in ec46415ed826 (March 2018) to use webutil.sessionvars(),
which doesn't use raw strings.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jan 22 2019, 9:45 PM
Closed by commit rHG46781c1b5049: hgweb: don't use raw string for session vars (authored by indygreg). · Explain WhyJan 23 2019, 12:50 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/hgwebdir_mod.py (2 lines)

Diff 13347

mercurial/hgweb/hgwebdir_mod.py

return self.ui.config(section, name, default, untrusted) return self.ui.config(section, name, default, untrusted)
vars = {} vars = {}
styles, (style, mapfile) = hgweb_mod.getstyle(req, config, styles, (style, mapfile) = hgweb_mod.getstyle(req, config,
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, '?')
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.rstrip('/') + '/static/') or req.apppath.rstrip('/') + '/static/')
if not staticurl.endswith('/'): if not staticurl.endswith('/'):
staticurl += '/' staticurl += '/'
defaults = { defaults = {