author | Tero Marttila <terom@paivola.fi> |
Tue, 10 Mar 2015 00:26:31 +0200 | |
changeset 740 | 74352351d6f5 |
parent 734 | 5770ed34c1f0 |
permissions | -rw-r--r-- |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
1 |
""" |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
2 |
Generate zonefile records from hosts |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
3 |
""" |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
4 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
5 |
import logging; log = logging.getLogger('pvl.hosts.zone') |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
6 |
import pvl.dns |
487
920394061b6f
pvl.hosts.zone: HostZoneError(HostError), move resolve() to pvl.dns.relative(), and expect HostError's in pvl.hosts-forward/pvl.hosts-reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
475
diff
changeset
|
7 |
import pvl.hosts.host |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
8 |
|
487
920394061b6f
pvl.hosts.zone: HostZoneError(HostError), move resolve() to pvl.dns.relative(), and expect HostError's in pvl.hosts-forward/pvl.hosts-reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
475
diff
changeset
|
9 |
class HostZoneError(pvl.hosts.host.HostError): |
920394061b6f
pvl.hosts.zone: HostZoneError(HostError), move resolve() to pvl.dns.relative(), and expect HostError's in pvl.hosts-forward/pvl.hosts-reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
475
diff
changeset
|
10 |
pass |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
11 |
|
471
e4b4458d8061
pvl.hosts: test location domains
Tero Marttila <tero.marttila@aalto.fi>
parents:
470
diff
changeset
|
12 |
# TODO: generate location alias CNAMEs even if host itself is outside origin? |
496
530f22575889
pvl.hosts.zone: label=relative() check handles FQDNs
Tero Marttila <tero.marttila@aalto.fi>
parents:
495
diff
changeset
|
13 |
def host_forward (host, origin): |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
14 |
""" |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
15 |
Yield ZoneRecords for hosts within the given zone origin |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
16 |
""" |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
17 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
18 |
try: |
487
920394061b6f
pvl.hosts.zone: HostZoneError(HostError), move resolve() to pvl.dns.relative(), and expect HostError's in pvl.hosts-forward/pvl.hosts-reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
475
diff
changeset
|
19 |
label = pvl.dns.relative(origin, host.domain, host.name) |
920394061b6f
pvl.hosts.zone: HostZoneError(HostError), move resolve() to pvl.dns.relative(), and expect HostError's in pvl.hosts-forward/pvl.hosts-reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
475
diff
changeset
|
20 |
except ValueError as error: |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
21 |
log.info("%s: skip: %s", host, error) |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
22 |
return |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
23 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
24 |
if host.forward: |
463
2cbdb2435487
pvl.hosts.zone: fix pvl.dns.fqdn() and basic tests for host_forward/reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
462
diff
changeset
|
25 |
forward = pvl.dns.fqdn(host.forward) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
26 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
27 |
log.info("%s: forward: %s", host, forward) |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
28 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
29 |
yield pvl.dns.ZoneRecord.CNAME(label, forward) |
467
3bb00e5e79d3
pvl.hosts.zone: support combining forward= with alias=
Tero Marttila <tero.marttila@aalto.fi>
parents:
466
diff
changeset
|
30 |
|
3bb00e5e79d3
pvl.hosts.zone: support combining forward= with alias=
Tero Marttila <tero.marttila@aalto.fi>
parents:
466
diff
changeset
|
31 |
elif host.forward is None: |
3bb00e5e79d3
pvl.hosts.zone: support combining forward= with alias=
Tero Marttila <tero.marttila@aalto.fi>
parents:
466
diff
changeset
|
32 |
# forward |
734
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
33 |
for sublabel, ip in host.addresses(): |
733
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
34 |
if sublabel: |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
35 |
sublabel = pvl.dns.join(sublabel, label) |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
36 |
else: |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
37 |
sublabel = label |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
38 |
|
734
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
39 |
if ip.version == 4: |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
40 |
log.info("%s: ip: %s@%s A %s", host, sublabel, origin, ip) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
41 |
|
734
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
42 |
yield pvl.dns.ZoneRecord.A(sublabel, ip) |
467
3bb00e5e79d3
pvl.hosts.zone: support combining forward= with alias=
Tero Marttila <tero.marttila@aalto.fi>
parents:
466
diff
changeset
|
43 |
|
734
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
44 |
elif ip.version == 6: |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
45 |
log.info("%s: ip6: %s@%s AAAA %s", host, label, origin, ip) |
467
3bb00e5e79d3
pvl.hosts.zone: support combining forward= with alias=
Tero Marttila <tero.marttila@aalto.fi>
parents:
466
diff
changeset
|
46 |
|
734
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
47 |
yield pvl.dns.ZoneRecord.AAAA(sublabel, ip) |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
48 |
|
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
49 |
else: |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
50 |
raise ValueError(ip) |
467
3bb00e5e79d3
pvl.hosts.zone: support combining forward= with alias=
Tero Marttila <tero.marttila@aalto.fi>
parents:
466
diff
changeset
|
51 |
|
3bb00e5e79d3
pvl.hosts.zone: support combining forward= with alias=
Tero Marttila <tero.marttila@aalto.fi>
parents:
466
diff
changeset
|
52 |
else: |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
53 |
log.info("%s: skip forward", host) |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
54 |
return |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
55 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
56 |
if host.location: |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
57 |
location_alias, location_domain = host.location |
471
e4b4458d8061
pvl.hosts: test location domains
Tero Marttila <tero.marttila@aalto.fi>
parents:
470
diff
changeset
|
58 |
|
487
920394061b6f
pvl.hosts.zone: HostZoneError(HostError), move resolve() to pvl.dns.relative(), and expect HostError's in pvl.hosts-forward/pvl.hosts-reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
475
diff
changeset
|
59 |
try: |
920394061b6f
pvl.hosts.zone: HostZoneError(HostError), move resolve() to pvl.dns.relative(), and expect HostError's in pvl.hosts-forward/pvl.hosts-reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
475
diff
changeset
|
60 |
yield pvl.dns.ZoneRecord.CNAME(pvl.dns.relative(origin, location_domain, location_alias), label) |
920394061b6f
pvl.hosts.zone: HostZoneError(HostError), move resolve() to pvl.dns.relative(), and expect HostError's in pvl.hosts-forward/pvl.hosts-reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
475
diff
changeset
|
61 |
except ValueError as error: |
920394061b6f
pvl.hosts.zone: HostZoneError(HostError), move resolve() to pvl.dns.relative(), and expect HostError's in pvl.hosts-forward/pvl.hosts-reverse
Tero Marttila <tero.marttila@aalto.fi>
parents:
475
diff
changeset
|
62 |
raise HostZoneError(host, error) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
63 |
|
466
ad9d512ec1e7
pvl.hosts.zone: test and fix alias=
Tero Marttila <tero.marttila@aalto.fi>
parents:
464
diff
changeset
|
64 |
for alias in host.alias: |
495
629fc999cc33
pvl.hosts.zone: alias= labels cannot be out of origin
Tero Marttila <tero.marttila@aalto.fi>
parents:
489
diff
changeset
|
65 |
yield pvl.dns.ZoneRecord.CNAME(pvl.dns.relative(origin, host.domain, alias), label) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
66 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
67 |
for alias in host.alias4: |
733
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
68 |
if not host.ip4: |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
69 |
raise HostZoneError(host, "alias4={host.alias4} without ip4=".format(host=host)) |
468
3e7cb8dd5708
pvl.hosts.zone: raise HostZoneError on alias4/alias6 without ip/ip6
Tero Marttila <tero.marttila@aalto.fi>
parents:
467
diff
changeset
|
70 |
|
733
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
71 |
yield pvl.dns.ZoneRecord.A(pvl.dns.relative(origin, host.domain, alias), host.ip4) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
72 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
73 |
for alias in host.alias6: |
468
3e7cb8dd5708
pvl.hosts.zone: raise HostZoneError on alias4/alias6 without ip/ip6
Tero Marttila <tero.marttila@aalto.fi>
parents:
467
diff
changeset
|
74 |
if not host.ip6: |
3e7cb8dd5708
pvl.hosts.zone: raise HostZoneError on alias4/alias6 without ip/ip6
Tero Marttila <tero.marttila@aalto.fi>
parents:
467
diff
changeset
|
75 |
raise HostZoneError(host, "alias6={host.alias6} without ip6=".format(host=host)) |
3e7cb8dd5708
pvl.hosts.zone: raise HostZoneError on alias4/alias6 without ip/ip6
Tero Marttila <tero.marttila@aalto.fi>
parents:
467
diff
changeset
|
76 |
|
495
629fc999cc33
pvl.hosts.zone: alias= labels cannot be out of origin
Tero Marttila <tero.marttila@aalto.fi>
parents:
489
diff
changeset
|
77 |
yield pvl.dns.ZoneRecord.AAAA(pvl.dns.relative(origin, host.domain, alias), host.ip6) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
78 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
79 |
def host_reverse (host, prefix) : |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
80 |
""" |
740
74352351d6f5
replace ipaddr with ipaddress
Tero Marttila <terom@paivola.fi>
parents:
734
diff
changeset
|
81 |
Yield (ipaddress.IPAddress, ZoneRecord) tuples for host within given prefix's reverse-dns zone. |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
82 |
""" |
733
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
83 |
|
734
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
84 |
for sublabel, ip in host.addresses(): |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
85 |
if ip.version != prefix.version: |
733
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
86 |
continue |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
87 |
|
733
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
88 |
if ip not in prefix: |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
89 |
log.debug("%s: %s out of prefix: %s", host, ip, prefix) |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
90 |
continue |
734
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
91 |
|
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
92 |
if ip.version == 4: |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
93 |
# reverse= is IPv4-only |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
94 |
reverse = host.reverse |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
95 |
|
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
96 |
elif prefix.version == 6: |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
97 |
# if reverse= is set, always omit, for lack of reverse6= |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
98 |
reverse = None if host.reverse is None else False |
5770ed34c1f0
pvl.hosts: extension mechanism
Tero Marttila <terom@paivola.fi>
parents:
733
diff
changeset
|
99 |
|
733
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
100 |
# relative label |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
101 |
label = pvl.dns.reverse_label(prefix, ip) |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
102 |
|
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
103 |
if reverse: |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
104 |
alias = pvl.dns.fqdn(reverse) |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
105 |
|
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
106 |
log.info("%s %s[%s]: CNAME %s", host, prefix, ip, alias) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
107 |
|
733
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
108 |
yield ip, pvl.dns.zone.ZoneRecord.CNAME(label, alias) |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
109 |
|
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
110 |
elif reverse is None: |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
111 |
fqdn = host.fqdn() |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
112 |
|
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
113 |
if sublabel: |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
114 |
fqdn = pvl.dns.join(sublabel, fqdn) |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
115 |
|
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
116 |
log.info("%s %s[%s]: PTR %s", host, prefix, ip, fqdn) |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
117 |
|
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
118 |
yield ip, pvl.dns.zone.ZoneRecord.PTR(label, fqdn) |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
119 |
|
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
120 |
else: |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
121 |
log.info("%s %s[%s]: omit", host, prefix, ip) |
45bedeba92e5
pvl.hosts: rename Host.ip -> Host.ip4; support instanced ip.foo = ... for foo.host A .... sub-labels
Tero Marttila <terom@paivola.fi>
parents:
687
diff
changeset
|
122 |
|
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
123 |
def apply_hosts_forward (hosts, origin, |
687
f99f9e3d02cf
pvl.hosts.zone: make non-CNAME check_conflicts optional
Tero Marttila <tero.marttila@aalto.fi>
parents:
686
diff
changeset
|
124 |
add_origin = False, |
f99f9e3d02cf
pvl.hosts.zone: make non-CNAME check_conflicts optional
Tero Marttila <tero.marttila@aalto.fi>
parents:
686
diff
changeset
|
125 |
check_conflicts = False, |
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
126 |
) : |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
127 |
""" |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
128 |
Generate DNS ZoneRecords for for hosts within the given zone origin. |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
129 |
|
472
814cc88c531b
pvl.hosts.zone: stricter name/type + name/CNAME -conflict logic
Tero Marttila <tero.marttila@aalto.fi>
parents:
471
diff
changeset
|
130 |
Verifies that there are no overlapping name/type records, or CNAME records from aliases. |
814cc88c531b
pvl.hosts.zone: stricter name/type + name/CNAME -conflict logic
Tero Marttila <tero.marttila@aalto.fi>
parents:
471
diff
changeset
|
131 |
|
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
132 |
hosts: [Host] - Host's to render |
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
133 |
origin: str - generate records relative to given zone origin |
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
134 |
add_origin: bool - generate an explicit $ORIGIN directive |
687
f99f9e3d02cf
pvl.hosts.zone: make non-CNAME check_conflicts optional
Tero Marttila <tero.marttila@aalto.fi>
parents:
686
diff
changeset
|
135 |
check_conflits: bool- raise HostZoneError on dupliate records for the same name/type |
f99f9e3d02cf
pvl.hosts.zone: make non-CNAME check_conflicts optional
Tero Marttila <tero.marttila@aalto.fi>
parents:
686
diff
changeset
|
136 |
overlapping CNAME records will always raise |
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
137 |
|
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
138 |
Yields ZoneRecords in Host-order |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
139 |
""" |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
140 |
|
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
141 |
if add_origin: |
658
3ecc84d5e779
pvl.hosts.zone: fix add_origin= generated directive
Tero Marttila <terom@paivola.fi>
parents:
506
diff
changeset
|
142 |
yield pvl.dns.ZoneDirective.build('ORIGIN', pvl.dns.fqdn(origin)) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
143 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
144 |
by_name = dict() |
472
814cc88c531b
pvl.hosts.zone: stricter name/type + name/CNAME -conflict logic
Tero Marttila <tero.marttila@aalto.fi>
parents:
471
diff
changeset
|
145 |
by_name_type = dict() |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
146 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
147 |
for host in hosts: |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
148 |
for rr in host_forward(host, origin) : |
472
814cc88c531b
pvl.hosts.zone: stricter name/type + name/CNAME -conflict logic
Tero Marttila <tero.marttila@aalto.fi>
parents:
471
diff
changeset
|
149 |
if (rr.name, 'CNAME') in by_name_type: |
686
6416c448a713
pvl.hosts.zone: better errors for host forward rr conflicts
Tero Marttila <tero.marttila@aalto.fi>
parents:
658
diff
changeset
|
150 |
raise HostZoneError(host, u"{cname} CNAME conflict with {other}".format(cname=rr.name, other=by_name_type[rr.name, 'CNAME'])) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
151 |
elif rr.type == 'CNAME' and rr.name in by_name: |
686
6416c448a713
pvl.hosts.zone: better errors for host forward rr conflicts
Tero Marttila <tero.marttila@aalto.fi>
parents:
658
diff
changeset
|
152 |
raise HostZoneError(host, u"{cname} CNAME conflict with {other}".format(cname=rr.name, other=by_name[rr.name])) |
687
f99f9e3d02cf
pvl.hosts.zone: make non-CNAME check_conflicts optional
Tero Marttila <tero.marttila@aalto.fi>
parents:
686
diff
changeset
|
153 |
elif check_conflicts and (rr.name, rr.type) in by_name_type: |
686
6416c448a713
pvl.hosts.zone: better errors for host forward rr conflicts
Tero Marttila <tero.marttila@aalto.fi>
parents:
658
diff
changeset
|
154 |
raise HostZoneError(host, u"{name} {type} conflict with {other}".format(type=rr.type, name=rr.name, other=by_name_type[rr.name, rr.type])) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
155 |
|
686
6416c448a713
pvl.hosts.zone: better errors for host forward rr conflicts
Tero Marttila <tero.marttila@aalto.fi>
parents:
658
diff
changeset
|
156 |
by_name[rr.name] = host |
6416c448a713
pvl.hosts.zone: better errors for host forward rr conflicts
Tero Marttila <tero.marttila@aalto.fi>
parents:
658
diff
changeset
|
157 |
by_name_type[rr.name, rr.type] = host |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
158 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
159 |
# preserve ordering |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
160 |
yield rr |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
161 |
|
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
162 |
def apply_hosts_reverse (hosts, prefix, |
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
163 |
unknown_host = None, |
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
164 |
unknown_domain = None, |
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
165 |
) : |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
166 |
""" |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
167 |
Generate DNS ZoneRecords within the given prefix's reverse-dns zone for hosts. |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
168 |
|
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
169 |
hosts: [Host] - Host's to render PTRs for |
740
74352351d6f5
replace ipaddr with ipaddress
Tero Marttila <terom@paivola.fi>
parents:
734
diff
changeset
|
170 |
prefix: ipaddress.IPNetwork - IPv4/IPv6 prefix to render PTRs for within associated in-addr.arpa/ip6.arpa zone |
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
171 |
unknown_host: str - render a PTR to the given host @unknown_domain for unassigned IPs within prefix |
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
172 |
unknown_domain: str - required if unknown_host is given |
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
173 |
|
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
174 |
Yields ZoneRecords in IPAddress-order |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
175 |
""" |
474
51983fcda6b1
pvl.hosts.zone: fix and test --unknown-host
Tero Marttila <tero.marttila@aalto.fi>
parents:
472
diff
changeset
|
176 |
|
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
177 |
if unknown_host and not unknown_domain: |
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
178 |
raise ValueError("unknown_host requires unknown_domain=") |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
179 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
180 |
# collect data for records |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
181 |
by_ip = dict() |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
182 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
183 |
for host in hosts: |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
184 |
for ip, rr in host_reverse(host, prefix) : |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
185 |
if ip in by_ip : |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
186 |
raise HostZoneError(host, "{host}: IP {ip} conflict: {other}".format(host=host, ip=ip, other=by_ip[ip])) |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
187 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
188 |
# do not retain order |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
189 |
by_ip[ip] = rr |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
190 |
|
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
191 |
if unknown_host : |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
192 |
# enumerate all of them |
740
74352351d6f5
replace ipaddr with ipaddress
Tero Marttila <terom@paivola.fi>
parents:
734
diff
changeset
|
193 |
iter_ips = prefix.hosts() |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
194 |
else : |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
195 |
iter_ips = sorted(by_ip) |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
196 |
|
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
197 |
for ip in iter_ips : |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
198 |
if ip in by_ip : |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
199 |
yield by_ip[ip] |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
200 |
|
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
201 |
elif unknown_host: |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
202 |
# synthesize a record |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
203 |
label = pvl.dns.reverse_label(prefix, ip) |
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
204 |
fqdn = pvl.dns.fqdn(unknown_host, unknown_domain) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
205 |
|
489
7f1bd12e0d54
pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
487
diff
changeset
|
206 |
log.info("%s %s[%s]: unused PTR %s", unknown_host, ip, prefix, fqdn) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
207 |
|
474
51983fcda6b1
pvl.hosts.zone: fix and test --unknown-host
Tero Marttila <tero.marttila@aalto.fi>
parents:
472
diff
changeset
|
208 |
yield pvl.dns.ZoneRecord.PTR(label, fqdn) |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
209 |
|
474
51983fcda6b1
pvl.hosts.zone: fix and test --unknown-host
Tero Marttila <tero.marttila@aalto.fi>
parents:
472
diff
changeset
|
210 |
else: |
458
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
211 |
continue |
600ad9eb6f25
pvl.hosts.zone: cleanup and split pvl.hosts-forward and pvl.hosts-reverse from pvl.hosts-dns
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
212 |