get_radius_profile_by_uid add_radius_profile update_radius_profile delete_radius_profile find_radius_profiles Rewrite command line arg handling, now support pair entry, interactive mode with auto completion, reading pairs from a file, better handling of mandatory values, better help, long arg names now match attribute name in pairs Establish mappings for all attributes and names used in clients and profiles Add notion of containers to radius clients and profiles in LDAP Move common code, variables, constants, and strings into the files radius_client.py, radius_util.py, ipautil.py to eliminate redundant elements which could get out of sync if modified and to provide access to other code which might benefit from using these items in the future. Add utility functions: format_list() parse_key_value_pairs() Add utility class: AttributeValueCompleter Unify attribute usage in radius ldap schema
181 lines
6.5 KiB
Python
181 lines
6.5 KiB
Python
#! /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
|
|
import os
|
|
from optparse import OptionParser
|
|
import copy
|
|
|
|
from ipa.radius_client import *
|
|
import ipa.ipaclient as ipaclient
|
|
import ipa.ipautil as ipautil
|
|
import ipa.config
|
|
import ipa.ipaerror
|
|
import ipa.radius_util as radius_util
|
|
|
|
import xmlrpclib
|
|
import kerberos
|
|
import ldap
|
|
|
|
#------------------------------------------------------------------------------
|
|
|
|
attrs = radius_util.client_name_to_ldap_attr.keys()
|
|
mandatory_attrs = ['Client-IP-Address', 'Secret']
|
|
|
|
#------------------------------------------------------------------------------
|
|
|
|
def help_option_callback(option, opt_str, value, parser, *args, **kwargs):
|
|
parser.print_help()
|
|
print
|
|
print "Valid interative attributes are:"
|
|
print ipautil.format_list(attrs, quote='"')
|
|
print
|
|
print "Required attributes are:"
|
|
print ipautil.format_list(mandatory_attrs, quote='"')
|
|
sys.exit(0)
|
|
|
|
def main():
|
|
pairs = {}
|
|
|
|
opt_parser = OptionParser(add_help_option=False)
|
|
|
|
opt_parser.add_option("-a", "--Client-IP-Address", dest="ip_addr",
|
|
help="RADIUS client ip address")
|
|
opt_parser.add_option("-s", "--Secret", dest="secret",
|
|
help="RADIUS client ip address")
|
|
opt_parser.add_option("-n", "--Name", dest="name",
|
|
help="RADIUS client name")
|
|
opt_parser.add_option("-t", "--NAS-Type", dest="nastype",
|
|
help="RADIUS client NAS Type")
|
|
opt_parser.add_option("-d", "--Description", dest="desc",
|
|
help="description of the RADIUS client")
|
|
|
|
opt_parser.add_option("-h", "--help", action="callback", callback=help_option_callback,
|
|
help="detailed help information")
|
|
opt_parser.add_option("-i", "--interactive", dest="interactive", action='store_true', default=False,
|
|
help="interactive mode, prompts with auto-completion")
|
|
opt_parser.add_option("-p", "--pair", dest="pairs", action='append',
|
|
help="specify one or more attribute=value pair(s), value may be optionally quoted, pairs are delimited by whitespace")
|
|
opt_parser.add_option("-f", "--file", dest="pair_file",
|
|
help="attribute=value pair(s) are read from file, value may be optionally quoted, pairs are delimited by whitespace. Reads from stdin if file is -")
|
|
opt_parser.add_option("-v", "--verbose", dest="verbose", action='store_true',
|
|
help="print information")
|
|
|
|
#opt_parser.set_usage("Usage: %s [options] %s" % (os.path.basename(sys.argv[0]), ' '.join(mandatory_attrs)))
|
|
|
|
args = ipa.config.init_config(sys.argv)
|
|
options, args = opt_parser.parse_args(args)
|
|
|
|
# Get pairs from a file or stdin
|
|
if options.pair_file:
|
|
try:
|
|
av = radius_util.read_pairs_file(options.pair_file)
|
|
pairs.update(av)
|
|
except Exception, e:
|
|
print "ERROR, could not read pairs (%s)" % (e)
|
|
|
|
# Get pairs specified on the command line as a named argument
|
|
if options.ip_addr: pairs['Client-IP-Address'] = options.ip_addr
|
|
if options.secret: pairs['Secret'] = options.secret
|
|
if options.name: pairs['Name'] = options.name
|
|
if options.nastype: pairs['NAS-Type'] = options.nastype
|
|
if options.desc: pairs['Description'] = options.desc
|
|
|
|
# Get pairs specified on the command line as a pair argument
|
|
if options.pairs:
|
|
for p in options.pairs:
|
|
av = ipautil.parse_key_value_pairs(p)
|
|
pairs.update(av)
|
|
|
|
# Get pairs interactively
|
|
if options.interactive:
|
|
# Remove any mandatory attriubtes which have been previously specified
|
|
interactive_mandatory_attrs = copy.copy(mandatory_attrs)
|
|
for attr in pairs.keys():
|
|
try:
|
|
interactive_mandatory_attrs.remove(attr)
|
|
except ValueError:
|
|
pass
|
|
c = ipautil.AttributeValueCompleter(attrs, pairs)
|
|
c.open()
|
|
av = c.get_pairs("Enter: ", interactive_mandatory_attrs, validate)
|
|
pairs.update(av)
|
|
c.close()
|
|
|
|
# Data collection done, assure mandatory data has been specified
|
|
valid = True
|
|
for attr in mandatory_attrs:
|
|
if not pairs.has_key(attr):
|
|
valid = False
|
|
print "ERROR, %s is mandatory, but has not been specified" % (attr)
|
|
if not valid:
|
|
return 1
|
|
|
|
# Make sure each attribute is a member of the set of valid attributes
|
|
valid = True
|
|
for attr,value in pairs.items():
|
|
if attr not in attrs:
|
|
valid = False
|
|
print "ERROR, %s is not a valid attribute" % (attr)
|
|
if not valid:
|
|
print "Valid attributes are:"
|
|
print ipautil.format_list(attrs, quote='"')
|
|
return 1
|
|
|
|
# Makse sure each value is valid
|
|
valid = True
|
|
for attr,value in pairs.items():
|
|
if not validate(attr, value):
|
|
valid = False
|
|
if not valid:
|
|
return 1
|
|
|
|
# Dump what we've got so far
|
|
if options.verbose:
|
|
print "Pairs:"
|
|
for attr,value in pairs.items():
|
|
print "\t%s = %s" % (attr, value)
|
|
|
|
radius_client = ipa.radius_client.RadiusClient()
|
|
for attr,value in pairs.items():
|
|
radius_client.setValue(radius_util.client_name_to_ldap_attr[attr], value)
|
|
|
|
try:
|
|
ipa_client = ipaclient.IPAClient()
|
|
ipa_client.add_radius_client(radius_client)
|
|
print "successfully added"
|
|
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())
|