1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375
|
#!/usr/bin/env python3
#
# Small library and commandline tool to do logical diffs of zonefiles
# ./zonediff -h gives you help output
#
# Requires dnspython to do all the heavy lifting
#
# (c)2009 Dennis Kaarsemaker <dennis@kaarsemaker.net>
#
# Permission to use, copy, modify, and distribute this software and its
# documentation for any purpose with or without fee is hereby granted,
# provided that the above copyright notice and this permission notice
# appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
"""See diff_zones.__doc__ for more information"""
from typing import Any, Union, cast # pylint: disable=unused-import
__all__ = ["diff_zones", "format_changes_plain", "format_changes_html"]
try:
import dns.node
import dns.zone
except ImportError:
raise SystemExit("Please install dnspython")
def diff_zones(
zone1, # type: dns.zone.Zone
zone2, # type: dns.zone.Zone
ignore_ttl=False,
ignore_soa=False,
): # type: (...) -> list
"""diff_zones(zone1, zone2, ignore_ttl=False, ignore_soa=False) -> changes
Compares two dns.zone.Zone objects and returns a list of all changes
in the format (name, oldnode, newnode).
If ignore_ttl is true, a node will not be added to this list if the
only change is its TTL.
If ignore_soa is true, a node will not be added to this list if the
only changes is a change in a SOA Rdata set.
The returned nodes do include all Rdata sets, including unchanged ones.
"""
changes = []
for name in zone1:
namestr = str(name)
n1 = cast(dns.node.Node, zone1.get_node(namestr))
n2 = cast(dns.node.Node, zone2.get_node(namestr))
if not n2:
changes.append((str(name), n1, n2))
elif _nodes_differ(n1, n2, ignore_ttl, ignore_soa):
changes.append((str(name), n1, n2))
for name in zone2:
n3 = cast(dns.node.Node, zone1.get_node(name))
if not n3:
n4 = cast(dns.node.Node, zone2.get_node(name))
changes.append((str(name), n3, n4))
return changes
def _nodes_differ(
n1, # type: dns.node.Node
n2, # type: dns.node.Node
ignore_ttl, # type: bool
ignore_soa, # type: bool
): # type: (...) -> bool
if ignore_soa or not ignore_ttl:
# Compare datasets directly
for r in n1.rdatasets:
if ignore_soa and r.rdtype == dns.rdatatype.SOA:
continue
if r not in n2.rdatasets:
return True
if not ignore_ttl:
return r.ttl != n2.find_rdataset(r.rdclass, r.rdtype).ttl
for r in n2.rdatasets:
if ignore_soa and r.rdtype == dns.rdatatype.SOA:
continue
if r not in n1.rdatasets:
return True
assert False
else:
return n1 != n2
def format_changes_plain(
oldf, # type: str
newf, # type: str
changes, # type: list
ignore_ttl=False,
): # type: (...) -> str
"""format_changes(oldfile, newfile, changes, ignore_ttl=False) -> str
Given 2 filenames and a list of changes from diff_zones, produce diff-like
output. If ignore_ttl is True, TTL-only changes are not displayed"""
ret = "--- {}\n+++ {}\n".format(oldf, newf)
for name, old, new in changes:
ret += "@ %s\n" % name
if not old:
for r in new.rdatasets:
ret += "+ %s\n" % str(r).replace("\n", "\n+ ")
elif not new:
for r in old.rdatasets:
ret += "- %s\n" % str(r).replace("\n", "\n+ ")
else:
for r in old.rdatasets:
if r not in new.rdatasets or (
r.ttl != new.find_rdataset(r.rdclass, r.rdtype).ttl
and not ignore_ttl
):
ret += "- %s\n" % str(r).replace("\n", "\n+ ")
for r in new.rdatasets:
if r not in old.rdatasets or (
r.ttl != old.find_rdataset(r.rdclass, r.rdtype).ttl
and not ignore_ttl
):
ret += "+ %s\n" % str(r).replace("\n", "\n+ ")
return ret
def format_changes_html(
oldf, # type: str
newf, # type: str
changes, # type: list
ignore_ttl=False,
): # type: (...) -> str
"""format_changes(oldfile, newfile, changes, ignore_ttl=False) -> str
Given 2 filenames and a list of changes from diff_zones, produce nice html
output. If ignore_ttl is True, TTL-only changes are not displayed"""
ret = """<table class="zonediff">
<thead>
<tr>
<th> </th>
<th class="old">%s</th>
<th class="new">%s</th>
</tr>
</thead>
<tbody>\n""" % (
oldf,
newf,
)
for name, old, new in changes:
ret += ' <tr class="rdata">\n <td class="rdname">%s</td>\n' % name
if not old:
for r in new.rdatasets:
ret += (
' <td class="old"> </td>\n'
' <td class="new">%s</td>\n'
) % str(r).replace("\n", "<br />")
elif not new:
for r in old.rdatasets:
ret += (
' <td class="old">%s</td>\n'
' <td class="new"> </td>\n'
) % str(r).replace("\n", "<br />")
else:
ret += ' <td class="old">'
for r in old.rdatasets:
if r not in new.rdatasets or (
r.ttl != new.find_rdataset(r.rdclass, r.rdtype).ttl
and not ignore_ttl
):
ret += str(r).replace("\n", "<br />")
ret += "</td>\n"
ret += ' <td class="new">'
for r in new.rdatasets:
if r not in old.rdatasets or (
r.ttl != old.find_rdataset(r.rdclass, r.rdtype).ttl
and not ignore_ttl
):
ret += str(r).replace("\n", "<br />")
ret += "</td>\n"
ret += " </tr>\n"
return ret + " </tbody>\n</table>"
# Make this module usable as a script too.
def main(): # type: () -> None
import argparse
import subprocess
import sys
import traceback
usage = """%prog zonefile1 zonefile2 - Show differences between zones in a diff-like format
%prog [--git|--bzr|--rcs] zonefile rev1 [rev2] - Show differences between two revisions of a zonefile
The differences shown will be logical differences, not textual differences.
"""
p = argparse.ArgumentParser(usage=usage)
p.add_argument(
"-s",
"--ignore-soa",
action="store_true",
default=False,
dest="ignore_soa",
help="Ignore SOA-only changes to records",
)
p.add_argument(
"-t",
"--ignore-ttl",
action="store_true",
default=False,
dest="ignore_ttl",
help="Ignore TTL-only changes to Rdata",
)
p.add_argument(
"-T",
"--traceback",
action="store_true",
default=False,
dest="tracebacks",
help="Show python tracebacks when errors occur",
)
p.add_argument(
"-H",
"--html",
action="store_true",
default=False,
dest="html",
help="Print HTML output",
)
p.add_argument(
"-g",
"--git",
action="store_true",
default=False,
dest="use_git",
help="Use git revisions instead of real files",
)
p.add_argument(
"-b",
"--bzr",
action="store_true",
default=False,
dest="use_bzr",
help="Use bzr revisions instead of real files",
)
p.add_argument(
"-r",
"--rcs",
action="store_true",
default=False,
dest="use_rcs",
help="Use rcs revisions instead of real files",
)
opts, args = p.parse_args()
opts.use_vc = opts.use_git or opts.use_bzr or opts.use_rcs
def _open(what, err): # type: (Union[list,str], str) -> Any
if isinstance(what, list):
# Must be a list, open subprocess
try:
proc = subprocess.Popen(what, stdout=subprocess.PIPE)
proc.wait()
if proc.returncode == 0:
return proc.stdout
sys.stderr.write(err + "\n")
except Exception:
sys.stderr.write(err + "\n")
if opts.tracebacks:
traceback.print_exc()
else:
# Open as normal file
try:
return open(what, "rb")
except IOError:
sys.stderr.write(err + "\n")
if opts.tracebacks:
traceback.print_exc()
if not opts.use_vc and len(args) != 2:
p.print_help()
sys.exit(64)
if opts.use_vc and len(args) not in (2, 3):
p.print_help()
sys.exit(64)
# Open file descriptors
if not opts.use_vc:
oldn, newn = args
else:
if len(args) == 3:
filename, oldr, newr = args
oldn = "{}:{}".format(oldr, filename)
newn = "{}:{}".format(newr, filename)
else:
filename, oldr = args
newr = None
oldn = "{}:{}".format(oldr, filename)
newn = filename
old, new = None, None
oldz, newz = None, None
if opts.use_bzr:
old = _open(
["bzr", "cat", "-r" + oldr, filename],
"Unable to retrieve revision {} of {}".format(oldr, filename),
)
if newr is not None:
new = _open(
["bzr", "cat", "-r" + newr, filename],
"Unable to retrieve revision {} of {}".format(newr, filename),
)
elif opts.use_git:
old = _open(
["git", "show", oldn],
"Unable to retrieve revision {} of {}".format(oldr, filename),
)
if newr is not None:
new = _open(
["git", "show", newn],
"Unable to retrieve revision {} of {}".format(newr, filename),
)
elif opts.use_rcs:
old = _open(
["co", "-q", "-p", "-r" + oldr, filename],
"Unable to retrieve revision {} of {}".format(oldr, filename),
)
if newr is not None:
new = _open(
["co", "-q", "-p", "-r" + newr, filename],
"Unable to retrieve revision {} of {}".format(newr, filename),
)
if not opts.use_vc:
old = _open(oldn, "Unable to open %s" % oldn)
if not opts.use_vc or newr is None:
new = _open(newn, "Unable to open %s" % newn)
if not old or not new:
sys.exit(65)
# Parse the zones
try:
oldz = dns.zone.from_file(old, origin=".", check_origin=False)
except dns.exception.DNSException:
sys.stderr.write("Incorrect zonefile: %s\n" % old)
if opts.tracebacks:
traceback.print_exc()
try:
newz = dns.zone.from_file(new, origin=".", check_origin=False)
except dns.exception.DNSException:
sys.stderr.write("Incorrect zonefile: %s\n" % new)
if opts.tracebacks:
traceback.print_exc()
if not oldz or not newz:
sys.exit(65)
changes = diff_zones(oldz, newz, opts.ignore_ttl, opts.ignore_soa)
changes.sort()
if not changes:
sys.exit(0)
if opts.html:
print(format_changes_html(oldn, newn, changes, opts.ignore_ttl))
else:
print(format_changes_plain(oldn, newn, changes, opts.ignore_ttl))
sys.exit(1)
if __name__ == "__main__":
main()
|