knilsson/dns-zones
1
0
Fork 0
forked from critical/dns-zones
Code Pull requests Activity

Add support for secondary nameservers

Browse source 
Fixes #4
This commit is contained in:
Jan Dittberner 2022-10-23 13:52:05 +02:00
parent 5f7fb5235d
commit 2c896a85ac
1 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
update-zones.py
View file

@ -44,11 +44,13 @@ def git_changed_files(reference_branch, target_branch):
return output.strip().splitlines() return output.strip().splitlines()
def pdns_managed_zones(): def pdns_managed_zones(secondary_only=False):
command = ["pdnsutil", "list-all-zones"]
if secondary_only:
command += ["slave"]
try: try:
all_zones = run( all_zones = run(command, check=True, capture_output=True, text=True)
["pdnsutil", "list-all-zones"], check=True, capture_output=True, text=True
)
zones = all_zones.stdout.strip().splitlines() zones = all_zones.stdout.strip().splitlines()
except CalledProcessError as e: except CalledProcessError as e:
print( print(
@ -75,6 +77,14 @@ def calculate_changed_zones(files, zones):
return sorted(set(files).intersection(zones)) return sorted(set(files).intersection(zones))
def remove_secondary_zones(changed_zones):
"""
Remove DNS zones from the given set where the current server is a secondary DNS server.
"""
secondary_zones = pdns_managed_zones(secondary_only=True)
return sorted(set(changed_zones).difference(secondary_zones))
def generate_diff(zone, reference_branch, target_branch): def generate_diff(zone, reference_branch, target_branch):
diffresult = run( diffresult = run(
["git", "diff", f"{reference_branch}..{target_branch}", "--", zone], ["git", "diff", f"{reference_branch}..{target_branch}", "--", zone],
@ -190,6 +200,19 @@ def get_changelog(reference_branch, target_branch):
return r.stdout.strip() return r.stdout.strip()
def update_reference_branch(reference_branch, target_branch):
"""
Update the local git reference branch to track the target branch.
"""
run(
["git", "branch", "-D", reference_branch],
check=True,
stdout=DEVNULL,
stderr=DEVNULL,
)
run(["git", "branch", reference_branch, target_branch], check=True)
def main(reference_branch, target_branch, audit_email_address, audit_sender_address): def main(reference_branch, target_branch, audit_email_address, audit_sender_address):
changed_files = git_changed_files( changed_files = git_changed_files(
reference_branch=reference_branch, target_branch=target_branch reference_branch=reference_branch, target_branch=target_branch
@ -206,8 +229,13 @@ def main(reference_branch, target_branch, audit_email_address, audit_sender_addr
changed_zones = calculate_changed_zones(changed_files, zones_in_pdns) changed_zones = calculate_changed_zones(changed_files, zones_in_pdns)
changed_zones = remove_secondary_zones(changed_zones)
if not changed_zones: if not changed_zones:
print("no zones changed") print("no zones changed")
update_reference_branch(reference_branch, target_branch)
return return
diffs = [] diffs = []
@ -246,13 +274,7 @@ def main(reference_branch, target_branch, audit_email_address, audit_sender_addr
changelog = get_changelog(reference_branch, target_branch) changelog = get_changelog(reference_branch, target_branch)
run( update_reference_branch(reference_branch, target_branch)
["git", "branch", "-D", reference_branch],
check=True,
stdout=DEVNULL,
stderr=DEVNULL,
)
run(["git", "branch", reference_branch, target_branch], check=True)
send_audit_mail(diffs, audit_email_address, audit_sender_address, changelog) send_audit_mail(diffs, audit_email_address, audit_sender_address, changelog)