This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8485

url: fix a bytes vs str crash in processing proxy headers (issue6249)
ClosedPublic

Authored by mharbison72 on Apr 26 2020, 4:13 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGa50f33f1ff24: url: fix a bytes vs str crash in processing proxy headers (issue6249)
rHG8dbaa361ecdb: url: fix a bytes vs str crash in processing proxy headers (issue6249)
Summary

I have no idea how to make a test for this, so if somebody knows, feel free to
add one or follow up on this. The bug reporter reported that it worked for
them, so there may not be other hidden issues here.

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

mharbison72 created this revision.Apr 26 2020, 4:13 PM
marmoute accepted this revision.Apr 28 2020, 4:23 AM
marmoute added a subscriber: marmoute.

According to the discussion on the bug tracker, this is seems fine.

mharbison72 added a commit: rHG8dbaa361ecdb: url: fix a bytes vs str crash in processing proxy headers (issue6249).May 7 2020, 11:02 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8dbaa361ecdb: url: fix a bytes vs str crash in processing proxy headers (issue6249) (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/url.py (2 lines)

Diff 21283

mercurial/url.py

return return
h.realhostport = None h.realhostport = None
h.headers = None h.headers = None
def _generic_proxytunnel(self): def _generic_proxytunnel(self):
proxyheaders = { proxyheaders = {
x: self.headers[x] pycompat.bytestr(x): pycompat.bytestr(self.headers[x])
for x in self.headers for x in self.headers
if x.lower().startswith('proxy-') if x.lower().startswith('proxy-')
} }
self.send(b'CONNECT %s HTTP/1.0\r\n' % self.realhostport) self.send(b'CONNECT %s HTTP/1.0\r\n' % self.realhostport)
for header in pycompat.iteritems(proxyheaders): for header in pycompat.iteritems(proxyheaders):
self.send(b'%s: %s\r\n' % header) self.send(b'%s: %s\r\n' % header)
self.send(b'\r\n') self.send(b'\r\n')