Merge "Catch potential SyntaxError in federation mapping"11.0.0.0b3

3 files changed, 57 insertions, 1 deletions

diff --git a/keystone/federation/utils.py b/keystone/federation/utils.py
index 94f66c80c..8af161e05 100644
--- a/keystone/federation/utils.py
+++ b/keystone/federation/utils.py
@@ -641,7 +641,7 @@ class RuleProcessor(object):
                 try:
                     group_names_list = ast.literal_eval(
                         identity_value['groups'])
-                except ValueError:
+                except (ValueError, SyntaxError):
                     group_names_list = [identity_value['groups']]
                 domain = identity_value['domain']
                 group_dicts = [{'name': name, 'domain': domain} for name in
diff --git a/keystone/tests/unit/contrib/federation/test_utils.py b/keystone/tests/unit/contrib/federation/test_utils.py
index ad98ccae9..416cca43d 100644
--- a/keystone/tests/unit/contrib/federation/test_utils.py
+++ b/keystone/tests/unit/contrib/federation/test_utils.py
@@ -682,6 +682,24 @@ class MappingRuleEngineTests(unit.BaseTestCase):
                           rp.process,
                           assertion)
 
+    def test_rule_engine_groups_mapping_only_one_group(self):
+        """Test mapping engine when groups is explicitly set.
+
+        If the groups list has only one group,
+        test if the transformation is done correctly
+
+        """
+        mapping = mapping_fixtures.MAPPING_GROUPS_WITH_EMAIL
+        assertion = mapping_fixtures.GROUPS_ASSERTION_ONLY_ONE_GROUP
+        rp = mapping_utils.RuleProcessor(FAKE_MAPPING_ID, mapping['rules'])
+        mapped_properties = rp.process(assertion)
+        self.assertIsNotNone(mapped_properties)
+        self.assertEqual('jsmith', mapped_properties['user']['name'])
+        self.assertEqual('jill@example.com',
+                         mapped_properties['user']['email'])
+        self.assertEqual('ALL USERS',
+                         mapped_properties['group_names'][0]['name'])
+
     def test_rule_engine_group_ids_mapping_whitelist(self):
         """Test mapping engine when group_ids is explicitly set.
 
diff --git a/keystone/tests/unit/mapping_fixtures.py b/keystone/tests/unit/mapping_fixtures.py
index 7544411ce..f2ab7709e 100644
--- a/keystone/tests/unit/mapping_fixtures.py
+++ b/keystone/tests/unit/mapping_fixtures.py
@@ -1401,6 +1401,38 @@ MAPPING_BAD_LOCAL_SETUP = {
     ]
 }
 
+MAPPING_GROUPS_WITH_EMAIL = {
+    "rules": [
+        {
+            "remote": [
+                {
+                    "type": "groups",
+                },
+                {
+                    "type": "userEmail",
+                },
+                {
+                    "type": "UserName"
+                }
+            ],
+            "local": [
+                {
+                    "groups": "{0}",
+                    "domain": {
+                        "id": DEVELOPER_GROUP_DOMAIN_ID
+                    }
+                },
+                {
+                    "user": {
+                        "name": "{2}",
+                        "email": "{1}"
+                    }
+                }
+            ]
+        }
+    ]
+}
+
 EMPLOYEE_ASSERTION = {
     'Email': 'tim@example.com',
     'UserName': 'tbo',
@@ -1553,6 +1585,12 @@ UNICODE_NAME_ASSERTION = {
     'PFX_orgPersonType': 'Admin;Chief'
 }
 
+GROUPS_ASSERTION_ONLY_ONE_GROUP = {
+    'userEmail': 'jill@example.com',
+    'UserName': 'jsmith',
+    'groups': 'ALL USERS'
+}
+
 MAPPING_UNICODE = {
     "rules": [
         {