X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new2%2Fplomrogue%2Fio_tcp.py;fp=new2%2Fplomrogue%2Fio_tcp.py;h=5dd2508a8708d5cca43836aceb396d9231ed1d0a;hb=b747db93005261dbf46c657099be0bf687ad2ce3;hp=78e43f539df4aea810a15c3abe61366d807c4993;hpb=f01848a97bb686e2b9c823cdf7fc6b59072dbd79;p=plomrogue2-experiments
diff --git a/new2/plomrogue/io_tcp.py b/new2/plomrogue/io_tcp.py
index 78e43f5..5dd2508 100644
--- a/new2/plomrogue/io_tcp.py
+++ b/new2/plomrogue/io_tcp.py
@@ -102,14 +102,12 @@ class PlomSocket:
class PlomSocketSSL(PlomSocket):
- def __init__(self, *args, server_side=False, **kwargs):
+ def __init__(self, *args, server_side=False, certfile=None, keyfile=None, **kwargs):
import ssl
- print('DEBUG', args, kwargs)
super().__init__(*args, **kwargs)
if server_side:
self.socket = ssl.wrap_socket(self.socket, server_side=True,
- certfile="server.pem",
- keyfile="key.pem")
+ certfile=certfile, keyfile=keyfile)
else:
self.socket = ssl.wrap_socket(self.socket)
@@ -150,7 +148,9 @@ class IO_Handler(socketserver.BaseRequestHandler):
import queue
import threading
if self.socket_class == PlomSocketSSL:
- plom_socket = self.socket_class(self.request, server_side=True)
+ plom_socket = self.socket_class(self.request, server_side=True,
+ certfile=self.server.certfile,
+ keyfile=self.server.keyfile)
else:
plom_socket = self.socket_class(self.request)
print('CONNECTION FROM:', str(self.client_address))
@@ -202,5 +202,7 @@ class PlomTCPServer(socketserver.ThreadingTCPServer):
class PlomTCPServerSSL(PlomTCPServer):
- def __init__(self, *args, **kwargs):
+ def __init__(self, *args, certfile=None, keyfile=None, **kwargs):
+ self.certfile = certfile
+ self.keyfile = keyfile
super().__init__(*args, host='0.0.0.0', io_handler=IO_HandlerSSL, **kwargs)