Merge "Add support for secure websocket connection"

zun/cmd/wsproxy.py

@@ -34,6 +34,9 @@ def main():
     websocketproxy.ZunWebSocketProxy(
         listen_host=host,
         listen_port=port,
+        cert=CONF.websocket_proxy.cert,
+        key=CONF.websocket_proxy.key,
+        ssl_only=CONF.websocket_proxy.ssl_only,
         file_only=True,
         RequestHandlerClass=websocketproxy.ZunProxyRequestHandler
     ).start_server()

zun/conf/websocket_proxy.py

@@ -78,6 +78,14 @@ Possible values:
 
 * A list where each element is an allowed origin hostnames, else an empty list
 """),
+    cfg.BoolOpt('ssl_only',
+                help="Disallow non-encrypted connections."),
+    cfg.StrOpt('cert',
+               default='',
+               help="Path to SSL certificate file."),
+    cfg.StrOpt('key',
+               default='',
+               help="SSL key file (if separate from cert)."),
 ]
 
 ALL_OPTS = (wsproxy_opts)