Pull NovaWebSocketProxy class out of nova-novncproxy binary

To allow sharing of proxy code between nova-novncproxy and
nova-spicehtml5proxy, pull the NovaWebSocketProxy class
out of nova-novncproxy into a new nova/console/websocketproxy.py
file

Adds previously missing websockify dep to pip-requires.

Blueprint: libvirt-spice
Change-Id: If1334256680e7075598f00ce153cf6f021cc720f
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

3 files changed, 105 insertions, 81 deletions

diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy
index beee143f5..8562acc53 100755
--- a/bin/nova-novncproxy
+++ b/bin/nova-novncproxy
@@ -21,20 +21,12 @@ Websocket proxy that is compatible with OpenStack Nova
 noVNC consoles. Leverages websockify.py by Joel Martin
 '''
 
-import Cookie
 import os
-import socket
 import sys
 
-import websockify
-
 from nova import config
-from nova.consoleauth import rpcapi as consoleauth_rpcapi
-from nova import context
+from nova.console import websocketproxy as ws
 from nova.openstack.common import cfg
-from nova.openstack.common import log as logging
-from nova.openstack.common import rpc
-from nova import utils
 
 
 opts = [
@@ -69,64 +61,6 @@ opts = [
 
 CONF = cfg.CONF
 CONF.register_cli_opts(opts)
-LOG = logging.getLogger(__name__)
-
-
-class NovaWebSocketProxy(websockify.WebSocketProxy):
-    def __init__(self, *args, **kwargs):
-        websockify.WebSocketProxy.__init__(self, unix_target=None,
-                                           target_cfg=None,
-                                           ssl_target=None, *args, **kwargs)
-
-    def new_client(self):
-        """
-        Called after a new WebSocket connection has been established.
-        """
-        cookie = Cookie.SimpleCookie()
-        cookie.load(self.headers.getheader('cookie'))
-        token = cookie['token'].value
-        ctxt = context.get_admin_context()
-        rpcapi = consoleauth_rpcapi.ConsoleAuthAPI()
-        connect_info = rpcapi.check_token(ctxt, token=token)
-
-        if not connect_info:
-            LOG.audit("Invalid Token: %s", token)
-            raise Exception(_("Invalid Token"))
-
-        host = connect_info['host']
-        port = int(connect_info['port'])
-
-        # Connect to the target
-        self.msg("connecting to: %s:%s" % (host, port))
-        LOG.audit("connecting to: %s:%s" % (host, port))
-        tsock = self.socket(host, port, connect=True)
-
-        # Handshake as necessary
-        if connect_info.get('internal_access_path'):
-            tsock.send("CONNECT %s HTTP/1.1\r\n\r\n" %
-                        connect_info['internal_access_path'])
-            while True:
-                data = tsock.recv(4096, socket.MSG_PEEK)
-                if data.find("\r\n\r\n") != -1:
-                    if not data.split("\r\n")[0].find("200"):
-                        LOG.audit("Invalid Connection Info %s", token)
-                        raise Exception(_("Invalid Connection Info"))
-                    tsock.recv(len(data))
-                    break
-
-        if self.verbose and not self.daemon:
-            print(self.traffic_legend)
-
-        # Start proxying
-        try:
-            self.do_proxy(tsock)
-        except Exception:
-            if tsock:
-                tsock.shutdown(socket.SHUT_RDWR)
-                tsock.close()
-                self.vmsg("%s:%s: Target closed" % (host, port))
-                LOG.audit("%s:%s: Target closed" % (host, port))
-            raise
 
 
 if __name__ == '__main__':
@@ -142,18 +76,18 @@ if __name__ == '__main__':
         sys.exit(-1)
 
     # Create and start the NovaWebSockets proxy
-    server = NovaWebSocketProxy(listen_host=CONF.novncproxy_host,
-                                listen_port=CONF.novncproxy_port,
-                                source_is_ipv6=CONF.source_is_ipv6,
-                                verbose=CONF.verbose,
-                                cert=CONF.cert,
-                                key=CONF.key,
-                                ssl_only=CONF.ssl_only,
-                                daemon=CONF.daemon,
-                                record=CONF.record,
-                                web=CONF.web,
-                                target_host='ignore',
-                                target_port='ignore',
-                                wrap_mode='exit',
-                                wrap_cmd=None)
+    server = ws.NovaWebSocketProxy(listen_host=CONF.novncproxy_host,
+                                   listen_port=CONF.novncproxy_port,
+                                   source_is_ipv6=CONF.source_is_ipv6,
+                                   verbose=CONF.verbose,
+                                   cert=CONF.cert,
+                                   key=CONF.key,
+                                   ssl_only=CONF.ssl_only,
+                                   daemon=CONF.daemon,
+                                   record=CONF.record,
+                                   web=CONF.web,
+                                   target_host='ignore',
+                                   target_port='ignore',
+                                   wrap_mode='exit',
+                                   wrap_cmd=None)
     server.start_server()
diff --git a/nova/console/websocketproxy.py b/nova/console/websocketproxy.py
new file mode 100644
index 000000000..ce9243d46
--- /dev/null
+++ b/nova/console/websocketproxy.py
@@ -0,0 +1,89 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2012 OpenStack, LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+'''
+Websocket proxy that is compatible with OpenStack Nova.
+Leverages websockify.py by Joel Martin
+'''
+
+import Cookie
+import socket
+
+import websockify
+
+from nova.consoleauth import rpcapi as consoleauth_rpcapi
+from nova import context
+from nova.openstack.common import log as logging
+
+LOG = logging.getLogger(__name__)
+
+
+class NovaWebSocketProxy(websockify.WebSocketProxy):
+    def __init__(self, *args, **kwargs):
+        websockify.WebSocketProxy.__init__(self, unix_target=None,
+                                           target_cfg=None,
+                                           ssl_target=None, *args, **kwargs)
+
+    def new_client(self):
+        """
+        Called after a new WebSocket connection has been established.
+        """
+        cookie = Cookie.SimpleCookie()
+        cookie.load(self.headers.getheader('cookie'))
+        token = cookie['token'].value
+        ctxt = context.get_admin_context()
+        rpcapi = consoleauth_rpcapi.ConsoleAuthAPI()
+        connect_info = rpcapi.check_token(ctxt, token=token)
+
+        if not connect_info:
+            LOG.audit("Invalid Token: %s", token)
+            raise Exception(_("Invalid Token"))
+
+        host = connect_info['host']
+        port = int(connect_info['port'])
+
+        # Connect to the target
+        self.msg("connecting to: %s:%s" % (host, port))
+        LOG.audit("connecting to: %s:%s" % (host, port))
+        tsock = self.socket(host, port, connect=True)
+
+        # Handshake as necessary
+        if connect_info.get('internal_access_path'):
+            tsock.send("CONNECT %s HTTP/1.1\r\n\r\n" %
+                        connect_info['internal_access_path'])
+            while True:
+                data = tsock.recv(4096, socket.MSG_PEEK)
+                if data.find("\r\n\r\n") != -1:
+                    if not data.split("\r\n")[0].find("200"):
+                        LOG.audit("Invalid Connection Info %s", token)
+                        raise Exception(_("Invalid Connection Info"))
+                    tsock.recv(len(data))
+                    break
+
+        if self.verbose and not self.daemon:
+            print(self.traffic_legend)
+
+        # Start proxying
+        try:
+            self.do_proxy(tsock)
+        except Exception:
+            if tsock:
+                tsock.shutdown(socket.SHUT_RDWR)
+                tsock.close()
+                self.vmsg("%s:%s: Target closed" % (host, port))
+                LOG.audit("%s:%s: Target closed" % (host, port))
+            raise
diff --git a/tools/pip-requires b/tools/pip-requires
index 1845ba7dd..231d5cfe5 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -25,3 +25,4 @@ python-quantumclient>=2.1
 python-glanceclient>=0.5.0,<2
 python-keystoneclient>=0.2.0
 stevedore>=0.7
+websockify