dnsbl: Add ZONEMD records to the exported zones

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/dnsbl/exporters.py b/src/dnsbl/exporters.py
index 731feb84ddfe91fc7d53019bf1db6e0954925826..ca24ba1e1ac8276d7464f3d7a7ebd75513afe6e9 100644 (file)
--- a/src/dnsbl/exporters.py
+++ b/src/dnsbl/exporters.py
@@ -121,6 +121,9 @@ class RPZExporter(Exporter):
                # Create a new zone
                zone = dns.zone.Zone(origin)
 
+               # Make the serial
+               serial = self.list.updated_at.strftime("%s")
+
                # Create the SOA
                soa = dns.rdataset.from_text(
                        dns.rdataclass.IN,
@@ -129,7 +132,7 @@ class RPZExporter(Exporter):
                        " ".join((
                                "master.lwldns.net.",
                                "hostmaster.ipfire.org.",
-                               self.list.updated_at.strftime("%s"),
+                               serial,
                                "3600",
                                "600",
                                "3600000",
@@ -143,11 +146,38 @@ class RPZExporter(Exporter):
                # Write all domains
                for domain in self.list.domains:
                        zone.replace_rdataset(
-                               dns.name.from_text("%s.%s" % (domain, self.list.zone)),
+                               dns.name.from_text("%s.%s" % (domain, self.list.zone), origin=origin),
                                dns.rdataset.from_text(
                                        dns.rdataclass.IN, dns.rdatatype.CNAME, ttl, rpz_action,
                                ),
                        )
 
+               # Add ZONEMD
+               self.add_zonemd(zone, ttl)
+
                # Write the zone to file
                zone.to_file(f)
+
+       def add_zonemd(self, zone, ttl):
+               """
+                       Adds ZONEMD records to the zone
+               """
+               # Create a new ZONEMD record
+               rrset = dns.rdataset.Rdataset(
+                       dns.rdataclass.IN, dns.rdatatype.ZONEMD, ttl=ttl,
+               )
+
+               # Compute the digest for SHA-512 and SHA-384
+               algorithms = (
+                       dns.zone.DigestHashAlgorithm.SHA512,
+                       dns.zone.DigestHashAlgorithm.SHA384,
+               )
+
+               # Compute the digests
+               for algorithm in algorithms:
+                       rrset.add(
+                               zone.compute_digest(algorithm),
+                       )
+
+               # Add the ZONEMD record
+               zone.replace_rdataset(zone.origin, rrset)