mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-24 16:10:02 -06:00
do a better job of handling attribute deletion
This commit is contained in:
John Dennis
parent
82654731ab
commit
5d1ca46ea7
@ -21,7 +21,6 @@
|
||||
import sys
|
||||
import os
|
||||
from optparse import OptionParser
|
||||
import copy
|
||||
|
||||
import ipa.ipaclient as ipaclient
|
||||
import ipa.ipautil as ipautil
|
||||
@ -36,7 +35,10 @@ import ldap
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
radius_attrs = radius_util.radius_client_attr_to_ldap_attr.keys()
|
||||
radius_attr_to_ldap_attr = radius_util.radius_client_attr_to_ldap_attr
|
||||
ldap_attr_to_radius_attr = radius_util.radius_client_ldap_attr_to_radius_attr
|
||||
mandatory_radius_attrs = ['Client-IP-Address', 'Secret']
|
||||
distinguished_attr = 'Client-IP-Address'
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -86,7 +88,7 @@ def main():
|
||||
opt_parser.error("missing Client-IP-Address")
|
||||
|
||||
ip_addr = args[1]
|
||||
pairs['Client-IP-Address'] = ip_addr
|
||||
pairs[distinguished_attr] = ip_addr
|
||||
|
||||
# Get pairs from a file or stdin
|
||||
if options.pair_file:
|
||||
@ -97,7 +99,7 @@ def main():
|
||||
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.ip_addr: pairs[distinguished_attr] = 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
|
||||
@ -111,16 +113,16 @@ def main():
|
||||
|
||||
# Get pairs interactively
|
||||
if options.interactive:
|
||||
# Remove any mandatory attriubtes which have been previously specified
|
||||
interactive_mandatory_attrs = copy.copy(mandatory_radius_attrs)
|
||||
for attr in pairs.keys():
|
||||
try:
|
||||
interactive_mandatory_attrs.remove(attr)
|
||||
except ValueError:
|
||||
pass
|
||||
# Prompt first for mandatory attributes which have not been previously specified
|
||||
prompted_mandatory_attrs = []
|
||||
existing_attrs = pairs.keys():
|
||||
for attr in mandatory_radius_attrs:
|
||||
if not attr in existing_attrs:
|
||||
prompted_mandatory_attrs.append(attr)
|
||||
|
||||
c = ipautil.AttributeValueCompleter(radius_attrs, pairs)
|
||||
c.open()
|
||||
av = c.get_pairs("Enter: ", interactive_mandatory_attrs, radius_util.validate)
|
||||
av = c.get_pairs("Enter: ", prompted_mandatory_attrs, radius_util.validate)
|
||||
pairs.update(av)
|
||||
c.close()
|
||||
|
||||
@ -128,9 +130,9 @@ def main():
|
||||
|
||||
# Data collection done, assure mandatory data has been specified
|
||||
|
||||
if pairs.has_key('Client-IP-Address') and pairs['Client-IP-Address'] != ip_addr:
|
||||
print "ERROR, Client-IP-Address specified on command line (%s) does not match value found in pairs (%s)" % \
|
||||
(ip_addr, pairs['Client-IP-Address'])
|
||||
if pairs.has_key(distinguished_attr) and pairs[distinguished_attr] != ip_addr:
|
||||
print "ERROR, %s specified on command line (%s) does not match value found in pairs (%s)" % \
|
||||
(distinguished_attr, ip_addr, pairs[distinguished_attr])
|
||||
return 1
|
||||
|
||||
valid = True
|
||||
@ -168,7 +170,7 @@ def main():
|
||||
|
||||
radius_client = radius_util.RadiusClient()
|
||||
for attr,value in pairs.items():
|
||||
radius_client.setValue(radius_util.radius_client_attr_to_ldap_attr[attr], value)
|
||||
radius_client.setValue(radius_attr_to_ldap_attr[attr], value)
|
||||
|
||||
try:
|
||||
ipa_client = ipaclient.IPAClient()
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
import sys
|
||||
import os
|
||||
from optparse import OptionParser
|
||||
import copy
|
||||
from sets import Set
|
||||
|
||||
import ipa.ipaclient as ipaclient
|
||||
@ -38,7 +37,9 @@ import ldap
|
||||
|
||||
radius_attrs = radius_util.radius_client_attr_to_ldap_attr.keys()
|
||||
radius_attr_to_ldap_attr = radius_util.radius_client_attr_to_ldap_attr
|
||||
mandatory_radius_attrs = ['Client-IP-Address']
|
||||
ldap_attr_to_radius_attr = radius_util.radius_client_ldap_attr_to_radius_attr
|
||||
mandatory_radius_attrs = ['Client-IP-Address', 'Secret']
|
||||
distinguished_attr = 'Client-IP-Address'
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -109,11 +110,6 @@ def main():
|
||||
# so handle the two cases independently.
|
||||
if options.delete_attrs:
|
||||
attrs = Set()
|
||||
# Populate the attr list with pre-existing values
|
||||
for ldap_attr in radius_client.attrList():
|
||||
radius_attr = radius_client.getValues(radius_attr_to_ldap_attr[ldap_attr])
|
||||
attrs.add(radius_attr)
|
||||
|
||||
# Get attrs from a file or stdin
|
||||
if options.data_file:
|
||||
try:
|
||||
@ -123,7 +119,6 @@ def main():
|
||||
print "ERROR, could not read attrs (%s)" % (e)
|
||||
|
||||
# Get attrs specified on the command line as a named argument
|
||||
if options.ip_addr is not None: attrs.add('Client-IP-Address')
|
||||
if options.secret is not None: attrs.add('Secret')
|
||||
if options.name is not None: attrs.add('Name')
|
||||
if options.nastype is not None: attrs.add('NAS-Type')
|
||||
@ -137,24 +132,23 @@ def main():
|
||||
|
||||
# Get attrs interactively
|
||||
if options.interactive:
|
||||
# Remove any mandatory attriubtes so we don't prompt to delete them
|
||||
interactive_delete_attrs = radius_client.attrList()
|
||||
for attr in interactive_delete_attrs:
|
||||
if attr in mandatory_radius_attrs:
|
||||
try:
|
||||
interactive_delete_attrs.remove(attr)
|
||||
except ValueError:
|
||||
pass
|
||||
c = ipautil.ItemCompleter(attrs)
|
||||
c.open()
|
||||
items = c.get_items("Enter: ")
|
||||
attrs.update(items)
|
||||
c.close()
|
||||
deletable_attrs = []
|
||||
for radius_attr in radius_attrs:
|
||||
if radius_attr in mandatory_radius_attrs: continue
|
||||
if radius_client.hasAttr(radius_attr_to_ldap_attr[radius_attr]):
|
||||
deletable_attrs.append(radius_attr)
|
||||
|
||||
if deletable_attrs:
|
||||
c = ipautil.ItemCompleter(deletable_attrs)
|
||||
c.open()
|
||||
items = c.get_items("Enter: ")
|
||||
attrs.update(items)
|
||||
c.close()
|
||||
|
||||
# Data collection done, assure no mandatory attrs are in the delete list
|
||||
valid = True
|
||||
for attr in mandatory_radius_attrs:
|
||||
if attr in attrs
|
||||
if attr in attrs:
|
||||
valid = False
|
||||
print "ERROR, %s is mandatory, but is set to be deleted" % (attr)
|
||||
if not valid:
|
||||
@ -182,7 +176,7 @@ def main():
|
||||
|
||||
else:
|
||||
pairs = {}
|
||||
pairs['Client-IP-Address'] = ip_addr
|
||||
pairs[distinguished_attr] = ip_addr
|
||||
|
||||
# Populate the pair list with pre-existing values
|
||||
for attr in radius_attrs:
|
||||
@ -197,7 +191,7 @@ def main():
|
||||
print "ERROR, could not read pairs (%s)" % (e)
|
||||
|
||||
# Get pairs specified on the command line as a named argument
|
||||
if options.ip_addr is not None: pairs['Client-IP-Address'] = options.ip_addr
|
||||
if options.ip_addr is not None: pairs[distinguished_attr] = options.ip_addr
|
||||
if options.secret is not None: pairs['Secret'] = options.secret
|
||||
if options.name is not None: pairs['Name'] = options.name
|
||||
if options.nastype is not None: pairs['NAS-Type'] = options.nastype
|
||||
@ -211,16 +205,11 @@ def main():
|
||||
|
||||
# Get pairs interactively
|
||||
if options.interactive:
|
||||
# Remove any mandatory attriubtes which have been previously specified
|
||||
interactive_mandatory_attrs = copy.copy(mandatory_radius_attrs)
|
||||
for attr in pairs.keys():
|
||||
try:
|
||||
interactive_mandatory_attrs.remove(attr)
|
||||
except ValueError:
|
||||
pass
|
||||
c = ipautil.AttributeValueCompleter(radius_attrs, pairs)
|
||||
prompted_attrs = radius_attrs[:]
|
||||
prompted_attrs.remove(distinguished_attr)
|
||||
c = ipautil.AttributeValueCompleter(prompted_attrs, pairs)
|
||||
c.open()
|
||||
av = c.get_pairs("Enter: ", interactive_mandatory_attrs, radius_util.validate)
|
||||
av = c.get_pairs("Enter: ", validate_callback=radius_util.validate)
|
||||
pairs.update(av)
|
||||
c.close()
|
||||
|
||||
@ -228,17 +217,9 @@ def main():
|
||||
|
||||
# Data collection done, assure mandatory data has been specified
|
||||
|
||||
if pairs.has_key('Client-IP-Address') and pairs['Client-IP-Address'] != ip_addr:
|
||||
print "ERROR, Client-IP-Address specified on command line (%s) does not match value found in pairs (%s)" % \
|
||||
(ip_addr, pairs['Client-IP-Address'])
|
||||
return 1
|
||||
|
||||
valid = True
|
||||
for attr in mandatory_radius_attrs:
|
||||
if not pairs.has_key(attr):
|
||||
valid = False
|
||||
print "ERROR, %s is mandatory, but has not been specified" % (attr)
|
||||
if not valid:
|
||||
if pairs.has_key(distinguished_attr) and pairs[distinguished_attr] != ip_addr:
|
||||
print "ERROR, %s specified on command line (%s) does not match value found in pairs (%s)" % \
|
||||
(distinguished_attr, ip_addr, pairs[distinguished_attr])
|
||||
return 1
|
||||
|
||||
# Make sure each attribute is a member of the set of valid attributes
|
||||
|
||||
@ -25,7 +25,6 @@ import logging
|
||||
import subprocess
|
||||
import os
|
||||
import stat
|
||||
import copy
|
||||
import readline
|
||||
import traceback
|
||||
from types import *
|
||||
@ -481,7 +480,7 @@ class AttributeValueCompleter:
|
||||
|
||||
c = AttributeValueCompleter(attrs, defaults)
|
||||
c.open()
|
||||
mandatory_attrs_remaining = copy.copy(mandatory_attrs)
|
||||
mandatory_attrs_remaining = mandatory_attrs[:]
|
||||
|
||||
while True:
|
||||
if mandatory_attrs_remaining:
|
||||
@ -652,10 +651,10 @@ class AttributeValueCompleter:
|
||||
except EOFError:
|
||||
return None, None
|
||||
|
||||
def get_pairs(self, prompt, mandatory_attrs=None, validate_callback=None, must_match=Trueo, value_required=True):
|
||||
def get_pairs(self, prompt, mandatory_attrs=None, validate_callback=None, must_match=True, value_required=True):
|
||||
pairs = {}
|
||||
if mandatory_attrs:
|
||||
mandatory_attrs_remaining = copy.copy(mandatory_attrs)
|
||||
mandatory_attrs_remaining = mandatory_attrs[:]
|
||||
else:
|
||||
mandatory_attrs_remaining = []
|
||||
|
||||
@ -714,9 +713,8 @@ class ItemCompleter:
|
||||
|
||||
'''
|
||||
|
||||
def __init__(self, items, must_match=True):
|
||||
def __init__(self, items):
|
||||
self.items = items
|
||||
self.must_match = must_match
|
||||
self.initial_input = None
|
||||
self.item_delims = ' \t,'
|
||||
self.split_re = re.compile('[%s]+' % self.item_delims)
|
||||
@ -768,26 +766,25 @@ class ItemCompleter:
|
||||
items = self.split_re.split(self.line_buffer)
|
||||
for item in items[:]:
|
||||
if not item: items.remove(item)
|
||||
if self.must_match:
|
||||
for item in items[:]:
|
||||
if item not in self.items:
|
||||
print "ERROR: %s is not valid" % (item)
|
||||
items.remove(item)
|
||||
return items
|
||||
except EOFError:
|
||||
return items
|
||||
|
||||
def get_items(self, prompt):
|
||||
def get_items(self, prompt, must_match=True):
|
||||
items = []
|
||||
|
||||
print "Enter name [name ...]"
|
||||
print "Press <ENTER> to accept, control-D terminates input"
|
||||
print "Press <ENTER> to accept, blank line or control-D terminates input"
|
||||
print "Pressing <TAB> auto completes name"
|
||||
print
|
||||
while True:
|
||||
new_items = self.read_input(prompt)
|
||||
if new_items is None: break
|
||||
if not new_items: break
|
||||
for item in new_items:
|
||||
if must_match:
|
||||
if item not in self.items:
|
||||
print "ERROR: %s is not valid" % (item)
|
||||
continue
|
||||
if item in items: continue
|
||||
items.append(item)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user