openstack
/
keystone
Code Issues Proposed changes

Change roleId to role.id for swift middleware. 

Change-Id: I61591ff5c8ae944e3006449dbc300a0cfe32a4de
This commit is contained in:
Chmouel Boudjnah 2011-10-04 11:45:35 -04:00
parent 61148fbdbc
commit 5fa576a1b7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/middleware/swift_auth.py
View File

@ -46,7 +46,7 @@ from webob.exc import HTTPUnauthorized, HTTPNotFound, HTTPExpectationFailed
from keystone.common.bufferedhttp import http_connect_raw as http_connect
from swift.common.middleware.acl import clean_acl, parse_acl, referrer_allowed
from swift.common.utils import cache_from_env, get_logger, split_path
from swift.common.utils import get_logger, split_path
PROTOCOL_NAME = "Swift Token Authentication"
@ -213,9 +213,10 @@ class AuthProtocol(object):
identity_info = json.loads(data)
roles = []
role_refs = identity_info["access"]["user"]["roles"]
if role_refs is not None:
for role_ref in role_refs:
roles.append(role_ref["roleId"])
roles.append(role_ref["id"])
try:
tenant = identity_info['access']['token']['tenantId']