Merge "Move user fileds type check to identity.Manager"

4 files changed, 11 insertions, 21 deletions

diff --git a/keystone/identity/backends/kvs.py b/keystone/identity/backends/kvs.py
index 339d2e75..2eea08cf 100644
--- a/keystone/identity/backends/kvs.py
+++ b/keystone/identity/backends/kvs.py
@@ -182,8 +182,6 @@ class Identity(kvs.Base, identity.Driver):
 
     # CRUD
     def create_user(self, user_id, user):
-        user['name'] = clean.user_name(user['name'])
-        user['enabled'] = clean.user_enabled(user.get('enabled', True))
         try:
             self.get_user(user_id)
         except exception.UserNotFound:
@@ -214,13 +212,10 @@ class Identity(kvs.Base, identity.Driver):
 
     def update_user(self, user_id, user):
         if 'name' in user:
-            user['name'] = clean.user_name(user['name'])
             existing = self.db.get('user_name-%s' % user['name'])
             if existing and user_id != existing['id']:
                 msg = 'Duplicate name, %s.' % user['name']
                 raise exception.Conflict(type='user', details=msg)
-        if 'enabled' in user:
-            user['enabled'] = clean.user_enabled(user['enabled'])
         # get the old name and delete it too
         try:
             old_user = self.db.get('user-%s' % user_id)
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py
index 07cd83b6..3bc9a9c0 100644
--- a/keystone/identity/backends/ldap/core.py
+++ b/keystone/identity/backends/ldap/core.py
@@ -192,17 +192,11 @@ class Identity(identity.Driver):
     # CRUD
     def create_user(self, user_id, user):
         user = self._validate_domain(user)
-        user['name'] = clean.user_name(user['name'])
-        user['enabled'] = clean.user_enabled(user.get('enabled', True))
         user_ref = self.user.create(user)
         return self._set_default_domain(identity.filter_user(user_ref))
 
     def update_user(self, user_id, user):
         user = self._validate_domain(user)
-        if 'name' in user:
-            user['name'] = clean.user_name(user['name'])
-        if 'enabled' in user:
-            user['enabled'] = clean.user_enabled(user['enabled'])
         return self._set_default_domain(self.user.update(user_id, user))
 
     def create_project(self, tenant_id, tenant):
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index b2be8774..f81feb1d 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -626,8 +626,6 @@ class Identity(sql.Base, identity.Driver):
 
     @sql.handle_conflicts(type='user')
     def create_user(self, user_id, user):
-        user['name'] = clean.user_name(user['name'])
-        user['enabled'] = clean.user_enabled(user.get('enabled', True))
         user = utils.hash_user_password(user)
         session = self.get_session()
         with session.begin():
@@ -664,10 +662,6 @@ class Identity(sql.Base, identity.Driver):
 
     @sql.handle_conflicts(type='user')
     def update_user(self, user_id, user):
-        if 'name' in user:
-            user['name'] = clean.user_name(user['name'])
-        if 'enabled' in user:
-            user['enabled'] = clean.user_enabled(user['enabled'])
         session = self.get_session()
         if 'id' in user and user_id != user['id']:
             raise exception.ValidationError('Cannot change user ID')
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index 1c2a5508..c6cc0008 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -75,22 +75,29 @@ class Manager(manager.Manager):
 
     def create_user(self, context, user_id, user_ref):
         user = user_ref.copy()
+        user['name'] = clean.user_name(user['name'])
         user.setdefault('enabled', True)
         user['enabled'] = clean.user_enabled(user['enabled'])
         return self.driver.create_user(user_id, user)
 
+    def update_user(self, context, user_id, user_ref):
+        user = user_ref.copy()
+        if 'name' in user:
+            user['name'] = clean.user_name(user['name'])
+        if 'enabled' in user:
+            user['enabled'] = clean.user_enabled(user['enabled'])
+        return self.driver.update_user(user_id, user)
+
     def create_group(self, context, group_id, group_ref):
         group = group_ref.copy()
-        if 'description' not in group:
-            group['description'] = ''
+        group.setdefault('description', '')
         return self.driver.create_group(group_id, group)
 
     def create_project(self, context, tenant_id, tenant_ref):
         tenant = tenant_ref.copy()
         tenant.setdefault('enabled', True)
         tenant['enabled'] = clean.project_enabled(tenant['enabled'])
-        if 'description' not in tenant:
-            tenant['description'] = ''
+        tenant.setdefault('description', '')
         return self.driver.create_project(tenant_id, tenant)
 
     def update_project(self, context, tenant_id, tenant_ref):