From 05f6a22110f058c089e4e9cd6d538264f439f5d2 Mon Sep 17 00:00:00 2001 From: "rcritten@redhat.com" Date: Fri, 17 Aug 2007 10:03:33 -0400 Subject: Implement user inactivation Comment some functions Add attribute argument to get_user() --- ipa-python/rpcclient.py | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'ipa-python/rpcclient.py') diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py index abff0f8f..477b4e3c 100644 --- a/ipa-python/rpcclient.py +++ b/ipa-python/rpcclient.py @@ -39,9 +39,12 @@ class RPCClient: ipa.config.init_config() def server_url(self): + """Build the XML-RPC server URL from our configuration""" return "http://" + config.config.get_server() + "/ipa" def setup_server(self): + """Create our XML-RPC server connection using kerberos + authentication""" return xmlrpclib.ServerProxy(self.server_url(), KerbTransport()) def convert_entry(self,ent): @@ -63,11 +66,15 @@ class RPCClient: return user - def get_user(self,username): - """Get a specific user""" + def get_user(self,username,sattrs=None): + """Get a specific user. If sattrs is not None then only those + attributes will be returned. The result is a dict.""" server = self.setup_server() try: - result = server.get_user(username) + if sattrs is not None: + result = server.get_user(username,sattrs) + else: + result = server.get_user(username) except xmlrpclib.Fault, fault: raise xmlrpclib.Fault(fault.faultCode, fault.faultString) except socket.error, (value, msg): @@ -76,7 +83,9 @@ class RPCClient: return result def add_user(self,user): - """Add a new user""" + """Add a new user. Takes as input a dict where the key is the + attribute name and the value is either a string or in the case + of a multi-valued field a list of values""" server = self.setup_server() try: @@ -147,3 +156,16 @@ class RPCClient: raise xmlrpclib.Fault(value, msg) return result + + def mark_user_deleted(self,uid): + """Mark a user as deleted/inactive""" + server = self.setup_server() + + try: + result = server.mark_user_deleted(uid) + except xmlrpclib.Fault, fault: + raise xmlrpclib.Fault(fault.faultCode, fault.faultString) + except socket.error, (value, msg): + raise xmlrpclib.Fault(value, msg) + + return result -- cgit