This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5951

py3: port tinyproxy.py to work with Python 3
ClosedPublic

Authored by indygreg on Feb 12 2019, 5:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG97e2442a4595: py3: port tinyproxy.py to work with Python 3
Summary

There were various str/bytes mismatches in the code. This caused
the proxy server to misbehave at run-time. The manifestation
was typically premature socket disconnect from the perspective
of the client.

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.Feb 12 2019, 5:37 PM
Closed by commit rHG97e2442a4595: py3: port tinyproxy.py to work with Python 3 (authored by indygreg). · Explain WhyFeb 15 2019, 10:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/tinyproxy.py (30 lines)

Diff 14119

tests/tinyproxy.py

__version__ = "0.2.1" __version__ = "0.2.1"
import optparse import optparse
import os import os
import select import select
import socket import socket
import sys import sys
from mercurial import util from mercurial import (
pycompat,
util,
)
httpserver = util.httpserver httpserver = util.httpserver
socketserver = util.socketserver socketserver = util.socketserver
urlreq = util.urlreq urlreq = util.urlreq
if os.environ.get('HGIPV6', '0') == '1': if os.environ.get('HGIPV6', '0') == '1':
family = socket.AF_INET6 family = socket.AF_INET6
else: else:
return 0 return 0
return 1 return 1
def do_CONNECT(self): def do_CONNECT(self):
soc = socket.socket(family, socket.SOCK_STREAM) soc = socket.socket(family, socket.SOCK_STREAM)
try: try:
if self._connect_to(self.path, soc): if self._connect_to(self.path, soc):
self.log_request(200) self.log_request(200)
self.wfile.write(self.protocol_version + self.wfile.write(pycompat.bytestr(self.protocol_version) +
" 200 Connection established\r\n") b" 200 Connection established\r\n")
self.wfile.write("Proxy-agent: %s\r\n" % self.version_string()) self.wfile.write(b"Proxy-agent: %s\r\n" %
self.wfile.write("\r\n") pycompat.bytestr(self.version_string()))
self.wfile.write(b"\r\n")
self._read_write(soc, 300) self._read_write(soc, 300)
finally: finally:
print("\t" "bye") print("\t" "bye")
soc.close() soc.close()
self.connection.close() self.connection.close()
def do_GET(self): def do_GET(self):
(scm, netloc, path, params, query, fragment) = urlreq.urlparse( (scm, netloc, path, params, query, fragment) = urlreq.urlparse(
self.path, 'http') self.path, 'http')
if scm != 'http' or fragment or not netloc: if scm != 'http' or fragment or not netloc:
self.send_error(400, "bad url %s" % self.path) self.send_error(400, "bad url %s" % self.path)
return return
soc = socket.socket(family, socket.SOCK_STREAM) soc = socket.socket(family, socket.SOCK_STREAM)
try: try:
if self._connect_to(netloc, soc): if self._connect_to(netloc, soc):
self.log_request() self.log_request()
soc.send("%s %s %s\r\n" % ( url = urlreq.urlunparse(('', '', path, params, query, ''))
self.command, soc.send(b"%s %s %s\r\n" % (
urlreq.urlunparse(('', '', path, params, query, '')), pycompat.bytestr(self.command),
self.request_version)) pycompat.bytestr(url),
pycompat.bytestr(self.request_version)))
self.headers['Connection'] = 'close' self.headers['Connection'] = 'close'
del self.headers['Proxy-Connection'] del self.headers['Proxy-Connection']
for key_val in self.headers.items(): for key, val in self.headers.items():
soc.send("%s: %s\r\n" % key_val) soc.send(b"%s: %s\r\n" % (pycompat.bytestr(key),
soc.send("\r\n") pycompat.bytestr(val)))
soc.send(b"\r\n")
self._read_write(soc) self._read_write(soc)
finally: finally:
print("\t" "bye") print("\t" "bye")
soc.close() soc.close()
self.connection.close() self.connection.close()
def _read_write(self, soc, max_idling=20): def _read_write(self, soc, max_idling=20):
iw = [self.connection, soc] iw = [self.connection, soc]