rcritten@redhat.com
8879ee173e
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
143 lines
4.7 KiB
Python
143 lines
4.7 KiB
Python
#! /usr/bin/python -E
|
|
# Authors: Rob Crittenden <rcritten@redhat.com>
|
|
#
|
|
# Copyright (C) 2007 Red Hat
|
|
# see file 'COPYING' for use and warranty information
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License as
|
|
# published by the Free Software Foundation; version 2 or later
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
#
|
|
|
|
#!/usr/bin/python
|
|
|
|
import sys
|
|
sys.path.append("/usr/share/ipa")
|
|
|
|
from ipaserver import funcs
|
|
import ipa.rpcclient as rpcclient
|
|
import user
|
|
import ipa
|
|
import config
|
|
|
|
def cidict_to_dict(cid):
|
|
"""Convert a cidict to a standard dict for sending across the wire"""
|
|
newdict = {}
|
|
kindex = cid.keys()
|
|
for dkey in kindex:
|
|
newdict[dkey] = cid[dkey]
|
|
return newdict
|
|
|
|
class IPAClient:
|
|
|
|
def __init__(self,local=None):
|
|
self.local = local
|
|
ipa.config.init_config()
|
|
if local:
|
|
self.transport = funcs.IPAServer()
|
|
# client needs to call set_principal(user@REALM)
|
|
else:
|
|
self.transport = rpcclient.RPCClient()
|
|
|
|
def set_principal(self,princ):
|
|
"""Set the name of the principal that will be used for
|
|
LDAP proxy authentication"""
|
|
if self.local:
|
|
self.transport.set_principal(princ)
|
|
|
|
def get_user_by_uid(self,uid,sattrs=None):
|
|
"""Get a specific user by uid. If sattrs is set then only those
|
|
attributes will be returned."""
|
|
result = self.transport.get_user_by_uid(uid,sattrs)
|
|
return user.User(result)
|
|
|
|
def get_user_by_dn(self,dn,sattrs=None):
|
|
"""Get a specific user by uid. If sattrs is set then only those
|
|
attributes will be returned."""
|
|
result = self.transport.get_user_by_dn(dn,sattrs)
|
|
return user.User(result)
|
|
|
|
def add_user(self,user,user_container=None):
|
|
"""Add a user. user is a ipa.user object"""
|
|
|
|
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']
|
|
|
|
del user_dict['dn']
|
|
|
|
# convert to a regular dict before sending
|
|
result = self.transport.add_user(user_dict, user_container)
|
|
return result
|
|
|
|
def get_all_users(self):
|
|
"""Get as a list of User objects all users in the directory"""
|
|
result = self.transport.get_all_users()
|
|
|
|
all_users = []
|
|
for (attrs) in result:
|
|
if attrs is not None:
|
|
all_users.append(user.User(attrs))
|
|
|
|
return all_users
|
|
|
|
def get_add_schema(self):
|
|
"""Prototype for the GUI. Specify in the directory fields to
|
|
be displayed and what data to get for new users."""
|
|
result = self.transport.get_add_schema()
|
|
return result
|
|
|
|
def find_users(self, criteria, sattrs=None, user_container=None):
|
|
"""Find users whose uid matches the criteria. Wildcards are
|
|
acceptable. Returns a list of User objects."""
|
|
result = self.transport.find_users(criteria, sattrs, user_container)
|
|
|
|
users = []
|
|
for (attrs) in result:
|
|
if attrs is not None:
|
|
users.append(user.User(attrs))
|
|
|
|
return users
|
|
|
|
def update_user(self,user):
|
|
"""Update a user entry."""
|
|
|
|
realm = config.config.get_realm()
|
|
|
|
result = self.transport.update_user(user.origDataDict(), user.toDict())
|
|
return result
|
|
|
|
def mark_user_deleted(self,uid):
|
|
"""Set a user as inactive by uid."""
|
|
|
|
realm = config.config.get_realm()
|
|
|
|
result = self.transport.mark_user_deleted(uid)
|
|
return result
|