x/python-ganttclient
Code Issues Proposed changes

Pull NovaWebSocketProxy class out of nova-novncproxy binary

Browse Source 
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>
This commit is contained in:
Daniel P. Berrange
2013-01-03 10:52:40 +00:00
parent b65f33f3f0
commit 94ffdc820f
1 changed files with 15 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
bin/nova-novncproxy
View File

@@ -21,20 +21,12 @@ Websocket proxy that is compatible with OpenStack Nova
noVNC consoles. Leverages websockify.py by Joel Martin noVNC consoles. Leverages websockify.py by Joel Martin
''' '''
import Cookie
import os import os
import socket
import sys import sys
import websockify
from nova import config from nova import config
from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova.console import websocketproxy as ws
from nova import context
from nova.openstack.common import cfg 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 = [ opts = [
@@ -69,64 +61,6 @@ opts = [
CONF = cfg.CONF CONF = cfg.CONF
CONF.register_cli_opts(opts) 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__': if __name__ == '__main__':
@@ -142,18 +76,18 @@ if __name__ == '__main__':
sys.exit(-1) sys.exit(-1)
# Create and start the NovaWebSockets proxy # Create and start the NovaWebSockets proxy
server = NovaWebSocketProxy(listen_host=CONF.novncproxy_host, server = ws.NovaWebSocketProxy(listen_host=CONF.novncproxy_host,
listen_port=CONF.novncproxy_port, listen_port=CONF.novncproxy_port,
source_is_ipv6=CONF.source_is_ipv6, source_is_ipv6=CONF.source_is_ipv6,
verbose=CONF.verbose, verbose=CONF.verbose,
cert=CONF.cert, cert=CONF.cert,
key=CONF.key, key=CONF.key,
ssl_only=CONF.ssl_only, ssl_only=CONF.ssl_only,
daemon=CONF.daemon, daemon=CONF.daemon,
record=CONF.record, record=CONF.record,
web=CONF.web, web=CONF.web,
target_host='ignore', target_host='ignore',
target_port='ignore', target_port='ignore',
wrap_mode='exit', wrap_mode='exit',
wrap_cmd=None) wrap_cmd=None)
server.start_server() server.start_server()