Merge branch 'master' of https://github.com/qwj/python-proxy

python 3.11 compatibility

Author: qwj

pproxy/proto.py

@@ -328,8 +328,8 @@ async def connected(writer):
 writer.write(f'{method}{newpath}{ver}\r\n{lines}\r\n\r\n'.encode())
 returnTrue
 returnuser, host_name, port, connected
-asyncdefconnect(self, reader_remote, writer_remote, rauth, host_name, port, myhost, **kw):
-writer_remote.write(f'CONNECT {host_name}:{port} HTTP/1.1\r\nHost: {myhost}'.encode() + (b'\r\nProxy-Authorization: Basic '+base64.b64encode(rauth) ifrauthelseb'') +b'\r\n\r\n')
+asyncdefconnect(self, reader_remote, writer_remote, rauth, host_name, port, **kw):
+writer_remote.write(f'CONNECT {host_name}:{port} HTTP/1.1\r\nHost: {host_name}:{port}'.encode() + (b'\r\nProxy-Authorization: Basic '+base64.b64encode(rauth) ifrauthelseb'') +b'\r\n\r\n')
 awaitreader_remote.read_until(b'\r\n\r\n')
 asyncdefhttp_channel(self, reader, writer, stat_bytes, stat_conn):
 try:
@@ -616,12 +616,21 @@ def abort(self):
 self.close()
 ssl.connection_made(Transport())
 asyncdefchannel():
+read_size=65536
+buffer=None
+ifhasattr(ssl,'get_buffer'):
+buffer=ssl.get_buffer(read_size)
 try:
 whilenotreader.at_eof() andnotssl._app_transport._closed:
-data=awaitreader.read(65536)
+data=awaitreader.read(read_size)
 ifnotdata:
 break
-ssl.data_received(data)
+ifbuffer!=None:
+data_len=len(data)
+buffer[:data_len]=data
+ssl.buffer_updated(data_len)
+else:
+ssl.data_received(data)
 exceptException:
 pass
 finally:

pproxy/server.py

@@ -880,6 +880,17 @@ async def test_url(url, rserver):
 print(body.decode('utf8', 'ignore'))
 print(f'============ success ============')
 
+defprint_server_started(option, server, print_fn):
+forsinserver.sockets:
+# https://github.com/MagicStack/uvloop/blob/master/uvloop/pseudosock.pyx
+laddr=s.getsockname() # tuple size varies with protocol family
+h=laddr[0]
+p=laddr[1]
+f=str(s.family)
+ipversion="ipv4"iff=="AddressFamily.AF_INET"else ("ipv6"iff=="AddressFamily.AF_INET6"else"ipv?") # TODO better
+bind=ipversion+' '+h+':'+str(p)
+print_fn(option, bind)
+
 defmain(args=None):
 parser=argparse.ArgumentParser(description=__description__+'\nSupported protocols: http,socks4,socks5,shadowsocks,shadowsocksr,redirect,pf,tunnel', epilog=f'Online help: <{__url__}>')
 parser.add_argument('-l', dest='listen', default=[], action='append', type=proxies_by_uri, help='tcp server uri (default: http+socks4+socks5://:8080/)')
@@ -942,27 +953,36 @@ def main(args = None):
 from . importverbose
 verbose.setup(loop, args)
 servers= []
+defprint_fn(option, bind=None):
+print('Serving on', (bindoroption.bind), 'by', ",".join(i.nameforiinoption.protos) + ('(SSL)'ifoption.sslclientelse''), '({}{})'.format(option.cipher.name, ' '+','.join(i.name() foriinoption.cipher.plugins) ifoption.cipherandoption.cipher.pluginselse'') ifoption.cipherelse'')
 foroptioninargs.listen:
-print('Serving on', option.bind, 'by', ",".join(i.nameforiinoption.protos) + ('(SSL)'ifoption.sslclientelse''), '({}{})'.format(option.cipher.name, ' '+','.join(i.name() foriinoption.cipher.plugins) ifoption.cipherandoption.cipher.pluginselse'') ifoption.cipherelse'')
 try:
 server=loop.run_until_complete(option.start_server(vars(args)))
+print_server_started(option, server, print_fn)
 servers.append(server)
 exceptExceptionasex:
+print_fn(option)
 print('Start server failed.\n\t==>', ex)
+defprint_fn(option, bind=None):
+print('Serving on UDP', (bindoroption.bind), 'by', ",".join(i.nameforiinoption.protos), f'({option.cipher.name})'ifoption.cipherelse'')
 foroptioninargs.ulisten:
-print('Serving on UDP', option.bind, 'by', ",".join(i.nameforiinoption.protos), f'({option.cipher.name})'ifoption.cipherelse'')
 try:
 server, protocol=loop.run_until_complete(option.udp_start_server(vars(args)))
+print_server_started(option, server, print_fn)
 servers.append(server)
 exceptExceptionasex:
+print_fn(option)
 print('Start server failed.\n\t==>', ex)
+defprint_fn(option, bind=None):
+print('Serving on', (bindoroption.bind), 'backward by', ",".join(i.nameforiinoption.protos) + ('(SSL)'ifoption.sslclientelse''), '({}{})'.format(option.cipher.name, ' '+','.join(i.name() foriinoption.cipher.plugins) ifoption.cipherandoption.cipher.pluginselse'') ifoption.cipherelse'')
 foroptioninargs.rserver:
 ifisinstance(option, ProxyBackward):
-print('Serving on', option.bind, 'backward by', ",".join(i.nameforiinoption.protos) + ('(SSL)'ifoption.sslclientelse''), '({}{})'.format(option.cipher.name, ' '+','.join(i.name() foriinoption.cipher.plugins) ifoption.cipherandoption.cipher.pluginselse'') ifoption.cipherelse'')
 try:
 server=loop.run_until_complete(option.start_backward_client(vars(args)))
+print_server_started(option, server, print_fn)
 servers.append(server)
 exceptExceptionasex:
+print_fn(option)
 print('Start server failed.\n\t==>', ex)
 ifservers:
 ifargs.sys: