mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
d04afd8fe1
test-http-proxy.t sometimes failed with: File ".../tests/tinyproxy.py", line 110, in _read_write data = i.recv(8192) error: (104, 'Connection reset by peer') This might have started showing up with 9eb533d10f1a ... but it has apparently also been seen before. I don't see anything in 9eb533d10f1a that can explain it. It seems to be a race in test, in the tinyproxy helper: Tinyproxy found an incoming socket using select(). It would break the loop if an error had been detected on the socket, but there was no error and it tried to recv() from the socket. That failed - apparently because it had been reset after select(). Errors in the recv() will now be caught and will break the loop like errors detected by select() would. (send() could also fail in a similar way ... but using the same solution there and losing data we have read doesn't feel right.)
151 lines
5.1 KiB
Python
Executable File
151 lines
5.1 KiB
Python
Executable File
#!/usr/bin/env python
|
|
|
|
__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"
|
|
|
|
import BaseHTTPServer, select, socket, SocketServer, urlparse, os
|
|
|
|
class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler):
|
|
__base = BaseHTTPServer.BaseHTTPRequestHandler
|
|
__base_handle = __base.handle
|
|
|
|
server_version = "TinyHTTPProxy/" + __version__
|
|
rbufsize = 0 # self.rfile Be unbuffered
|
|
|
|
def handle(self):
|
|
(ip, port) = self.client_address
|
|
allowed = getattr(self, 'allowed_clients', None)
|
|
if allowed is not None and ip not in allowed:
|
|
self.raw_requestline = self.rfile.readline()
|
|
if self.parse_request():
|
|
self.send_error(403)
|
|
else:
|
|
self.__base_handle()
|
|
|
|
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)]))
|
|
|
|
def _connect_to(self, netloc, soc):
|
|
i = netloc.find(':')
|
|
if i >= 0:
|
|
host_port = netloc[:i], int(netloc[i + 1:])
|
|
else:
|
|
host_port = netloc, 80
|
|
print "\t" "connect to %s:%d" % host_port
|
|
try: soc.connect(host_port)
|
|
except socket.error, arg:
|
|
try: msg = arg[1]
|
|
except (IndexError, TypeError): msg = arg
|
|
self.send_error(404, msg)
|
|
return 0
|
|
return 1
|
|
|
|
def do_CONNECT(self):
|
|
soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
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:
|
|
print "\t" "bye"
|
|
soc.close()
|
|
self.connection.close()
|
|
|
|
def do_GET(self):
|
|
(scm, netloc, path, params, query, fragment) = urlparse.urlparse(
|
|
self.path, 'http')
|
|
if scm != 'http' or fragment or not netloc:
|
|
self.send_error(400, "bad url %s" % self.path)
|
|
return
|
|
soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
try:
|
|
if self._connect_to(netloc, soc):
|
|
self.log_request()
|
|
soc.send("%s %s %s\r\n" % (
|
|
self.command,
|
|
urlparse.urlunparse(('', '', path, params, query, '')),
|
|
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:
|
|
print "\t" "bye"
|
|
soc.close()
|
|
self.connection.close()
|
|
|
|
def _read_write(self, soc, max_idling=20):
|
|
iw = [self.connection, soc]
|
|
ow = []
|
|
count = 0
|
|
while True:
|
|
count += 1
|
|
(ins, _, exs) = select.select(iw, ow, iw, 3)
|
|
if exs:
|
|
break
|
|
if ins:
|
|
for i in ins:
|
|
if i is soc:
|
|
out = self.connection
|
|
else:
|
|
out = soc
|
|
try:
|
|
data = i.recv(8192)
|
|
except socket.error:
|
|
break
|
|
if data:
|
|
out.send(data)
|
|
count = 0
|
|
else:
|
|
print "\t" "idle", count
|
|
if count == max_idling:
|
|
break
|
|
|
|
do_HEAD = do_GET
|
|
do_POST = do_GET
|
|
do_PUT = do_GET
|
|
do_DELETE = do_GET
|
|
|
|
class ThreadingHTTPServer (SocketServer.ThreadingMixIn,
|
|
BaseHTTPServer.HTTPServer):
|
|
def __init__(self, *args, **kwargs):
|
|
BaseHTTPServer.HTTPServer.__init__(self, *args, **kwargs)
|
|
a = open("proxy.pid", "w")
|
|
a.write(str(os.getpid()) + "\n")
|
|
a.close()
|
|
|
|
if __name__ == '__main__':
|
|
from sys import argv
|
|
if argv[1:] and argv[1] in ('-h', '--help'):
|
|
print argv[0], "[port [allowed_client_name ...]]"
|
|
else:
|
|
if argv[2:]:
|
|
allowed = []
|
|
for name in argv[2:]:
|
|
client = socket.gethostbyname(name)
|
|
allowed.append(client)
|
|
print "Accept: %s (%s)" % (client, name)
|
|
ProxyHandler.allowed_clients = allowed
|
|
del argv[2:]
|
|
else:
|
|
print "Any clients will be served..."
|
|
BaseHTTPServer.test(ProxyHandler, ThreadingHTTPServer)
|