diff options
| -rw-r--r-- | ipa-admintools/Makefile | 1 | ||||
| -rw-r--r-- | ipa-admintools/ipa-findradiusclient | 99 | ||||
| -rw-r--r-- | ipa-python/ipaclient.py | 11 | ||||
| -rw-r--r-- | ipa-python/rpcclient.py | 14 | ||||
| -rw-r--r-- | ipa-server/xmlrpc-server/funcs.py | 31 | ||||
| -rw-r--r-- | ipa-server/xmlrpc-server/ipaxmlrpc.py | 1 |
6 files changed, 157 insertions, 0 deletions
diff --git a/ipa-admintools/Makefile b/ipa-admintools/Makefile index 15c330da..2db506f9 100644 --- a/ipa-admintools/Makefile +++ b/ipa-admintools/Makefile @@ -24,6 +24,7 @@ install: install -m 755 ipa-addradiusclient $(SBINDIR) install -m 755 ipa-radiusclientmod $(SBINDIR) install -m 755 ipa-delradiusclient $(SBINDIR) + install -m 755 ipa-findradiusclient $(SBINDIR) @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ diff --git a/ipa-admintools/ipa-findradiusclient b/ipa-admintools/ipa-findradiusclient new file mode 100644 index 00000000..0cc5826a --- /dev/null +++ b/ipa-admintools/ipa-findradiusclient @@ -0,0 +1,99 @@ +#! /usr/bin/python -E +# Authors: John Dennis <jdennis@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 only +# +# 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 +# + +import sys +from optparse import OptionParser +import ipa +from ipa.radius_client import * +import ipa.ipaclient as ipaclient +import ipa.ipavalidate as ipavalidate +import ipa.config +import ipa.ipaerror + +import xmlrpclib +import kerberos +import ldap + +#------------------------------------------------------------------------------ + +def parse_options(): + parser = OptionParser() + parser.add_option("--usage", action="store_true", + help="Program usage") + args = ipa.config.init_config(sys.argv) + options, args = parser.parse_args(args) + + return options, args + +#------------------------------------------------------------------------------ + +# FIXME +def usage(): + print "ipa-findradiusclients ip_addr [ip_addr ...]" + sys.exit(1) + +def main(): + attrs=['radiusClientNASIpAddress', 'radiusClientSecret', 'radiusClientNASType', 'radiusClientShortName', 'description'] + + options, args = parse_options() + + if len(args) < 2: + usage() + + ip_addrs = args[1:] + + try: + ipa_client = ipaclient.IPAClient() + radius_clients = ipa_client.find_radius_clients(ip_addrs, sattrs=attrs) + counter = radius_clients[0] + radius_clients = radius_clients[1:] + + if counter == 0: + print "No entries found for", ip_addrs + return 2 + + print "successfully found" + + for radius_client in radius_clients: + attrs = radius_client.attrList() + attrs.sort() + + print "%s:" % radius_client.getValues('radiusClientNASIpAddress') + for attr in attrs: + value = radius_client.getValues(attr) + print "\t%s=%s" % (attr, value) + + except xmlrpclib.Fault, f: + print f.faultString + return 1 + except kerberos.GSSError, e: + print "Could not initialize GSSAPI: %s/%s" % (e[0][0][0], e[0][1][0]) + return 1 + except xmlrpclib.ProtocolError, e: + print "Unable to connect to IPA server: %s" % (e.errmsg) + return 1 + except ipa.ipaerror.IPAError, e: + print "%s" % (e.message) + return 1 + + return 0 + +if __name__ == "__main__": + sys.exit(main()) diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py index 2d9b7a46..f487bec2 100644 --- a/ipa-python/ipaclient.py +++ b/ipa-python/ipaclient.py @@ -355,3 +355,14 @@ class IPAClient: def delete_radius_client(self,ip_addr): return self.transport.delete_radius_client(ip_addr) + def find_radius_clients(self, criteria, sattrs=None, searchlimit=0, timelimit=-1): + result = self.transport.find_radius_clients(criteria, sattrs, searchlimit, timelimit) + counter = result[0] + + users = [counter] + for attrs in result[1:]: + if attrs is not None: + users.append(user.User(attrs)) + + return users + diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py index bf3f1bd9..e756058a 100644 --- a/ipa-python/rpcclient.py +++ b/ipa-python/rpcclient.py @@ -645,3 +645,17 @@ class RPCClient: return ipautil.unwrap_binary_data(result) + def find_radius_clients(self, criteria, sattrs=None, searchlimit=0, timelimit=-1): + server = self.setup_server() + try: + # None values are not allowed in XML-RPC + if sattrs is None: + sattrs = "__NONE__" + result = server.find_radius_clients(criteria, sattrs, searchlimit, timelimit) + except xmlrpclib.Fault, fault: + raise ipaerror.gen_exception(fault.faultCode, fault.faultString) + except socket.error, (value, msg): + raise xmlrpclib.Fault(value, msg) + + return ipautil.unwrap_binary_data(result) + diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py index 38ba8c2b..26fdba48 100644 --- a/ipa-server/xmlrpc-server/funcs.py +++ b/ipa-server/xmlrpc-server/funcs.py @@ -516,6 +516,36 @@ class IPAServer: self.releaseConnection(conn) return res + def find_radius_clients(self, ip_attrs, sattrs=None, searchlimit=0, timelimit=-1, opts=None): + def gen_filter(objectclass, attr, values): + '''Given ('myclass', 'myattr', [v1, v2]) returns + (&(objectclass=myclass)(|(myattr=v1)(myattr=v2))) + ''' + # Don't use __safe_filter, prevents wildcarding + #attrs = ''.join(['(%s=%s)' % (attr, self.__safe_filter(val)) for val in values]) + attrs = ''.join(['(%s=%s)' % (attr, val) for val in values]) + filter = "(&(objectclass=%s)(|%s))" % (objectclass, attrs) + return filter + + basedn = 'cn=clients,cn=radius,cn=services,cn=etc,%s' % self.basedn # FIXME, should not be hardcoded + filter = gen_filter('radiusClientProfile', 'radiusClientNASIpAddress', ip_attrs) + conn = self.getConnection(opts) + try: + try: + results = conn.getListAsync(basedn, self.scope, filter, sattrs, 0, None, None, timelimit, searchlimit) + except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND): + results = [0] + finally: + self.releaseConnection(conn) + + counter = results[0] + results = results[1:] + radius_clients = [counter] + for radius_client in results: + radius_clients.append(self.convert_entry(radius_client)) + + return radius_clients + def get_add_schema (self): """Get the list of fields to be used when adding users in the GUI.""" @@ -1152,6 +1182,7 @@ class IPAServer: return entries + def ldap_search_escape(match): """Escapes out nasty characters from the ldap search. See RFC 2254.""" diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py index f958414a..d5bdb6b2 100644 --- a/ipa-server/xmlrpc-server/ipaxmlrpc.py +++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py @@ -355,6 +355,7 @@ def handler(req, profiling=False): h.register_function(f.add_radius_client) h.register_function(f.update_radius_client) h.register_function(f.delete_radius_client) + h.register_function(f.find_radius_clients) h.handle_request(req) finally: pass |