diff options
Diffstat (limited to 'ipa-admintools/ipa-addradiusclient')
| -rw-r--r-- | ipa-admintools/ipa-addradiusclient | 99 |
1 files changed, 1 insertions, 98 deletions
diff --git a/ipa-admintools/ipa-addradiusclient b/ipa-admintools/ipa-addradiusclient index 29fac531..82bd5c18 100644 --- a/ipa-admintools/ipa-addradiusclient +++ b/ipa-admintools/ipa-addradiusclient @@ -21,7 +21,7 @@ import sys from optparse import OptionParser import ipa -import ipa.radius_client +from ipa.radius_client import * import ipa.ipaclient as ipaclient import ipa.ipavalidate as ipavalidate import ipa.config @@ -30,21 +30,6 @@ import ipa.ipaerror import xmlrpclib import kerberos import ldap -import getpass -import re - -#------------------------------------------------------------------------------ - -dotted_octet_RE = re.compile(r"^(\d+)\.(\d+)\.(\d+)\.(\d+)(/(\d+))?$") -dns_RE = re.compile(r"^[a-zA-Z.-]+$") -# secret, name, nastype all have 31 char max in freeRADIUS, max ip address len is 255 -valid_secret_len = (1,31) -valid_name_len = (1,31) -valid_nastype_len = (1,31) -valid_ip_addr_len = (1,255) - -valid_ip_addr_msg = "IP address is required and must be dotted octet with optional mask or a DNS name" -valid_desc_msg = "Description must text string" #------------------------------------------------------------------------------ @@ -74,88 +59,6 @@ def parse_options(): #------------------------------------------------------------------------------ -def get_secret(): - valid = False - while (not valid): - secret = getpass.getpass("Enter Secret: ") - confirm = getpass.getpass("Confirm Secret: ") - if (secret != confirm): - print "Secrets do not match" - continue - valid = True - return secret - -#------------------------------------------------------------------------------ - -def valid_ip_addr(text): - - # is it a dotted octet? If so there should be 4 integers seperated - # by a dot and each integer should be between 0 and 255 - # there may be an optional mask preceded by a slash (e.g. 1.2.3.4/24) - match = dotted_octet_RE.search(text) - if match: - # dotted octet notation - i = 1 - while i <= 4: - octet = int(match.group(i)) - if octet > 255: return False - i += 1 - if match.group(5): - mask = int(match.group(6)) - if mask <= 32: - return True - else: - return False - return True - else: - # DNS name, can contain letters, dot and hypen - if dns_RE.search(text): return False - return True - -def validate_length(value, limits): - length = len(value) - if length < limits[0] or length > limits[1]: - return False - return True - -def valid_length_msg(name, limits): - return "%s length must be at least %d and not more than %d" % (name, limits[0], limits[1]) - -def validate_ip_addr(ip_addr): - if not validate_length(ip_addr, valid_ip_addr_len): - print valid_length_msg('ip address', valid_ip_addr_len) - return False - if not valid_ip_addr(ip_addr): - print valid_ip_addr_msg - return False - return True - -def validate_secret(secret): - if not validate_length(secret, valid_secret_len): - print valid_length_msg('secret', valid_secret_len) - return False - return True - -def validate_name(name): - if not validate_length(name, valid_name_len): - print valid_length_msg('name', valid_name_len) - return False - return True - -def validate_nastype(nastype): - if not validate_length(nastype, valid_nastype_len): - print valid_length_msg('NAS Type', valid_nastype_len) - return False - return True - -def validate_desc(desc): - if ipavalidate.plain(desc, notEmpty=True) != 0: - print valid_desc_msg - return False - return True - -#------------------------------------------------------------------------------ - def main(): ip_addr = None secret = None |