copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix file transfer. Files can be something else that utf8

Browse source
This commit is contained in:
Yann Leboulanger 2015-07-28 20:32:14 +02:00
parent 215bb32e1e
commit 75b94ca864
2 changed files with 37 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/proxy65_manager.py
View file

@ -304,14 +304,14 @@ class HostTester(Socks5, IdleObject):
self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT)
# begin negotiation. on success 'address' != 0 # begin negotiation. on success 'address' != 0
buff = self.receive() buff = self.receive()
if buff == '': if buff == b'':
# end connection # end connection
self.pollend() self.pollend()
return return
# read auth response # read auth response
if buff is None or len(buff) != 2: if buff is None or len(buff) != 2:
return None return None
version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) version, method = struct.unpack('!BB', buff[:2])
if version != 0x05 or method == 0xff: if version != 0x05 or method == 0xff:
self.pollend() self.pollend()
return return
@ -349,7 +349,7 @@ class HostTester(Socks5, IdleObject):
self._sock.setblocking(False) self._sock.setblocking(False)
self._send = self._sock.send self._send = self._sock.send
self._recv = self._sock.recv self._recv = self._sock.recv
self.buff = '' self.buff = b''
self.state = 1 # connected self.state = 1 # connected
log.debug('Host connected to %s:%s' % (self.host, self.port)) log.debug('Host connected to %s:%s' % (self.host, self.port))
self.idlequeue.plug_idle(self, True, False) self.idlequeue.plug_idle(self, True, False)
@ -424,7 +424,7 @@ class ReceiverTester(Socks5, IdleObject):
self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT)
# begin negotiation. on success 'address' != 0 # begin negotiation. on success 'address' != 0
buff = self.receive() buff = self.receive()
if buff == '': if buff == b'':
# end connection # end connection
self.pollend() self.pollend()
return return
@ -432,7 +432,7 @@ class ReceiverTester(Socks5, IdleObject):
# read auth response # read auth response
if buff is None or len(buff) != 2: if buff is None or len(buff) != 2:
return None return None
version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) version, method = struct.unpack('!BB', buff[:2])
if version != 0x05 or method == 0xff: if version != 0x05 or method == 0xff:
self.pollend() self.pollend()
return return
@ -444,7 +444,7 @@ class ReceiverTester(Socks5, IdleObject):
# read connect response # read connect response
if buff is None or len(buff) < 2: if buff is None or len(buff) < 2:
return None return None
version, reply = struct.unpack('!BB', buff[:2].encode('utf-8')) version, reply = struct.unpack('!BB', buff[:2])
if version != 0x05 or reply != 0x00: if version != 0x05 or reply != 0x00:
self.pollend() self.pollend()
return return

66
src/common/socks5.py
View file

@ -395,7 +395,7 @@ class SocksQueue:
connections with 1 connections with 1
""" """
if idx != -1: if idx != -1:
for key in self.readers.keys(): for key in list(self.readers.keys()):
if idx in key: if idx in key:
self.remove_receiver_by_key(key, self.remove_receiver_by_key(key,
do_disconnect=do_disconnect) do_disconnect=do_disconnect)
@ -452,7 +452,7 @@ class Socks5(object):
self.state = 0 # not connected self.state = 0 # not connected
self.pauses = 0 self.pauses = 0
self.size = 0 self.size = 0
self.remaining_buff = '' self.remaining_buff = b''
self.file = None self.file = None
self.connected = False self.connected = False
self.mode = '' self.mode = ''
@ -618,15 +618,15 @@ class Socks5(object):
Read small chunks of data. Call owner's disconnected() method if Read small chunks of data. Call owner's disconnected() method if
appropriate appropriate
""" """
received = '' received = b''
try: try:
add = self._recv(64).decode('utf-8') add = self._recv(64)
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError,
OpenSSL.SSL.WantX509LookupError) as e: OpenSSL.SSL.WantX509LookupError) as e:
log.info('SSL rehandshake request : ' + repr(e)) log.info('SSL rehandshake request : ' + repr(e))
raise e raise e
except Exception: except Exception:
add = '' add = b''
received += add received += add
if len(add) == 0: if len(add) == 0:
self.disconnect() self.disconnect()
@ -647,9 +647,9 @@ class Socks5(object):
return len(raw_data) return len(raw_data)
def write_next(self): def write_next(self):
if self.remaining_buff != '': if self.remaining_buff != b'':
buff = self.remaining_buff buff = self.remaining_buff
self.remaining_buff = '' self.remaining_buff = b''
else: else:
try: try:
self.open_file_for_reading() self.open_file_for_reading()
@ -688,7 +688,7 @@ class Socks5(object):
if lenn != len(buff): if lenn != len(buff):
self.remaining_buff = buff[lenn:] self.remaining_buff = buff[lenn:]
else: else:
self.remaining_buff = '' self.remaining_buff = b''
self.state = 7 # continue to write in the socket self.state = 7 # continue to write in the socket
if lenn == 0: if lenn == 0:
return None return None
@ -707,7 +707,7 @@ class Socks5(object):
self.file_props.error = -2 self.file_props.error = -2
return None return None
fd = None fd = None
if self.remaining_buff != '': if self.remaining_buff != b'':
try: try:
fd = self.get_fd() fd = self.get_fd()
except IOError: except IOError:
@ -721,7 +721,7 @@ class Socks5(object):
self.file_props.last_time self.file_props.last_time
self.file_props.last_time = current_time self.file_props.last_time = current_time
self.file_props.received_len += lenn self.file_props.received_len += lenn
self.remaining_buff = '' self.remaining_buff = b''
if self.file_props.received_len == self.file_props.size: if self.file_props.received_len == self.file_props.size:
self.rem_fd(fd) self.rem_fd(fd)
self.disconnect() self.disconnect()
@ -736,13 +736,13 @@ class Socks5(object):
self.file_props.error = -6 # file system error self.file_props.error = -6 # file system error
return 0 return 0
try: try:
buff = self._recv(MAX_BUFF_LEN).decode('utf-8') buff = self._recv(MAX_BUFF_LEN)
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError,
OpenSSL.SSL.WantX509LookupError) as e: OpenSSL.SSL.WantX509LookupError) as e:
log.info('SSL rehandshake request :' + repr(e)) log.info('SSL rehandshake request :' + repr(e))
raise e raise e
except Exception: except Exception:
buff = '' buff = b''
current_time = self.idlequeue.current_time() current_time = self.idlequeue.current_time()
self.file_props.elapsed_time += current_time - \ self.file_props.elapsed_time += current_time - \
self.file_props.last_time self.file_props.last_time
@ -819,9 +819,9 @@ class Socks5(object):
""" """
auth_mechanisms = [] auth_mechanisms = []
try: try:
num_auth = struct.unpack('!xB', buff[:2].encode('utf-8'))[0] num_auth = struct.unpack('!xB', buff[:2])[0]
for i in list(range(num_auth)): for i in list(range(num_auth)):
mechanism, = struct.unpack('!B', buff[1 + i].encode('utf-8')) mechanism, = struct.unpack('!B', buff[1 + i])
auth_mechanisms.append(mechanism) auth_mechanisms.append(mechanism)
except Exception: except Exception:
return None return None
@ -855,25 +855,22 @@ class Socks5(object):
def _parse_request_buff(self, buff): def _parse_request_buff(self, buff):
try: # don't trust on what comes from the outside try: # don't trust on what comes from the outside
req_type, host_type, = struct.unpack('!xBxB', buff[:4].encode( req_type, host_type, = struct.unpack('!xBxB', buff[:4])
'utf-8'))
if host_type == 0x01: if host_type == 0x01:
host_arr = struct.unpack('!iiii', buff[4:8].encode('utf-8')) host_arr = struct.unpack('!iiii', buff[4:8])
host, = '.'.join(str(s) for s in host_arr) host, = '.'.join(str(s) for s in host_arr)
host_len = len(host) host_len = len(host)
elif host_type == 0x03: elif host_type == 0x03:
host_len, = struct.unpack('!B', buff[4].encode('utf-8')) host_len, = struct.unpack('!B', buff[4])
host, = struct.unpack('!%ds' % host_len, buff[5:5 + host_len].\ host, = struct.unpack('!%ds' % host_len, buff[5:5 + host_len])
encode('utf-8'))
portlen = len(buff[host_len + 5:]) portlen = len(buff[host_len + 5:])
if portlen == 1: if portlen == 1:
port, = struct.unpack('!B', buff[host_len + 5].encode('utf-8')) port, = struct.unpack('!B', buff[host_len + 5])
elif portlen == 2: elif portlen == 2:
port, = struct.unpack('!H', buff[host_len + 5:].encode('utf-8')) port, = struct.unpack('!H', buff[host_len + 5:])
# file data, comes with auth message (Gaim bug) # file data, comes with auth message (Gaim bug)
else: else:
port, = struct.unpack('!H', buff[host_len + 5: host_len + 7].\ port, = struct.unpack('!H', buff[host_len + 5: host_len + 7])
encode('utf-8'))
self.remaining_buff = buff[host_len + 7:] self.remaining_buff = buff[host_len + 7:]
except Exception: except Exception:
return (None, None, None) return (None, None, None)
@ -890,7 +887,7 @@ class Socks5(object):
log.info("SSL rehandshake request : " + repr(e)) log.info("SSL rehandshake request : " + repr(e))
raise e raise e
try: try:
version, method = struct.unpack('!BB', buff.encode('utf-8')) version, method = struct.unpack('!BB', buff)
except Exception: except Exception:
version, method = None, None version, method = None, None
if version != 0x05 or method == 0xff: if version != 0x05 or method == 0xff:
@ -1197,7 +1194,7 @@ class Socks5Client(Socks5):
if self.state == 2: # read auth response if self.state == 2: # read auth response
if buff is None or len(buff) != 2: if buff is None or len(buff) != 2:
return None return None
version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) version, method = struct.unpack('!BB', buff[:2])
if version != 0x05 or method == 0xff: if version != 0x05 or method == 0xff:
self.disconnect() self.disconnect()
elif self.state == 4: # get approve of our request elif self.state == 4: # get approve of our request
@ -1206,23 +1203,18 @@ class Socks5Client(Socks5):
sub_buff = buff[:4] sub_buff = buff[:4]
if len(sub_buff) < 4: if len(sub_buff) < 4:
return None return None
version, address_type = struct.unpack('!BxxB', buff[:4].encode( version, address_type = struct.unpack('!BxxB', buff[:4])
'utf-8'))
addrlen = 0 addrlen = 0
if address_type == 0x03: if address_type == 0x03:
addrlen = ord(buff[4]) addrlen = buff[4]
address = struct.unpack('!%ds' % addrlen, buff[5:addrlen + 5].\ address = struct.unpack('!%ds' % addrlen, buff[5:addrlen + 5])
encode('utf-8'))
portlen = len(buff[addrlen + 5:]) portlen = len(buff[addrlen + 5:])
if portlen == 1: if portlen == 1:
port, = struct.unpack('!B', buff[addrlen + 5].encode( port, = struct.unpack('!B', buff[addrlen + 5])
'utf-8'))
elif portlen == 2: elif portlen == 2:
port, = struct.unpack('!H', buff[addrlen + 5:].encode( port, = struct.unpack('!H', buff[addrlen + 5:])
'utf-8'))
else: # Gaim bug :) else: # Gaim bug :)
port, = struct.unpack('!H', buff[addrlen + 5:addrlen + 7].\ port, = struct.unpack('!H', buff[addrlen + 5:addrlen + 7])
encode('utf-8'))
self.remaining_buff = buff[addrlen + 7:] self.remaining_buff = buff[addrlen + 7:]
self.state = 5 # for senders: init file_props and send '\n' self.state = 5 # for senders: init file_props and send '\n'
if self.queue.on_success: if self.queue.on_success: