openstack/keystone
Code Issues Proposed changes

Carrying over token expiry time when token chaining

Browse Source 
Fixes bug #998185

This commit causes the token expiry time to be maintained when
one token is being created from another

Change-Id: I7b61692a60d9227423b93c267864a5abe939ca33
This commit is contained in:
Derek Higgins 2012-06-05 09:33:53 +01:00
parent 17723a6b6d
commit 375838cfce
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keystone/service.py
View File

@ -351,7 +351,8 @@ class TokenController(wsgi.Application):
context, token_id, dict(id=token_id, context, token_id, dict(id=token_id,
user=user_ref, user=user_ref,
tenant=tenant_ref, tenant=tenant_ref,
metadata=metadata_ref)) metadata=metadata_ref,
expires=old_token_ref['expires']))
# TODO(termie): optimize this call at some point and put it into the # TODO(termie): optimize this call at some point and put it into the
# the return for metadata # the return for metadata

12
tests/test_keystoneclient.py
View File

@ -14,6 +14,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import time
import uuid import uuid
import nose.exc import nose.exc
@ -333,6 +334,17 @@ class KeystoneClientTests(object):
self.get_client, self.get_client,
self.user_foo) self.user_foo)
def test_token_expiry_maintained(self):
foo_client = self.get_client(self.user_foo)
orig_token = foo_client.service_catalog.catalog['token']
time.sleep(1.01)
reauthenticated_token = foo_client.tokens.authenticate(
token=foo_client.auth_token)
self.assertEquals(orig_token['expires'],
reauthenticated_token.expires)
def test_user_create_update_delete(self): def test_user_create_update_delete(self):
from keystoneclient import exceptions as client_exceptions from keystoneclient import exceptions as client_exceptions