cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-11-09 23:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #752 - Rollback the removed record if apply operation failed

Browse Source
This commit is contained in:
Khanh Ngo 2020-06-19 09:34:33 +07:00
parent a3fd856dd8
commit 5123d542e4
No known key found for this signature in database
GPG Key ID: 29077342AA5648F6
1 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
powerdnsadmin/models/record.py
View File

@ -278,6 +278,17 @@ class Record(object):
return new_rrsets, del_rrsets return new_rrsets, del_rrsets
def apply_rrsets(self, domain_name, rrsets):
headers = {'X-API-Key': self.PDNS_API_KEY}
jdata = utils.fetch_json(urljoin(
self.PDNS_STATS_URL, self.API_EXTENDED_URL +
'/servers/localhost/zones/{0}'.format(domain_name)),
headers=headers,
method='PATCH',
verify=Setting().get('verify_ssl_connections'),
data=rrsets)
return jdata
def apply(self, domain_name, submitted_records): def apply(self, domain_name, submitted_records):
""" """
Apply record changes to a domain. This function Apply record changes to a domain. This function
@ -301,44 +312,43 @@ class Record(object):
# Submit the changes to PDNS API # Submit the changes to PDNS API
try: try:
headers = {'X-API-Key': self.PDNS_API_KEY}
if del_rrsets["rrsets"]: if del_rrsets["rrsets"]:
jdata1 = utils.fetch_json(urljoin( result = self.apply_rrsets(domain_name, del_rrsets)
self.PDNS_STATS_URL, self.API_EXTENDED_URL + if 'error' in result.keys():
'/servers/localhost/zones/{0}'.format(domain_name)),
headers=headers,
method='PATCH',
verify=Setting().get('verify_ssl_connections'),
data=del_rrsets)
if 'error' in jdata1.keys():
current_app.logger.error( current_app.logger.error(
'Cannot apply record changes with deleting rrsets step. PDNS error: {}' 'Cannot apply record changes with deleting rrsets step. PDNS error: {}'
.format(jdata1['error'])) .format(result['error']))
print(jdata1['error'])
return { return {
'status': 'error', 'status': 'error',
'msg': jdata1['error'].replace("'", "") 'msg': result['error'].replace("'", "")
} }
if new_rrsets["rrsets"]: if new_rrsets["rrsets"]:
jdata2 = utils.fetch_json( result = self.apply_rrsets(domain_name, new_rrsets)
urljoin( if 'error' in result.keys():
self.PDNS_STATS_URL, self.API_EXTENDED_URL +
'/servers/localhost/zones/{0}'.format(domain_name)),
headers=headers,
timeout=int(Setting().get('pdns_api_timeout')),
method='PATCH',
verify=Setting().get('verify_ssl_connections'),
data=new_rrsets)
if 'error' in jdata2.keys():
current_app.logger.error( current_app.logger.error(
'Cannot apply record changes with adding rrsets step. PDNS error: {}' 'Cannot apply record changes with adding rrsets step. PDNS error: {}'
.format(jdata2['error'])) .format(result['error']))
return {
'status': 'error', # rollback - re-add the removed record if the adding operation is failed.
'msg': jdata2['error'].replace("'", "") if del_rrsets["rrsets"]:
} rollback_rrests = del_rrsets
for r in del_rrsets["rrsets"]:
r['changetype'] = 'REPLACE'
rollback = self.apply_rrsets(domain_name, rollback_rrests)
if 'error' in rollback.keys():
return dict(status='error',
msg='Failed to apply changes. Cannot rollback previous failed operation: {}'
.format(rollback['error'].replace("'", "")))
else:
return dict(status='error',
msg='Failed to apply changes. Rolled back previous failed operation: {}'
.format(result['error'].replace("'", "")))
else:
return {
'status': 'error',
'msg': result['error'].replace("'", "")
}
self.auto_ptr(domain_name, new_rrsets, del_rrsets) self.auto_ptr(domain_name, new_rrsets, del_rrsets)
self.update_db_serial(domain_name) self.update_db_serial(domain_name)