extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-04-23 02:38:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Python 3.8 file operations

Browse Source 
Under Python 3.8 we can not wrap a File in a Sock.

Note this currently requires Python >= 3.5
This commit is contained in:
Brian May 2020-05-15 07:55:38 +10:00
parent 4b320180c4
commit 6c21addde9
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sshuttle/client.py
View File

@ -461,7 +461,7 @@ def _main(tcp_listener, udp_listener, fw, ssh_cmd, remotename,
raise Fatal("failed to establish ssh session (1)") raise Fatal("failed to establish ssh session (1)")
else: else:
raise raise
mux = Mux(serversock, serversock) mux = Mux(serversock.makefile("rb"), serversock.makefile("wb"))
handlers.append(mux) handlers.append(mux)
expected = b'SSHUTTLE0001' expected = b'SSHUTTLE0001'

5
sshuttle/server.py
View File

@ -294,10 +294,7 @@ def main(latency_control, auto_hosts, to_nameserver, auto_nets):
sys.stdout.flush() sys.stdout.flush()
handlers = [] handlers = []
mux = Mux(socket.fromfd(sys.stdin.fileno(), mux = Mux(sys.stdin, sys.stdout)
socket.AF_INET, socket.SOCK_STREAM),
socket.fromfd(sys.stdout.fileno(),
socket.AF_INET, socket.SOCK_STREAM))
handlers.append(mux) handlers.append(mux)
debug1('auto-nets:' + str(auto_nets) + '\n') debug1('auto-nets:' + str(auto_nets) + '\n')

28
sshuttle/ssnet.py
View File

@ -339,10 +339,10 @@ class Proxy(Handler):
class Mux(Handler): class Mux(Handler):
def __init__(self, rsock, wsock): def __init__(self, rfile, wfile):
Handler.__init__(self, [rsock, wsock]) Handler.__init__(self, [rfile, wfile])
self.rsock = rsock self.rfile = rfile
self.wsock = wsock self.wfile = wfile
self.new_channel = self.got_dns_req = self.got_routes = None self.new_channel = self.got_dns_req = self.got_routes = None
self.got_udp_open = self.got_udp_data = self.got_udp_close = None self.got_udp_open = self.got_udp_data = self.got_udp_close = None
self.got_host_req = self.got_host_list = None self.got_host_req = self.got_host_list = None
@ -439,9 +439,9 @@ class Mux(Handler):
callback(cmd, data) callback(cmd, data)
def flush(self): def flush(self):
self.wsock.setblocking(False) os.set_blocking(self.wfile.fileno(), False)
if self.outbuf and self.outbuf[0]: if self.outbuf and self.outbuf[0]:
wrote = _nb_clean(os.write, self.wsock.fileno(), self.outbuf[0]) wrote = _nb_clean(os.write, self.wfile.fileno(), self.outbuf[0])
debug2('mux wrote: %r/%d\n' % (wrote, len(self.outbuf[0]))) debug2('mux wrote: %r/%d\n' % (wrote, len(self.outbuf[0])))
if wrote: if wrote:
self.outbuf[0] = self.outbuf[0][wrote:] self.outbuf[0] = self.outbuf[0][wrote:]
@ -449,9 +449,9 @@ class Mux(Handler):
self.outbuf[0:1] = [] self.outbuf[0:1] = []
def fill(self): def fill(self):
self.rsock.setblocking(False) os.set_blocking(self.rfile.fileno(), False)
try: try:
read = _nb_clean(os.read, self.rsock.fileno(), LATENCY_BUFFER_SIZE) read = _nb_clean(os.read, self.rfile.fileno(), LATENCY_BUFFER_SIZE)
except OSError: except OSError:
_, e = sys.exc_info()[:2] _, e = sys.exc_info()[:2]
raise Fatal('other end: %r' % e) raise Fatal('other end: %r' % e)
@ -481,22 +481,22 @@ class Mux(Handler):
break break
def pre_select(self, r, w, x): def pre_select(self, r, w, x):
_add(r, self.rsock) _add(r, self.rfile)
if self.outbuf: if self.outbuf:
_add(w, self.wsock) _add(w, self.wfile)
def callback(self, sock): def callback(self, sock):
(r, w, _) = select.select([self.rsock], [self.wsock], [], 0) (r, w, _) = select.select([self.rfile], [self.wfile], [], 0)
if self.rsock in r: if self.rfile in r:
self.handle() self.handle()
if self.outbuf and self.wsock in w: if self.outbuf and self.wfile in w:
self.flush() self.flush()
class MuxWrapper(SockWrapper): class MuxWrapper(SockWrapper):
def __init__(self, mux, channel): def __init__(self, mux, channel):
SockWrapper.__init__(self, mux.rsock, mux.wsock) SockWrapper.__init__(self, mux.rfile, mux.wfile)
self.mux = mux self.mux = mux
self.channel = channel self.channel = channel
self.mux.channels[channel] = self.got_packet self.mux.channels[channel] = self.got_packet