Simplify PlomSocket code.

[plomrogue2-experiments] / new2 / plomrogue / io_tcp.py

diff --git a/new2/plomrogue/io_tcp.py b/new2/plomrogue/io_tcp.py
index 45bf4471dcce8be7b6c5cdca45b067afebd7313a..203021cd06b9b7c34e2eab8efa8749c1e6188155 100644 (file)
--- a/new2/plomrogue/io_tcp.py
+++ b/new2/plomrogue/io_tcp.py
@@ -100,8 +100,24 @@ class PlomSocket:
 
 
 
+class PlomSocketSSL(PlomSocket):
+
+    def __init__(self, *args, server_side=False, certfile=None, keyfile=None, **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)
+
+
+
 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 +146,13 @@ 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,
+                                                   server_side=True,
+                                                   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 +177,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.
 
-    def __init__(self, queue, port, *args, **kwargs):
-        super().__init__(('0.0.0.0', port), IO_Handler, *args, **kwargs)
+    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, 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=None, keyfile=None, **kwargs):
+        super().__init__(*args, host='0.0.0.0', **kwargs)
+        self.certfile = certfile
+        self.keyfile = keyfile
+        self.socket_class = PlomSocketSSL