roman
/
black-mamba
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

https://github.com/Synss/python-mbedtls/issues/20

master
Роман Бородин 2019-04-10 09:23:17 +03:00
parent 8ef5153e2e
commit 4fff6e42fb
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mods/rpyc_dtls.py
View File

@ -66,7 +66,7 @@ cli_ctx_conf = tls.DTLSConfiguration(
trust_store=trust_store, trust_store=trust_store,
validate_certificates=False, validate_certificates=False,
) )
MAX_IO_CHUNK = 20971520 MAX_IO_CHUNK = 8192
class DTLSSocketStream(SocketStream): class DTLSSocketStream(SocketStream):
MAX_IO_CHUNK = MAX_IO_CHUNK MAX_IO_CHUNK = MAX_IO_CHUNK
@ -90,7 +90,7 @@ class DTLSSocketStream(SocketStream):
def read(self, count): def read(self, count):
while True: while True:
try: try:
buf = block(self.sock.recv, min(self.MAX_IO_CHUNK, count)) buf = block(self.sock.recv, self.MAX_IO_CHUNK)
except socket.timeout: except socket.timeout:
continue continue
except socket.error: except socket.error:
@ -118,14 +118,30 @@ class DTLSSocketStream(SocketStream):
class DTLSChannel(Channel): class DTLSChannel(Channel):
MAX_IO_CHUNK = MAX_IO_CHUNK MAX_IO_CHUNK = MAX_IO_CHUNK
def recv(self): def recv(self):
raw_data = self.stream.read(self.MAX_IO_CHUNK) header = self.stream.read(self.MAX_IO_CHUNK)
header = raw_data[:self.FRAME_HEADER.size]
raw_data = raw_data[self.FRAME_HEADER.size:]
length, compressed = self.FRAME_HEADER.unpack(header) length, compressed = self.FRAME_HEADER.unpack(header)
data = raw_data[:length] length += len(self.FLUSHER)
data = b''
while length:
dat = self.stream.read(self.MAX_IO_CHUNK)
data += dat
length -= len(dat)
data = data[:-len(self.FLUSHER)]
if compressed: if compressed:
data = zlib.decompress(data) data = zlib.decompress(data)
return data return data
def send(self, data):
if self.compress and len(data) > self.COMPRESSION_THRESHOLD:
compressed = 1
data = zlib.compress(data, self.COMPRESSION_LEVEL)
else:
compressed = 0
header = self.FRAME_HEADER.pack(len(data), compressed)
self.stream.write(header)
data = data + self.FLUSHER
data = [data[i:i + self.MAX_IO_CHUNK] for i in range(0, len(data), self.MAX_IO_CHUNK)]
for chunk in data:
self.stream.write(chunk)
def connect_stream(stream, service=rpyc.VoidService, config={}): def connect_stream(stream, service=rpyc.VoidService, config={}):
return connect_channel(DTLSChannel(stream), service=service, config=config) return connect_channel(DTLSChannel(stream), service=service, config=config)
@ -205,18 +221,17 @@ class DTLSThreadedServer(ThreadedServer):
return return
sock.setblocking(True) sock.setblocking(True)
self.logger.info("accepted %s with fd %s", addrinfo, sock.fileno())
print("accepted %s with fd %s" % (addrinfo, sock.fileno()))
self.clients.add(sock)
self._accept_method(sock)
def _accept_method(self, sock):
addr = sock.getpeername() addr = sock.getpeername()
sock.setcookieparam(addr[0].encode()) sock.setcookieparam(addr[0].encode())
with suppress(tls.HelloVerifyRequest): with suppress(tls.HelloVerifyRequest):
block(sock.do_handshake) block(sock.do_handshake)
sock, addr = sock.accept() sock2, addr = sock.accept()
sock.setcookieparam(addr[0].encode()) sock.close()
block(sock.do_handshake) sock2.setblocking(True)
spawn(self._authenticate_and_serve_client, sock) sock2.setcookieparam(addr[0].encode())
block(sock2.do_handshake)
self.logger.info("accepted %s with fd %s", addrinfo, sock2.fileno())
print("accepted %s with fd %s" % (addrinfo, sock2.fileno()))
self.clients.add(sock2)
self._accept_method(sock2)