+from plomrogue.errors import BrokenSocketConnection
class PlomSocket:
def __init__(self, socket):
<http://stackoverflow.com/q/34919846>
"""
- from plomrogue.errors import BrokenSocketConnection
escaped_message = ''
for char in message:
if char in ('\\', '$'):
try:
sent = self.socket.send(data[totalsent:])
socket_broken = sent == 0
+ totalsent = totalsent + sent
except OSError as err:
if err.errno == 9: # "Bad file descriptor", when connection broken
socket_broken = True
raise err
if socket_broken and not silent_connection_break:
raise BrokenSocketConnection
- totalsent = totalsent + sent
def recv(self):
"""Get full send()-prepared message from self.socket.
data = b''
msg = b''
while True:
- data += self.socket.recv(1024)
+ try:
+ data = self.socket.recv(1024)
+ except OSError as err:
+ if err.errno == 9: # "Bad file descriptor", when connection broken
+ raise BrokenSocketConnection
if 0 == len(data):
- return
- cut_off = 0
+ break
for c in data:
- cut_off += 1
if esc:
msg += bytes([c])
esc = False
yield msg.decode()
except UnicodeDecodeError:
yield None
- data = data[cut_off:]
msg = b''
else:
msg += bytes([c])
class PlomSocketSSL(PlomSocket):
- def __init__(self, *args, server_side=False, certfile=None, keyfile=None, **kwargs):
+ def __init__(self, *args, certfile, keyfile, **kwargs):
import ssl
super().__init__(*args, **kwargs)
- if server_side:
- self.socket = ssl.wrap_socket(self.socket, server_side=True,
- certfile=certfile, keyfile=keyfile)
- else:
- self.socket = ssl.wrap_socket(self.socket)
+ self.send('NEED_SSL')
+ self.socket = ssl.wrap_socket(self.socket, server_side=True,
+ certfile=certfile, keyfile=keyfile)
import threading
if self.server.socket_class == PlomSocketSSL:
plom_socket = self.server.socket_class(self.request,
- server_side=True,
certfile=self.server.certfile,
keyfile=self.server.keyfile)
else:
class PlomTCPServerSSL(PlomTCPServer):
- def __init__(self, *args, certfile=None, keyfile=None, **kwargs):
+ def __init__(self, *args, certfile, keyfile, **kwargs):
super().__init__(*args, host='0.0.0.0', **kwargs)
self.certfile = certfile
self.keyfile = keyfile