From d36d8d38ba3d9b440a385f519f19bda6c3416547 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Fri, 15 Jun 2012 10:55:51 +1000 Subject: [PATCH] Fix the metadata server auth (KeystoneCreds only sent from heat) Change-Id: I918ff76485649ec56312f7029895d61e0cbf7a4b Signed-off-by: Angus Salkeld --- heat/common/context.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/heat/common/context.py b/heat/common/context.py index d452bb2b04..93faac76f0 100644 --- a/heat/common/context.py +++ b/heat/common/context.py @@ -173,9 +173,10 @@ class ContextMiddleware(wsgi.Middleware): # I Haven't tested to see if WSGI stuff would escape # everything to make this safe. However, I haven't found # a better way to do this either. - creds = eval(req.params['KeyStoneCreds']) - username = creds['username'] - password = creds['password'] + if 'KeyStoneCreds' in req.params: + creds = eval(req.params['KeyStoneCreds']) + username = creds['username'] + password = creds['password'] token = headers.get('X-Auth-Token') service_user = headers.get('X-Admin-User')