Move add user logic to the server side

2 files changed, 29 insertions, 17 deletions

diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py
index d7450f5ca..dc8e1dc9b 100644
--- a/ipa-python/ipaclient.py
+++ b/ipa-python/ipaclient.py
@@ -71,25 +71,9 @@ class IPAClient:
 
         realm = config.config.get_realm()
 
-        # FIXME: This should be dynamic and can include just about anything
-        # Let us add in some missing attributes
-        if user.getValue('homedirectory') is None:
-                user.setValue('homedirectory', '/home/%s' % user.getValue('uid'))
-        if user.getValue('gecos') is None:
-                user.setValue('gecos', user.getValue('uid'))
-
-        # FIXME: This can be removed once the DS plugin is installed
-        user.setValue('uidnumber', '501')
-
-        # FIXME: What is the default group for users?
-        user.setValue('gidnumber', '501')
-        user.setValue('krbprincipalname', "%s@%s" % (user.getValue('uid'), realm))
-        user.setValue('cn', "%s %s" % (user.getValue('givenname'),
-                                       user.getValue('sn')))
         user_dict = user.toDict()
-        if user_dict.get('gn'):
-            del user_dict['gn']
 
+        # dn is set on the server-side
         del user_dict['dn']
 
         # convert to a regular dict before sending
diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py
index 0af0f5ef4..aa5633453 100644
--- a/ipa-server/xmlrpc-server/funcs.py
+++ b/ipa-server/xmlrpc-server/funcs.py
@@ -172,6 +172,34 @@ class IPAServer:
         dn="uid=%s,%s,%s" % (user['uid'], user_container,self.basedn)
         entry = ipaserver.ipaldap.Entry(dn)
 
+        # FIXME: This should be dynamic and can include just about anything
+
+        # Let us add in some missing attributes
+        if user.get('homedirectory') is None:
+                user['homedirectory'] = '/home/%s' % user.get('uid')
+        if not user.get('gecos') is None:
+                user['gecos'] = user['uid']
+
+        # FIXME: This can be removed once the DS plugin is installed
+        user['uidnumber'] = '501'
+
+        # FIXME: What is the default group for users?
+        user['gidnumber'] = '501'
+
+        realm = ipa.config.config.get_realm()
+        user['krbprincipalname'] = "%s@%s" % (user.get('uid'), realm)
+
+        # FIXME. This is a hack so we can request separate First and Last
+        # name in the GUI.
+        if user.get('cn') is None:
+            user['cn'] = "%s %s" % (user.get('givenname'),
+                                           user.get('sn'))
+
+        if user.get('gn'):
+            del user['gn']
+        if user.get('givenname'):
+            del user['givenname']
+
         # some required objectclasses
         entry.setValues('objectClass', 'top', 'posixAccount', 'shadowAccount', 'account', 'person', 'inetOrgPerson', 'organizationalPerson', 'krbPrincipalAux', 'krbTicketPolicyAux')