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
192 lines
6.5 KiB
Python
192 lines
6.5 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 xmlrpclib
|
|
import socket
|
|
import config
|
|
from krbtransport import KerbTransport
|
|
from kerberos import GSSError
|
|
import os
|
|
import base64
|
|
import user
|
|
import ipa
|
|
from ipa import ipaerror
|
|
|
|
# Some errors to catch
|
|
# http://cvs.fedora.redhat.com/viewcvs/ldapserver/ldap/servers/plugins/pam_passthru/README?root=dirsec&rev=1.6&view=auto
|
|
|
|
class RPCClient:
|
|
|
|
def __init__(self):
|
|
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):
|
|
# Convert into a dict. We need to handle multi-valued attributes as well
|
|
# so we'll convert those into lists.
|
|
user={}
|
|
for (k) in ent:
|
|
k = k.lower()
|
|
if user.get(k) is not None:
|
|
if isinstance(user[k],list):
|
|
user[k].append(ent[k].strip())
|
|
else:
|
|
first = user[k]
|
|
user[k] = ()
|
|
user[k].append(first)
|
|
user[k].append(ent[k].strip())
|
|
else:
|
|
user[k] = ent[k]
|
|
|
|
return user
|
|
|
|
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:
|
|
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):
|
|
raise xmlrpclib.Fault(value, msg)
|
|
|
|
return result
|
|
|
|
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, user_container)
|
|
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_add_schema(self):
|
|
"""Get the list of attributes we need to ask when adding a new
|
|
user.
|
|
"""
|
|
server = self.setup_server()
|
|
|
|
# FIXME: Hardcoded and designed for the TurboGears GUI. Do we want
|
|
# this for the CLI as well?
|
|
try:
|
|
result = server.get_add_schema()
|
|
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_all_users (self):
|
|
"""Return a list containing a User object for each existing user."""
|
|
|
|
server = self.setup_server()
|
|
try:
|
|
result = server.get_all_users()
|
|
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 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:
|
|
# 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):
|
|
raise xmlrpclib.Fault(value, msg)
|
|
|
|
return result
|
|
|
|
def update_user(self,olduser,newuser):
|
|
"""Update an existing user. olduser and newuser are dicts of attributes"""
|
|
server = self.setup_server()
|
|
|
|
try:
|
|
result = server.update_user(olduser, newuser)
|
|
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 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 ipaerror.gen_exception(fault.faultCode, fault.faultString)
|
|
except socket.error, (value, msg):
|
|
raise xmlrpclib.Fault(value, msg)
|
|
|
|
return result
|