Ensure that the Apache server is in forked mode

Add ability to update existing users
Try to prevent fetching and setting empty strings

2 files changed, 53 insertions, 0 deletions

diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py
index a17fe2f46..358f04f2a 100644
--- a/ipa-server/xmlrpc-server/funcs.py
+++ b/ipa-server/xmlrpc-server/funcs.py
@@ -325,3 +325,50 @@ class IPAServer:
             users.append(self.convert_entry(u))
     
         return users
+
+    def update_user (self, args, newuser=None, opts=None):
+        """Update a user in LDAP"""
+        global _LDAPPool
+
+        # The XML-RPC server marshals the arguments into one variable
+        # while the direct caller has them separate. So do a little
+        # bit of gymnastics to figure things out. There has to be a
+        # better way, so FIXME
+        if isinstance(args,tuple):
+            opts = newuser
+            if len(args) == 2:
+                olduser = args[0]
+                newuser = args[1]
+        else:
+            olduser = args
+
+        if (isinstance(olduser, tuple)):
+            olduser = olduser[0]
+        if (isinstance(newuser, tuple)):
+            newuser = newuser[0]
+
+        # Should be able to get this from either the old or new user
+        # but just in case someone has decided to try changing it, use the
+        # original
+        try:
+            moddn = olduser['dn']
+        except KeyError, e:
+            raise xmlrpclib.Fault(4, "Old user has no dn")
+
+        if opts:
+            self.set_principal(opts['remoteuser'])
+    
+        try:
+            proxydn = self.get_dn_from_principal(self.princ)
+        except ldap.LDAPError, e:
+            raise xmlrpclib.Fault(1, e)
+        except ipaserver.ipaldap.NoSuchEntryError:
+            raise xmlrpclib.Fault(2, "No such user")
+
+        try:
+            m1 = _LDAPPool.getConn(self.host,self.port,self.bindca,self.bindcert,self.bindkey,proxydn)
+            res = m1.updateEntry(moddn, olduser, newuser)
+            _LDAPPool.releaseConn(m1)
+            return res
+        except ldap.LDAPError, e:
+            raise xmlrpclib.Fault(1, str(e))
diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py
index 963117f0e..7d8529d28 100644
--- a/ipa-server/xmlrpc-server/ipaxmlrpc.py
+++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py
@@ -239,6 +239,11 @@ class ModXMLRPCRequestHandler(object):
     def handle_request(self,req):
         """Handle a single XML-RPC request"""
 
+        # The LDAP connection pool is not thread-safe. Avoid problems and
+        # force the forked model for now.
+        if not apache.mpm_query(apache.AP_MPMQ_IS_FORKED):
+            raise Fault(3, "Apache must use the forked model")
+
         # XMLRPC uses POST only. Reject anything else
         if req.method != 'POST':
             req.allow_methods(['POST'],1)
@@ -279,6 +284,7 @@ def handler(req, profiling=False):
             h.register_function(f.get_add_schema)
             h.register_function(f.get_all_users)
             h.register_function(f.find_users)
+            h.register_function(f.update_user)
             h.handle_request(req)
         finally:
              pass