##// END OF EJS Templates
wireprotov2: implement commands as a generator of objects...
wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472

File last commit:

r32916:88c1d13b default
r39595:07b58266 default
Show More
tinyproxy.py
192 lines | 6.2 KiB | text/x-python | PythonLexer
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 #!/usr/bin/env python
Pulkit Goyal
tests: make tinyproxy.py use print_function
r28646 from __future__ import absolute_import, print_function
Gregory Szorc
tests: use absolute_import in tinyproxy...
r27302
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 __doc__ = """Tiny HTTP Proxy.
This module implements GET, HEAD, POST, PUT and DELETE methods
on BaseHTTPServer, and behaves as an HTTP proxy. The CONNECT
method is also implemented experimentally, but has not been
tested yet.
Any help will be greatly appreciated. SUZUKI Hisao
"""
__version__ = "0.2.1"
Pulkit Goyal
py3: re-implement the BaseHTTPServer.test() function...
r29565 import optparse
Gregory Szorc
tests: use absolute_import in tinyproxy...
r27302 import os
import select
import socket
Yuya Nishihara
tests: make tinyproxy.py not import sys.argv by name
r28778 import sys
Pulkit Goyal
py3: conditionalize the urlparse import...
r29431
from mercurial import util
Pulkit Goyal
py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import...
r29566 httpserver = util.httpserver
Pulkit Goyal
py3: conditionalize SocketServer import...
r29433 socketserver = util.socketserver
Gregory Szorc
tests: use urlreq in tinyproxy.py...
r31571 urlreq = util.urlreq
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337
Jun Wu
tinyproxy: use IPv6 if HGIPV6 is set to 1...
r31005 if os.environ.get('HGIPV6', '0') == '1':
family = socket.AF_INET6
else:
family = socket.AF_INET
Pulkit Goyal
py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import...
r29566 class ProxyHandler (httpserver.basehttprequesthandler):
__base = httpserver.basehttprequesthandler
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 __base_handle = __base.handle
server_version = "TinyHTTPProxy/" + __version__
rbufsize = 0 # self.rfile Be unbuffered
def handle(self):
timeless
cleanup: remove superfluous space after space after equals (python)
r27637 (ip, port) = self.client_address
Augie Fackler
tests: use getattr instead of hasattr
r14971 allowed = getattr(self, 'allowed_clients', None)
if allowed is not None and ip not in allowed:
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 self.raw_requestline = self.rfile.readline()
Matt Mackall
many, many trivial check-code fixups
r10282 if self.parse_request():
self.send_error(403)
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 else:
self.__base_handle()
Steven Brown
httprepo: long arguments support (issue2126)...
r14093 def log_request(self, code='-', size='-'):
xheaders = [h for h in self.headers.items() if h[0].startswith('x-')]
self.log_message('"%s" %s %s%s',
self.requestline, str(code), str(size),
''.join([' %s:%s' % h for h in sorted(xheaders)]))
Matt Harbison
tinyproxy: explicitly flush logged messages...
r32906 # Flush for Windows, so output isn't lost on TerminateProcess()
Matt Harbison
test-http-proxy: redirect proxy stdout to /dev/null...
r32916 sys.stdout.flush()
Matt Harbison
tinyproxy: explicitly flush logged messages...
r32906 sys.stderr.flush()
Steven Brown
httprepo: long arguments support (issue2126)...
r14093
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 def _connect_to(self, netloc, soc):
i = netloc.find(':')
if i >= 0:
Matt Mackall
many, many trivial check-code fixups
r10282 host_port = netloc[:i], int(netloc[i + 1:])
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 else:
host_port = netloc, 80
Pulkit Goyal
tests: make tinyproxy.py use print_function
r28646 print("\t" "connect to %s:%d" % host_port)
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 try: soc.connect(host_port)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except socket.error as arg:
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 try: msg = arg[1]
Brodie Rao
cleanup: replace more naked excepts with more specific ones
r16703 except (IndexError, TypeError): msg = arg
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 self.send_error(404, msg)
return 0
return 1
def do_CONNECT(self):
Jun Wu
tinyproxy: use IPv6 if HGIPV6 is set to 1...
r31005 soc = socket.socket(family, socket.SOCK_STREAM)
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 try:
if self._connect_to(self.path, soc):
self.log_request(200)
self.wfile.write(self.protocol_version +
" 200 Connection established\r\n")
self.wfile.write("Proxy-agent: %s\r\n" % self.version_string())
self.wfile.write("\r\n")
self._read_write(soc, 300)
finally:
Pulkit Goyal
tests: make tinyproxy.py use print_function
r28646 print("\t" "bye")
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 soc.close()
self.connection.close()
def do_GET(self):
Gregory Szorc
tests: use urlreq in tinyproxy.py...
r31571 (scm, netloc, path, params, query, fragment) = urlreq.urlparse(
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 self.path, 'http')
if scm != 'http' or fragment or not netloc:
self.send_error(400, "bad url %s" % self.path)
return
Jun Wu
tinyproxy: use IPv6 if HGIPV6 is set to 1...
r31005 soc = socket.socket(family, socket.SOCK_STREAM)
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 try:
if self._connect_to(netloc, soc):
self.log_request()
soc.send("%s %s %s\r\n" % (
self.command,
Gregory Szorc
tests: use urlreq in tinyproxy.py...
r31571 urlreq.urlunparse(('', '', path, params, query, '')),
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 self.request_version))
self.headers['Connection'] = 'close'
del self.headers['Proxy-Connection']
for key_val in self.headers.items():
soc.send("%s: %s\r\n" % key_val)
soc.send("\r\n")
self._read_write(soc)
finally:
Pulkit Goyal
tests: make tinyproxy.py use print_function
r28646 print("\t" "bye")
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 soc.close()
self.connection.close()
def _read_write(self, soc, max_idling=20):
iw = [self.connection, soc]
ow = []
count = 0
Martin Geisler
check-code: flag 0/1 used as constant Boolean expression
r14494 while True:
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 count += 1
(ins, _, exs) = select.select(iw, ow, iw, 3)
Matt Mackall
many, many trivial check-code fixups
r10282 if exs:
break
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 if ins:
for i in ins:
if i is soc:
out = self.connection
else:
out = soc
Mads Kiilerich
tests: fix toctou race in tinyproxy.py (issue3795)...
r18519 try:
data = i.recv(8192)
except socket.error:
break
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 if data:
out.send(data)
count = 0
else:
Pulkit Goyal
tests: make tinyproxy.py use print_function
r28646 print("\t" "idle", count)
Matt Mackall
many, many trivial check-code fixups
r10282 if count == max_idling:
break
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337
do_HEAD = do_GET
do_POST = do_GET
do_PUT = do_GET
Matt Mackall
many, many trivial check-code fixups
r10282 do_DELETE = do_GET
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337
Pulkit Goyal
py3: conditionalize SocketServer import...
r29433 class ThreadingHTTPServer (socketserver.ThreadingMixIn,
Pulkit Goyal
py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import...
r29566 httpserver.httpserver):
Matt Mackall
tests: fix startup/shutdown races in test-https...
r16300 def __init__(self, *args, **kwargs):
Pulkit Goyal
py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import...
r29566 httpserver.httpserver.__init__(self, *args, **kwargs)
Matt Mackall
tests: fix startup/shutdown races in test-https...
r16300 a = open("proxy.pid", "w")
a.write(str(os.getpid()) + "\n")
a.close()
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337
Pulkit Goyal
py3: re-implement the BaseHTTPServer.test() function...
r29565 def runserver(port=8000, bind=""):
server_address = (bind, port)
ProxyHandler.protocol_version = "HTTP/1.0"
httpd = ThreadingHTTPServer(server_address, ProxyHandler)
sa = httpd.socket.getsockname()
print("Serving HTTP on", sa[0], "port", sa[1], "...")
try:
httpd.serve_forever()
except KeyboardInterrupt:
print("\nKeyboard interrupt received, exiting.")
httpd.server_close()
sys.exit(0)
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 if __name__ == '__main__':
Yuya Nishihara
tests: make tinyproxy.py not import sys.argv by name
r28778 argv = sys.argv
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 if argv[1:] and argv[1] in ('-h', '--help'):
Pulkit Goyal
tests: make tinyproxy.py use print_function
r28646 print(argv[0], "[port [allowed_client_name ...]]")
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 else:
if argv[2:]:
allowed = []
for name in argv[2:]:
client = socket.gethostbyname(name)
allowed.append(client)
Pulkit Goyal
tests: make tinyproxy.py use print_function
r28646 print("Accept: %s (%s)" % (client, name))
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 ProxyHandler.allowed_clients = allowed
del argv[2:]
else:
Pulkit Goyal
tests: make tinyproxy.py use print_function
r28646 print("Any clients will be served...")
Pulkit Goyal
py3: re-implement the BaseHTTPServer.test() function...
r29565
parser = optparse.OptionParser()
parser.add_option('-b', '--bind', metavar='ADDRESS',
help='Specify alternate bind address '
'[default: all interfaces]', default='')
(options, args) = parser.parse_args()
port = 8000
if len(args) == 1:
port = int(args[0])
runserver(port, options.bind)