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.

Download Raw Diff

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

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.Jan 22 2019, 9:45 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 22 2019, 9:45 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

indygreg added a child revision: D5652: tests: add setsockopt() output on Python 3.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

			Path	Packages
M			mercurial/hgweb/hgwebdir_mod.py (2 lines)

Status	Author	Revision
Closed	indygreg	D5656 remotefilelog: use %d to format an int
Closed	indygreg	D5655 tests: use bytes for file I/O
Closed	indygreg	D5654 tests: make filenames bytes for Python 3
Closed	indygreg	D5653 tests: use assertEqual()
Closed	indygreg	D5652 tests: add setsockopt() output on Python 3
Closed	indygreg	D5651 hgweb: don't use raw string for session vars
Closed	indygreg	D5650 tests: normalize to bytes in test-install.t
Closed	indygreg	D5649 config: reject str sections and keys on Python 3
Closed	indygreg	D5648 tests: add size and hash for Python 3
Closed	indygreg	D5647 httppeer: use %s for formatting
Closed	indygreg	D5646 tests: add b'' to notcapable
Closed	indygreg	D5645 tests: add b'' to test-missing-capability.t

Diff 13363

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 = {

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13347		Jan 22 2019, 9:45 PM	★	★
Diff 2	13363	rHG46781c1b50498f0ba695f068889024c13767bc9c	Jan 22 2019, 9:07 PM	★	★