diff options
author | rcritten@redhat.com <rcritten@redhat.com> | 2007-08-23 09:44:00 -0400 |
---|---|---|
committer | rcritten@redhat.com <rcritten@redhat.com> | 2007-08-23 09:44:00 -0400 |
commit | 8879ee173ec6814da701464c562471a3c8c5d846 (patch) | |
tree | cb19a6a5ed58e588313b140330f5b2022b153b18 /ipa-python/rpcclient.py | |
parent | 23508d33b5d9de287411aeead9b3937cc8661093 (diff) | |
download | freeipa-8879ee173ec6814da701464c562471a3c8c5d846.tar.gz freeipa-8879ee173ec6814da701464c562471a3c8c5d846.tar.xz freeipa-8879ee173ec6814da701464c562471a3c8c5d846.zip |
Handle optional arguments by using the value __NONE__ over XML-RPC.
rpcclient.py must call XML-RPC functions with all arguments.
Removed encode_args and decode_args. They were the source of most of the
argument pain. Now opts is alwyas appended to the end of the arguments
so MUST be the last argument in any server-side function (can be None)
Allow the User object to handle unicode data
Small fixes to command-line tools to be friendlier
Broke out get_user() into get_user_by_dn() and get_user_by_uid()
Need to request more than just 'nsAccountLock' attribute when trying to
see if a user is already marked deleted. If it is blank the record
coming back is empty. Add 'uid' to the list to guarantee something coming
back (dn is handled specially)
Added user_container attribute to get_user_* and add_user so the caller
can specify where in the tree the user will be searched for/added.
Added global default value for user_container
Diffstat (limited to 'ipa-python/rpcclient.py')
-rw-r--r-- | ipa-python/rpcclient.py | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py index d5a2d4262..cd94eb99c 100644 --- a/ipa-python/rpcclient.py +++ b/ipa-python/rpcclient.py @@ -67,15 +67,29 @@ class RPCClient: return user - def get_user(self,username,sattrs=None): + def get_user_by_uid(self,uid,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() + if sattrs is None: + sattrs = "__NONE__" try: - if sattrs is not None: - result = server.get_user(username,sattrs) - else: - result = server.get_user(username) + result = server.get_user_by_uid(uid, sattrs) + except xmlrpclib.Fault, fault: + raise ipaerror.gen_exception(fault.faultCode, fault.faultString) + except socket.error, (value, msg): + raise xmlrpclib.Fault(value, msg) + + return result + + def get_user_by_dn(self,dn,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() + if sattrs is None: + sattrs = "__NONE__" + try: + result = server.get_user_by_dn(dn, sattrs) except xmlrpclib.Fault, fault: raise ipaerror.gen_exception(fault.faultCode, fault.faultString) except socket.error, (value, msg): @@ -83,14 +97,17 @@ class RPCClient: return result - def add_user(self,user): + def add_user(self,user,user_container=None): """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() + + if user_container is None: + user_container = "__NONE__" try: - result = server.add_user(user) + result = server.add_user(user, user_container) except xmlrpclib.Fault, fault: raise ipaerror.gen_exception(fault.faultCode, fault.faultString) except socket.error, (value, msg): @@ -128,16 +145,18 @@ class RPCClient: return result - def find_users (self, criteria, sattrs=None): + def find_users (self, criteria, sattrs=None, user_container=None): """Return a list containing a User object for each user that matches the criteria.""" server = self.setup_server() try: - if sattrs is not None: - result = server.find_users(criteria, sattrs) - else: - result = server.find_users(criteria) + # None values are not allowed in XML-RPC + if sattrs is None: + sattrs = "__NONE__" + if user_container is None: + user_container = "__NONE__" + result = server.find_users(criteria, sattrs, user_container) except xmlrpclib.Fault, fault: raise ipaerror.gen_exception(fault.faultCode, fault.faultString) except socket.error, (value, msg): |