From 2265cb86cf71f7cbdcb969b790991c26491c753c Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 10 Sep 2020 14:00:49 -0400 Subject: [PATCH] Don't allow both a zone name and --name-from-ip to be provided --name-from-ip will generate a zone name so there is no point in the user providing one. If one is provided and doesn't match the generated name then a validation exception is raised. https://pagure.io/freeipa/issue/8446 Signed-off-by: Rob Crittenden Reviewed-By: Alexander Bokovoy Reviewed-By: Rafael Guterres Jeffman --- ipaserver/plugins/dns.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ipaserver/plugins/dns.py b/ipaserver/plugins/dns.py index 7130f8f7d..5fd792254 100644 --- a/ipaserver/plugins/dns.py +++ b/ipaserver/plugins/dns.py @@ -2142,6 +2142,14 @@ class DNSZoneBase_add(LDAPCreate): def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): assert isinstance(dn, DN) + if options.get('name_from_ip'): + zone = _reverse_zone_name(options.get('name_from_ip')) + if keys[-1] != DNSName(zone): + raise errors.ValidationError( + name='name-from-ip', + error=_("cannot be used when a zone is specified") + ) + try: entry = ldap.get_entry(dn) except errors.NotFound: