openstack/nova
Code Issues Proposed changes

Merge "xvp: Start using consoleauth tokens"

Browse Source
This commit is contained in:
Zuul 2019-07-24 03:56:59 +00:00 committed by Gerrit Code Review
commit 05497655f2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/vnc/xvp_proxy.py
View File

@ -26,9 +26,10 @@ from oslo_log import log as logging
import webob import webob
import nova.conf import nova.conf
from nova.consoleauth import rpcapi as consoleauth_rpcapi
from nova import context from nova import context
from nova import exception
from nova.i18n import _LI from nova.i18n import _LI
from nova import objects
from nova import utils from nova import utils
from nova import version from nova import version
from nova import wsgi from nova import wsgi
@ -131,10 +132,11 @@ class XCPVNCProxy(object):
return "Invalid Request" return "Invalid Request"
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
api = consoleauth_rpcapi.ConsoleAuthAPI()
connect_info = api.check_token(ctxt, token)
if not connect_info: try:
connect_info = objects.ConsoleAuthToken.validate(
ctxt, token).to_dict()
except exception.InvalidToken:
LOG.info(_LI("Request made with invalid token: %s"), req) LOG.info(_LI("Request made with invalid token: %s"), req)
start_response('401 Not Authorized', start_response('401 Not Authorized',
[('content-type', 'text/html')]) [('content-type', 'text/html')])