IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Always return absolute idnsname in dnszone commands

Browse Source 
Ticket: https://fedorahosted.org/freeipa/ticket/4722
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Martin Basti 2015-01-15 13:13:55 +01:00 committed by Jan Cholasta
parent 46c12159e6
commit af0a2409f9
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ipalib/plugins/dns.py
View File

@ -2081,6 +2081,18 @@ class DNSZoneBase(LDAPObject):
except errors.NotFound: except errors.NotFound:
raise e # re-raise original exception raise e # re-raise original exception
def _make_zonename_absolute(self, entry_attrs, **options):
"""
Zone names can be relative in IPA < 4.0, make sure we always return
absolute zone name from ldap
"""
if options.get('raw'):
return
if "idnsname" in entry_attrs:
entry_attrs.single_value['idnsname'] = (
entry_attrs.single_value['idnsname'].make_absolute())
class DNSZoneBase_add(LDAPCreate): class DNSZoneBase_add(LDAPCreate):
@ -2128,6 +2140,11 @@ class DNSZoneBase_del(LDAPDelete):
class DNSZoneBase_mod(LDAPUpdate): class DNSZoneBase_mod(LDAPUpdate):
has_output_params = LDAPUpdate.has_output_params + dnszone_output_params has_output_params = LDAPUpdate.has_output_params + dnszone_output_params
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
assert isinstance(dn, DN)
self.obj._make_zonename_absolute(entry_attrs, **options)
return dn
class DNSZoneBase_find(LDAPSearch): class DNSZoneBase_find(LDAPSearch):
__doc__ = _('Search for DNS zones (SOA records).') __doc__ = _('Search for DNS zones (SOA records).')
@ -2162,6 +2179,11 @@ class DNSZoneBase_find(LDAPSearch):
filter = _create_idn_filter(self, ldap, *args, **options) filter = _create_idn_filter(self, ldap, *args, **options)
return (filter, base_dn, scope) return (filter, base_dn, scope)
def post_callback(self, ldap, entries, truncated, *args, **options):
for entry_attrs in entries:
self.obj._make_zonename_absolute(entry_attrs, **options)
return truncated
class DNSZoneBase_show(LDAPRetrieve): class DNSZoneBase_show(LDAPRetrieve):
has_output_params = LDAPRetrieve.has_output_params + dnszone_output_params has_output_params = LDAPRetrieve.has_output_params + dnszone_output_params
@ -2172,6 +2194,11 @@ class DNSZoneBase_show(LDAPRetrieve):
self.obj.handle_not_found(*keys) self.obj.handle_not_found(*keys)
return dn return dn
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
assert isinstance(dn, DN)
self.obj._make_zonename_absolute(entry_attrs, **options)
return dn
class DNSZoneBase_disable(LDAPQuery): class DNSZoneBase_disable(LDAPQuery):
has_output = output.standard_value has_output = output.standard_value
@ -2796,7 +2823,8 @@ class dnszone_mod(DNSZoneBase_mod):
return result return result
def post_callback(self, ldap, dn, entry_attrs, *keys, **options): def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
assert isinstance(dn, DN) dn = super(dnszone_mod, self).post_callback(ldap, dn, entry_attrs,
*keys, **options)
self.obj._rr_zone_postprocess(entry_attrs, **options) self.obj._rr_zone_postprocess(entry_attrs, **options)
return dn return dn
@ -2833,6 +2861,9 @@ class dnszone_find(DNSZoneBase_find):
return (filter, base_dn, scope) return (filter, base_dn, scope)
def post_callback(self, ldap, entries, truncated, *args, **options): def post_callback(self, ldap, entries, truncated, *args, **options):
truncated = super(dnszone_find, self).post_callback(ldap, entries,
truncated, *args,
**options)
for entry_attrs in entries: for entry_attrs in entries:
self.obj._rr_zone_postprocess(entry_attrs, **options) self.obj._rr_zone_postprocess(entry_attrs, **options)
return truncated return truncated
@ -2849,7 +2880,8 @@ class dnszone_show(DNSZoneBase_show):
return result return result
def post_callback(self, ldap, dn, entry_attrs, *keys, **options): def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
assert isinstance(dn, DN) dn = super(dnszone_show, self).post_callback(ldap, dn, entry_attrs,
*keys, **options)
self.obj._rr_zone_postprocess(entry_attrs, **options) self.obj._rr_zone_postprocess(entry_attrs, **options)
return dn return dn