cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2025-04-21 19:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix record comment removal (#1537)

Browse Source
This commit is contained in:
Matt Scott 2023-04-21 18:29:20 -04:00 committed by GitHub
commit 86e75c8b6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
powerdnsadmin/models/record.py
View File

@ -251,6 +251,7 @@ class Record(object):
Returns: Returns:
new_rrsets(list): List of rrsets to be added new_rrsets(list): List of rrsets to be added
del_rrsets(list): List of rrsets to be deleted del_rrsets(list): List of rrsets to be deleted
zone_has_comments(bool): True if the zone currently contains persistent comments
""" """
# Create submitted rrsets from submitted records # Create submitted rrsets from submitted records
submitted_rrsets = self.build_rrsets(domain_name, submitted_records) submitted_rrsets = self.build_rrsets(domain_name, submitted_records)
@ -266,9 +267,11 @@ class Record(object):
# PDNS API always return the comments with modified_at # PDNS API always return the comments with modified_at
# info, we have to remove it to be able to do the dict # info, we have to remove it to be able to do the dict
# comparison between current and submitted rrsets # comparison between current and submitted rrsets
zone_has_comments = False
for r in current_rrsets: for r in current_rrsets:
for comment in r['comments']: for comment in r['comments']:
if 'modified_at' in comment: if 'modified_at' in comment:
zone_has_comments = True
del comment['modified_at'] del comment['modified_at']
# List of rrsets to be added # List of rrsets to be added
@ -290,7 +293,7 @@ class Record(object):
current_app.logger.debug("new_rrsets: \n{}".format(utils.pretty_json(new_rrsets))) current_app.logger.debug("new_rrsets: \n{}".format(utils.pretty_json(new_rrsets)))
current_app.logger.debug("del_rrsets: \n{}".format(utils.pretty_json(del_rrsets))) current_app.logger.debug("del_rrsets: \n{}".format(utils.pretty_json(del_rrsets)))
return new_rrsets, del_rrsets return new_rrsets, del_rrsets, zone_has_comments
def apply_rrsets(self, domain_name, rrsets): def apply_rrsets(self, domain_name, rrsets):
headers = {'X-API-Key': self.PDNS_API_KEY, 'Content-Type': 'application/json'} headers = {'X-API-Key': self.PDNS_API_KEY, 'Content-Type': 'application/json'}
@ -304,7 +307,7 @@ class Record(object):
return jdata return jdata
@staticmethod @staticmethod
def to_api_payload(new_rrsets, del_rrsets): def to_api_payload(new_rrsets, del_rrsets, comments_supported):
"""Turn the given changes into a single api payload.""" """Turn the given changes into a single api payload."""
def replace_for_api(rrset): def replace_for_api(rrset):
@ -312,9 +315,13 @@ class Record(object):
if not rrset or rrset.get('changetype', None) != 'REPLACE': if not rrset or rrset.get('changetype', None) != 'REPLACE':
return rrset return rrset
replace_copy = dict(rrset) replace_copy = dict(rrset)
# For compatibility with some backends: Remove comments from rrset if all are blank has_nonempty_comments = any(bool(c.get('content', None)) for c in replace_copy.get('comments', []))
if not any((bool(c.get('content', None)) for c in replace_copy.get('comments', []))): if not has_nonempty_comments:
replace_copy.pop('comments', None) if comments_supported:
replace_copy['comments'] = []
else:
# For backends that don't support comments: Remove the attribute altogether
replace_copy.pop('comments', None)
return replace_copy return replace_copy
def rrset_in(needle, haystack): def rrset_in(needle, haystack):
@ -351,11 +358,11 @@ class Record(object):
"submitted_records: {}".format(submitted_records)) "submitted_records: {}".format(submitted_records))
# Get the list of rrsets to be added and deleted # Get the list of rrsets to be added and deleted
new_rrsets, del_rrsets = self.compare(domain_name, submitted_records) new_rrsets, del_rrsets, zone_has_comments = self.compare(domain_name, submitted_records)
# The history logic still needs *all* the deletes with full data to display a useful diff. # The history logic still needs *all* the deletes with full data to display a useful diff.
# So create a "minified" copy for the api call, and return the original data back up # So create a "minified" copy for the api call, and return the original data back up
api_payload = self.to_api_payload(new_rrsets['rrsets'], del_rrsets['rrsets']) api_payload = self.to_api_payload(new_rrsets['rrsets'], del_rrsets['rrsets'], zone_has_comments)
current_app.logger.debug(f"api payload: \n{utils.pretty_json(api_payload)}") current_app.logger.debug(f"api payload: \n{utils.pretty_json(api_payload)}")
# Submit the changes to PDNS API # Submit the changes to PDNS API