##// END OF EJS Templates
update: teach hg to override untracked dir with a tracked file on update...
update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

File last commit:

r29433:33770d2b default
r29480:1e4512ea default
Show More
tinyproxy.py
161 lines | 5.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"
Gregory Szorc
tests: use absolute_import in tinyproxy...
r27302 import BaseHTTPServer
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
urlparse = util.urlparse
Pulkit Goyal
py3: conditionalize SocketServer import...
r29433 socketserver = util.socketserver
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337
class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler):
__base = BaseHTTPServer.BaseHTTPRequestHandler
__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)]))
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):
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:
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):
(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:
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,
Matt Mackall
tests: fix startup/shutdown races in test-https...
r16300 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()
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...")
Vadim Gelfer
http: fix many problems with url parsing and auth. added proxy test....
r2337 BaseHTTPServer.test(ProxyHandler, ThreadingHTTPServer)