This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1112

hgweb: fix decodevaluefromheaders to always return a bytes value
ClosedPublic

Authored by durin42 on Oct 16 2017, 9:51 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG0a2ef612ad50: hgweb: fix decodevaluefromheaders to always return a bytes value
Summary

That's more in line with what we want, and we know it's ASCII data
since that's all HTTP technically allows in headers anyway.

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

durin42 created this revision.Oct 16 2017, 9:51 AM
yuja accepted this revision.Oct 16 2017, 11:01 AM
This revision is now accepted and ready to land.Oct 16 2017, 11:01 AM
yuja added a comment.Oct 16 2017, 11:07 AM

Perhaps bytesurl()/strurl() should be renamed to e.g. asciibytes()/asciistr()
since we've started using them everywhere non-ascii character must be rejected.

Closed by commit rHG0a2ef612ad50: hgweb: fix decodevaluefromheaders to always return a bytes value (authored by durin42). · Explain WhyOct 16 2017, 11:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/protocol.py (11 lines)

Diff 2820

mercurial/hgweb/protocol.py

urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
HGTYPE = 'application/mercurial-0.1' HGTYPE = 'application/mercurial-0.1'
HGTYPE2 = 'application/mercurial-0.2' HGTYPE2 = 'application/mercurial-0.2'
HGERRTYPE = 'application/hg-error' HGERRTYPE = 'application/hg-error'
def decodevaluefromheaders(req, headerprefix): def decodevaluefromheaders(req, headerprefix):
"""Decode a long value from multiple HTTP request headers.""" """Decode a long value from multiple HTTP request headers.
Returns the value as a bytes, not a str.
"""
chunks = [] chunks = []
i = 1 i = 1
prefix = headerprefix.upper().replace(r'-', r'_')
while True: while True:
v = req.env.get('HTTP_%s_%d' % ( v = req.env.get(r'HTTP_%s_%d' % (prefix, i))
headerprefix.upper().replace('-', '_'), i))
if v is None: if v is None:
break break
chunks.append(v) chunks.append(pycompat.bytesurl(v))
i += 1 i += 1
return ''.join(chunks) return ''.join(chunks)
class webproto(wireproto.abstractserverproto): class webproto(wireproto.abstractserverproto):
def __init__(self, req, ui): def __init__(self, req, ui):
self.req = req self.req = req
self.response = '' self.response = ''