openstack
/
keystone
Code Issues Proposed changes

Minor corrections to the middleware and wadl. 

Change-Id: I608a547dc16178c866a932d8ced449c64eb8c9db
This commit is contained in:
Yogeshwar Srikrishnan 2011-10-12 15:36:43 -05:00
parent 1bf12cc415
commit 4b07efe5a5
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/content/admin/identity-admin.wadl
View File

@ -305,10 +305,7 @@
</doc>
</param>
</request>
<response status="200 203">
<representation mediaType="application/xml" element="identity:access"/>
<representation mediaType="application/json"/>
</response>
<response status="200 203"/>
&commonFaults;
&getFaults;
</method>

2
keystone/content/service/identity.wadl
View File

@ -73,7 +73,7 @@
<!-- Version -->
<method name="GET" id="versionDetails">
<method name="GET" id="getVersionInfo">
<doc xml:lang="EN" title="Version Details">
<p xmlns="http://www.w3.org/1999/xhtml">
Returns detailed information about this specific version of the API.

7
keystone/middleware/auth_token.py
View File

@ -195,7 +195,8 @@ class AuthProtocol(object):
validate a user's token. Validate_token is a priviledged call so
it needs to be authenticated by a service that is calling it
"""
headers = {"Content-type": "application/json", "Accept": "text/json"}
headers = {"Content-type": "application/json",
"Accept": "application/json"}
params = {"passwordCredentials": {"username": username,
"password": password,
"tenantId": "1"}}
@ -238,7 +239,7 @@ class AuthProtocol(object):
# since this is a priviledged op,m we need to auth ourselves
# by using an admin token
headers = {"Content-type": "application/json",
"Accept": "text/json",
"Accept": "application/json",
"X-Auth-Token": self.admin_token}
##TODO(ziad):we need to figure out how to auth to keystone
#since validate_token is a priviledged call
@ -264,7 +265,7 @@ class AuthProtocol(object):
# Valid token. Get user data and put it in to the call
# so the downstream service can use it
headers = {"Content-type": "application/json",
"Accept": "text/json",
"Accept": "application/json",
"X-Auth-Token": self.admin_token}
##TODO(ziad):we need to figure out how to auth to keystone
#since validate_token is a priviledged call