diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-19 08:34:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-19 08:34:45 +0000 |
| commit | 31a0818c1a425e9135f230b537707b2193714fad (patch) | |
| tree | 29667a55e258cd0c453fbf9dbc8b0ef65205f73d | |
| parent | c1e96d42d3446614c2475b5716a075eac67ea73f (diff) | |
| parent | c4e48ef3a149df81aa563d894cc6eb78f536edb8 (diff) | |
| download | keystone-31a0818c1a425e9135f230b537707b2193714fad.tar.gz | |
Merge "Mapped Groups don't exist breaks WebSSO" into stable/queens
| -rw-r--r-- | keystone/federation/utils.py | 4 | ||||
| -rw-r--r-- | keystone/tests/unit/test_v3_federation.py | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/keystone/federation/utils.py b/keystone/federation/utils.py index 1eeecf39c..449abbf12 100644 --- a/keystone/federation/utils.py +++ b/keystone/federation/utils.py @@ -409,8 +409,8 @@ def transform_to_group_ids(group_names, mapping_id, group['name'], resolve_domain(group['domain'])) yield group_dict['id'] except exception.GroupNotFound: - raise exception.MappedGroupNotFound(group_id=group['name'], - mapping_id=mapping_id) + LOG.debug('Group %s has no entry in the backend', + group['name']) def get_assertion_params_from_env(request): diff --git a/keystone/tests/unit/test_v3_federation.py b/keystone/tests/unit/test_v3_federation.py index 41a2a8e56..be2fc92ec 100644 --- a/keystone/tests/unit/test_v3_federation.py +++ b/keystone/tests/unit/test_v3_federation.py @@ -1924,9 +1924,8 @@ class FederatedTokenTests(test_v3.RestfulTestCase, FederatedSetupMixin): self.assertEqual(ref_groups, token_groups) def test_issue_unscoped_tokens_nonexisting_group(self): - self.assertRaises(exception.MappedGroupNotFound, - self._issue_unscoped_token, - assertion='ANOTHER_TESTER_ASSERTION') + r = self._issue_unscoped_token(assertion='ANOTHER_TESTER_ASSERTION') + self.assertIsNotNone(r.headers.get('X-Subject-Token')) def test_issue_unscoped_token_with_remote_no_attribute(self): r = self._issue_unscoped_token(idp=self.IDP_WITH_REMOTE, @@ -2474,6 +2473,10 @@ class FederatedTokenTests(test_v3.RestfulTestCase, FederatedSetupMixin): ] } PROVIDERS.federation_api.update_mapping(self.mapping['id'], rules) + r = self._issue_unscoped_token(assertion='UNMATCHED_GROUP_ASSERTION') + assigned_group_ids = r.json['token']['user']['OS-FEDERATION']['groups'] + self.assertEqual(1, len(assigned_group_ids)) + self.assertEqual(group['id'], assigned_group_ids[0]['id']) def test_empty_blacklist_passess_all_values(self): """Test a mapping with empty blacklist specified. |