diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-16 21:41:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-16 21:41:52 +0000 |
| commit | 803fe40af14c06a62f231965e744b0624a014537 (patch) | |
| tree | 04a26ed01f1ba8f3f2c03a7ebd135ca45d368ffd | |
| parent | a5575227bae3db1e8fcb1f7ff57efa0c006d6e53 (diff) | |
| parent | ac69b96a3377a4420a503569b38689a4ae923040 (diff) | |
| download | keystone-803fe40af14c06a62f231965e744b0624a014537.tar.gz | |
Merge "Add user domain info to federated fernet tokens" into stable/liberty
| -rw-r--r-- | keystone/tests/unit/token/test_fernet_provider.py | 2 | ||||
| -rw-r--r-- | keystone/token/providers/fernet/core.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/keystone/tests/unit/token/test_fernet_provider.py b/keystone/tests/unit/token/test_fernet_provider.py index c6692aa79..dfee34164 100644 --- a/keystone/tests/unit/token/test_fernet_provider.py +++ b/keystone/tests/unit/token/test_fernet_provider.py @@ -134,6 +134,8 @@ class TestValidate(unit.TestCase): exp_user_info = { 'id': user_ref['id'], 'name': user_ref['id'], + 'domain': {'id': CONF.federation.federated_domain_name, + 'name': CONF.federation.federated_domain_name, }, federation_constants.FEDERATION: { 'groups': [{'id': group_id} for group_id in group_ids], 'identity_provider': {'id': identity_provider, }, diff --git a/keystone/token/providers/fernet/core.py b/keystone/token/providers/fernet/core.py index 1bbacb03d..a71c375b2 100644 --- a/keystone/token/providers/fernet/core.py +++ b/keystone/token/providers/fernet/core.py @@ -167,7 +167,9 @@ class Provider(common.BaseProvider): 'user': { federation_constants.FEDERATION: federated_info, 'id': user_id, - 'name': user_id + 'name': user_id, + 'domain': {'id': CONF.federation.federated_domain_name, + 'name': CONF.federation.federated_domain_name, }, } } |