This patch consolidates zonemgr function to move the most of the checks to common functions in order to provide consistent output. The error messages produced by the validator should now be more helpful when identifying the source of error.
https://fedorahosted.org/freeipa/ticket/1966
>From 2a6460ba69ad1bffd1869299ae1a5f835217c1df Mon Sep 17 00:00:00 2001 From: Martin Kosek <mko...@redhat.com> Date: Mon, 30 Apr 2012 13:51:03 +0200 Subject: [PATCH] Improve error message in zonemgr validator This patch consolidates zonemgr function to move the most of the checks to common functions in order to provide consistent output. The error messages produced by the validator should now be more helpful when identifying the source of error. https://fedorahosted.org/freeipa/ticket/1966 --- ipalib/util.py | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ipalib/util.py b/ipalib/util.py index 659e178df199028d27511d15c09fc46a940b5f45..37aa556fd7e36aad5c1abb759c9a8eb9d9b41f8b 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -228,7 +228,7 @@ def validate_dns_label(dns_label, allow_underscore=False): if not regex.match(dns_label): raise ValueError(_('only letters, numbers,%(underscore)s and - are allowed. ' \ - '- must not be the DNS label character') \ + '- must not be the last DNS label character') \ % dict(underscore=underscore_err_msg)) def validate_domain_name(domain_name, allow_underscore=False): @@ -246,11 +246,12 @@ def validate_domain_name(domain_name, allow_underscore=False): def validate_zonemgr(zonemgr): """ See RFC 1033, 1035 """ - regex_domain = re.compile(r'^[a-z0-9]([a-z0-9-]?[a-z0-9])*$', re.IGNORECASE) - regex_local_part = re.compile(r'^[a-z0-9]([a-z0-9-_\.]?[a-z0-9])*$', + regex_local_part = re.compile(r'^[a-z0-9]([a-z0-9-_]?[a-z0-9])*$', re.IGNORECASE) - local_part_errmsg = _('mail account may only include letters, numbers, -, _ and a dot. There may not be consecutive -, _ and . characters') + local_part_sep = '.' + local_part = None + domain = None if len(zonemgr) > 255: raise ValueError(_('cannot be longer that 255 characters')) @@ -260,31 +261,28 @@ def validate_zonemgr(zonemgr): if zonemgr.count('@') == 1: local_part, dot, domain = zonemgr.partition('@') - if not regex_local_part.match(local_part): - raise ValueError(local_part_errmsg) - if not domain: - raise ValueError(_('missing address domain')) elif zonemgr.count('@') > 1: raise ValueError(_('too many \'@\' characters')) else: last_fake_sep = zonemgr.rfind('\\.') if last_fake_sep != -1: # there is a 'fake' local-part/domain separator + local_part_sep = '\\.' sep = zonemgr.find('.', last_fake_sep+2) - if sep == -1: - raise ValueError(_('missing address domain')) - local_part = zonemgr[:sep] - domain = zonemgr[sep+1:] - - if not all(regex_local_part.match(part) for part in local_part.split('\\.')): - raise ValueError(local_part_errmsg) + if sep != -1: + local_part = zonemgr[:sep] + domain = zonemgr[sep+1:] else: local_part, dot, domain = zonemgr.partition('.') - if not regex_local_part.match(local_part): - raise ValueError(local_part_errmsg) + if not domain: + raise ValueError(_('missing address domain')) validate_domain_name(domain) + if not local_part or not all(regex_local_part.match(part) for part in \ + local_part.split(local_part_sep)): + raise ValueError(local_part_errmsg) + def validate_hostname(hostname, check_fqdn=True, allow_underscore=False): """ See RFC 952, 1123 -- 1.7.7.6
_______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
