Merge pull request Pithikos#78 from eado/master

Add ssl support

Author: Pithikos

README.md

@@ -11,7 +11,7 @@ A minimal Websockets Server in Python with no external dependencies.
   * No dependencies
 
 Notice that this implementation does not support the more advanced features
-like SSL etc. The project is focused mainly on making it easy to run a
+like multithreading etc. The project is focused mainly on making it easy to run a
 websocket server for prototyping, testing or for making a GUI for your application.
 
 
@@ -59,6 +59,10 @@ The WebsocketServer can be initialized with the below parameters.
 
 *`loglevel`* - logging level to print. By default WARNING is used. You can use `logging.DEBUG` or `logging.INFO` for more verbose output.
 
+*`key`* - If using SSL, this is the path to the key.  
+
+*`cert`* - If using SSL, this is the path to the certificate. 
+
 
 ### Properties
 
@@ -101,7 +105,19 @@ def new_client(client, server):
 server = WebsocketServer(13254, host='127.0.0.1', loglevel=logging.INFO)
 server.set_fn_new_client(new_client)
 server.run_forever()
-````
+````  
+Example (SSL):  
+````py
+import logging
+from websocket_server import WebsocketServer
+
+def new_client(client, server):
+	server.send_message_to_all("Hey all, a new client has joined us")
+
+server = WebsocketServer(13254, host='127.0.0.1', loglevel=logging.INFO, key="key.pem", cert="cert.pem")
+server.set_fn_new_client(new_client)
+server.run_forever()
+````  
 
 ## Client
 

websocket_server/websocket_server.py

@@ -3,6 +3,7 @@
 
 import sys
 import struct
+import ssl
 from base64 import b64encode
 from hashlib import sha1
 import logging
@@ -112,10 +113,13 @@ class WebsocketServer(ThreadingMixIn, TCPServer, API):
     allow_reuse_address = True
     daemon_threads = True  # comment to keep threads alive until finished
 
-    def __init__(self, port, host='127.0.0.1', loglevel=logging.WARNING):
+    def __init__(self, port, host='127.0.0.1', loglevel=logging.WARNING, key=None, cert=None):
         logger.setLevel(loglevel)
         TCPServer.__init__(self, (host, port), WebSocketHandler)
         self.port = self.socket.getsockname()[1]
+		
+        self.key = key
+        self.cert = cert
 
         self.clients = []
         self.id_counter = 0
@@ -162,6 +166,11 @@ class WebSocketHandler(StreamRequestHandler):
 
     def __init__(self, socket, addr, server):
         self.server = server
+        if server.key and server.cert:
+            try:
+                socket = ssl.wrap_socket(socket, server_side=True, certfile=server.cert, keyfile=server.key)
+            except: # Not sure which exception it throws if the key/cert isn't found
+                logger.warn("SSL not available (are the paths {} and {} correct for the key and cert?)".format(server.key, server.cert))
         StreamRequestHandler.__init__(self, socket, addr, server)
 
     def setup(self):