summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorThierry Carrez <thierry@openstack.org>2012-02-07 16:37:34 +0100
committerThierry Carrez <thierry@openstack.org>2012-02-07 21:14:31 +0100
commit71410724cd1516608ee58c37077bf9080da38de2 (patch)
tree89d1b1c2930cef01565da8e5436ad8c2edb8a1bf /bin
parentae377f42e95b18438f4855c13230e077a870c64b (diff)
downloadnova-71410724cd1516608ee58c37077bf9080da38de2.tar.gz
nova-71410724cd1516608ee58c37077bf9080da38de2.tar.xz
nova-71410724cd1516608ee58c37077bf9080da38de2.zip
Remove ajaxterm from Nova
Removes copy of ajaxterm code, nova-ajax-console-proxy, and support for get_ajax_console from Nova proper. Implements blueprint remove-ajaxterm Fixes bug 917963 Change-Id: I2c0ff427c53c0f63a18b10475d6b4cbe9a085d83
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-ajax-console-proxy146
1 files changed, 0 insertions, 146 deletions
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
deleted file mode 100755
index 94d93cd0e..000000000
--- a/bin/nova-ajax-console-proxy
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env python
-# pylint: disable=C0103
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# 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.
-
-"""Ajax Console Proxy Server"""
-
-from eventlet import greenthread
-from eventlet.green import urllib2
-
-import exceptions
-import os
-import sys
-import time
-import urlparse
-
-# If ../nova/__init__.py exists, add ../ to Python search path, so that
-# it will override what happens to be installed in /usr/(local/)lib/python...
-possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
- os.pardir,
- os.pardir))
-if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
- sys.path.insert(0, possible_topdir)
-
-
-from nova import flags
-from nova import log as logging
-from nova.openstack.common import cfg
-from nova import rpc
-from nova import service
-from nova import utils
-from nova import wsgi
-
-
-ajax_console_idle_timeout_opt = \
- cfg.IntOpt('ajax_console_idle_timeout',
- default=300,
- help='Seconds before idle connection destroyed')
-
-FLAGS = flags.FLAGS
-FLAGS.add_option(ajax_console_idle_timeout_opt)
-
-LOG = logging.getLogger('nova.ajax_console_proxy')
-
-
-class AjaxConsoleProxy(object):
- tokens = {}
-
- def __call__(self, env, start_response):
- try:
- if 'QUERY_STRING' in env:
- req_url = '%s://%s%s?%s' % (env['wsgi.url_scheme'],
- env['HTTP_HOST'],
- env['PATH_INFO'],
- env['QUERY_STRING'])
- else:
- req_url = '%s://%s%s' % (env['wsgi.url_scheme'],
- env['HTTP_HOST'],
- env['PATH_INFO'])
-
- if 'HTTP_REFERER' in env:
- auth_url = env['HTTP_REFERER']
- else:
- auth_url = req_url
-
- auth_params = urlparse.parse_qs(urlparse.urlparse(auth_url).query)
- parsed_url = urlparse.urlparse(req_url)
-
- auth_info = AjaxConsoleProxy.tokens[auth_params['token'][0]]
- args = auth_info['args']
- auth_info['last_activity'] = time.time()
-
- remote_url = ("http://%s:%s%s?token=%s" % (
- str(args['host']),
- str(args['port']),
- parsed_url.path,
- str(args['token'])))
-
- opener = urllib2.urlopen(remote_url, env['wsgi.input'].read())
- body = opener.read()
- info = opener.info()
-
- start_response("200 OK", info.dict.items())
- return body
- except (exceptions.KeyError):
- if env['PATH_INFO'] != '/favicon.ico':
- LOG.audit("Unauthorized request %s, %s"
- % (req_url, str(env)))
- start_response("401 NOT AUTHORIZED", [])
- return "Not Authorized"
- except Exception, exc:
- LOG.exception(exc)
- start_response("500 ERROR", [])
- return "Server Error"
-
- def register_listeners(self):
- class TopicProxy():
- @staticmethod
- def authorize_ajax_console(context, **kwargs):
- AjaxConsoleProxy.tokens[kwargs['token']] = \
- {'args': kwargs, 'last_activity': time.time()}
-
- self.conn = rpc.create_connection(new=True)
- self.conn.create_consumer(
- FLAGS.ajax_console_proxy_topic,
- TopicProxy)
-
- def delete_expired_tokens():
- now = time.time()
- to_delete = []
- for k, v in AjaxConsoleProxy.tokens.items():
- if now - v['last_activity'] > FLAGS.ajax_console_idle_timeout:
- to_delete.append(k)
-
- for k in to_delete:
- del AjaxConsoleProxy.tokens[k]
-
- self.conn.consume_in_thread()
- utils.LoopingCall(delete_expired_tokens).start(1)
-
-if __name__ == '__main__':
- utils.default_flagfile()
- FLAGS(sys.argv)
- logging.setup()
- acp_port = FLAGS.ajax_console_proxy_port
- acp = AjaxConsoleProxy()
- acp.register_listeners()
- server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port)
- service.serve(server)
- service.wait()
- acp.conn.close()