X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=new2%2Fplomrogue%2Fio_tcp.py;h=09b9db1bbf3d0f47539a2c4aaea27aacd9c0c18c;hb=8f4f247a8c36610a5cd4eb03ddb26dcc701e38ab;hp=45bf4471dcce8be7b6c5cdca45b067afebd7313a;hpb=72652ab5bc9917ecf49ef076e6a8eb8d3ca9a710;p=plomrogue2-experiments
diff --git a/new2/plomrogue/io_tcp.py b/new2/plomrogue/io_tcp.py
index 45bf447..09b9db1 100644
--- a/new2/plomrogue/io_tcp.py
+++ b/new2/plomrogue/io_tcp.py
@@ -6,6 +6,7 @@ socketserver.TCPServer.allow_reuse_address = True
+from plomrogue.errors import BrokenSocketConnection
class PlomSocket:
def __init__(self, socket):
@@ -32,7 +33,6 @@ class PlomSocket:
"""
- from plomrogue.errors import BrokenSocketConnection
escaped_message = ''
for char in message:
if char in ('\\', '$'):
@@ -46,6 +46,7 @@ class PlomSocket:
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
@@ -53,7 +54,6 @@ class PlomSocket:
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.
@@ -77,12 +77,14 @@ class PlomSocket:
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
@@ -93,15 +95,28 @@ class PlomSocket:
yield msg.decode()
except UnicodeDecodeError:
yield None
- data = data[cut_off:]
msg = b''
else:
msg += bytes([c])
+class PlomSocketSSL(PlomSocket):
+
+ def __init__(self, *args, certfile, keyfile, **kwargs):
+ import ssl
+ super().__init__(*args, **kwargs)
+ self.send('NEED_SSL')
+ self.socket = ssl.wrap_socket(self.socket, server_side=True,
+ certfile=certfile, keyfile=keyfile)
+
+
+
class IO_Handler(socketserver.BaseRequestHandler):
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+
def handle(self):
"""Move messages between network socket and game IO loop via queues.
@@ -130,7 +145,12 @@ class IO_Handler(socketserver.BaseRequestHandler):
import uuid
import queue
import threading
- plom_socket = PlomSocket(self.request)
+ if self.server.socket_class == PlomSocketSSL:
+ plom_socket = self.server.socket_class(self.request,
+ certfile=self.server.certfile,
+ keyfile=self.server.keyfile)
+ else:
+ plom_socket = self.server.socket_class(self.request)
print('CONNECTION FROM:', str(self.client_address))
connection_id = uuid.uuid4()
queue_in = queue.Queue()
@@ -155,11 +175,27 @@ class IO_Handler(socketserver.BaseRequestHandler):
class PlomTCPServer(socketserver.ThreadingTCPServer):
- """Bind together threaded IO handling server and message queue."""
+ """Bind together threaded IO handling server and message queue.
+
+ By default this only serves to localhost connections. For remote
+ connections, consider using PlomTCPServerSSL for more security,
+ which defaults to serving all connections.
+
+ """
- def __init__(self, queue, port, *args, **kwargs):
- super().__init__(('0.0.0.0', port), IO_Handler, *args, **kwargs)
+ def __init__(self, queue, port, host='127.0.0.1', *args, **kwargs):
+ super().__init__((host, port), IO_Handler, *args, **kwargs)
+ self.socket_class = PlomSocket
self.queue_out = queue
self.daemon_threads = True # Else, server's threads have daemon=False.
self.clients = {}
+
+
+class PlomTCPServerSSL(PlomTCPServer):
+
+ def __init__(self, *args, certfile, keyfile, **kwargs):
+ super().__init__(*args, host='0.0.0.0', **kwargs)
+ self.certfile = certfile
+ self.keyfile = keyfile
+ self.socket_class = PlomSocketSSL