check for domain existence before doing any ID work

Bug 1223036 Change-Id: Ie263160b2c75732b13fdbf440b4f2f31ea70d245
openstack · Sep 19, 2013 · e692eea · e692eea
1 parent fb6b5eb
commit e692eea
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
@@ -237,6 +237,7 @@ def _select_identity_driver(self, domain_id):
         if driver:
             return driver
         else:
+            self.get_domain(domain_id)
             return self.driver
 
     def _get_domain_conf(self, domain_id):

diff --git a/keystone/tests/test_auth.py b/keystone/tests/test_auth.py
@@ -256,7 +256,9 @@ def test_auth_token_project_group_role(self):
             self.tenant_bar['id'],
             self.role_member['id'])
         # Now create a group role for this user as well
-        new_group = {'id': uuid.uuid4().hex, 'domain_id': uuid.uuid4().hex,
+        domain1 = {'id': uuid.uuid4().hex, 'name': uuid.uuid4().hex}
+        self.identity_api.create_domain(domain1['id'], domain1)
+        new_group = {'id': uuid.uuid4().hex, 'domain_id': domain1['id'],
                      'name': uuid.uuid4().hex}
         self.identity_api.create_group(new_group['id'], new_group)
         self.identity_api.add_user_to_group(self.user_foo['id'],

diff --git a/keystone/tests/test_backend.py b/keystone/tests/test_backend.py
@@ -1993,6 +1993,20 @@ def test_check_user_in_group(self):
                                             new_group['id'])
         self.identity_api.check_user_in_group(new_user['id'], new_group['id'])
 
+    def test_create_invalid_domain_fails(self):
+        new_group = {'id': uuid.uuid4().hex, 'domain_id': "doesnotexist",
+                     'name': uuid.uuid4().hex}
+        self.assertRaises(exception.DomainNotFound,
+                          self.identity_api.create_group,
+                          new_group['id'],
+                          new_group)
+        new_user = {'id': uuid.uuid4().hex, 'name': 'new_user',
+                    'password': uuid.uuid4().hex, 'enabled': True,
+                    'domain_id': "doesnotexist"}
+        self.assertRaises(exception.DomainNotFound,
+                          self.identity_api.create_user,
+                          new_user['id'], new_user)
+
     def test_check_user_not_in_group(self):
         new_group = {
             'id': uuid.uuid4().hex,