adding dnssec support

DDNS.pm

@@ -8,7 +8,7 @@ use Memoize;
 
 memoize('_gethosts');
 
-our $VERSION = '0.2';
+our $VERSION = '0.3';
 
 sub new {
     my $me = shift;
@@ -24,7 +24,7 @@ sub _validateTypeOrDie {
     my ($t) = @_;
 
     die "Invalid type"
-	unless ($t =~ /^_(vhosts|pureslave|custom)$/);
+	unless ($t =~ /^_(vhosts|pureslave|custom|dnssec)$/);
 }
 
 sub _fqdn {
@@ -127,6 +127,7 @@ sub _gethosts {
 # Find the type of domin that $dom is. If we don't find it, return
 # undef.  (The domain $dom ends in a dot; the DNS info we find won't;
 # hence the concat of the extra "." after the lc.)
+# (Skip _dnssec records in this check.)
 sub type {
     my ($this, $dom) = @_;
 
@@ -135,7 +136,8 @@ sub type {
     my @vh = $this->get();
     foreach my $i (@vh) {
 	if (lc($i->{zone})."." eq lc($dom)) {
-	    return $i->{type};
+	    return $i->{type}
+	    unless ($i->{type} eq '_dnssec');
 	}
     }
 
@@ -148,8 +150,10 @@ sub add {
     _validateOrDie($dom);
     my $fqdn = _fqdn($dom, $type);
 
-    if (my $type = $this->type($dom)) {
-	die "Domain $dom already exists [of type $type]";
+    if (my $existingtype = $this->type($dom)) {
+	die "Domain $dom already exists [of type $existingtype]"
+	    unless ($existingtype eq '_dnssec' ||
+		    $type eq '_dnssec');
     }
     
     $this->__docmd("update add $fqdn 60 TXT $master");
@@ -180,4 +184,19 @@ sub cleanup {
     system("/usr/local/bin/sync-master-vhosts");
 }
 
+sub is_dnssec {
+    my ($this, $dom) = @_;
+    
+    $dom =~ s/^(.+)\.$/$1/; # remove trailing dot
+
+    my @h = $this->_gethosts('_dnssec');
+    foreach my $i (@h) {
+	if (lc($i->{zone}) eq $dom) {
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+
 1;

Makefile.PL

@@ -21,6 +21,8 @@ WriteMakefile(
 			'bin/list-all',
 			'bin/is-managed',
 			'bin/validate-master',
+			'bin/add-dnssec',
+			'bin/del-ddnssec',
     ],
     'AUTHOR'       => 'Jorj Bauer <jorj@jorj.org>',
     );

bin/sync-master-vhosts

@@ -37,7 +37,11 @@ if ($changecount) {
     # If we made any changes, then generate the full vhost list
     my ($fh, $path) = tempfile();
     foreach my $i (sort {$a->{zone} cmp $b->{zone}} @vh) {
-	print $fh "zone \"$i->{zone}\" { type master; file \"/var/lib/bind/vhost/db.$i->{zone}\"; };\n";
+	if ($ddns->is_dnssec($i->{zone})) {
+	    print $fh "zone \"$i->{zone}\" { type master; file \"/var/lib/bind/vhost/db.$i->{zone}.signed\"; };\n";
+	} else {
+	    print $fh "zone \"$i->{zone}\" { type master; file \"/var/lib/bind/vhost/db.$i->{zone}\"; };\n";
+	}
     }
     close $fh;
     print "Installing new vhost list\n";

bin/sync-slave

@@ -53,7 +53,11 @@ sub do_rewrite {
     print "Differences found; rewriting slave file.\n";
     
     foreach my $i (sort {$a->{zone} cmp $b->{zone}} @vh) {
-	print $fh "zone \"$i->{zone}\" { type slave; file \"/var/cache/bind/db.$i->{zone}\"; masters { $i->{master}; }; };\n";
+	if ($ddns->is_dnssec($i->{zone})) {
+	    print $fh "zone \"$i->{zone}\" { type slave; file \"/var/cache/bind/db.$i->{zone}.signed\"; masters { $i->{master}; }; };\n";
+	} else {
+	    print $fh "zone \"$i->{zone}\" { type slave; file \"/var/cache/bind/db.$i->{zone}\"; masters { $i->{master}; }; };\n";
+	}
     }
     close $fh;
     print "Installing new slave host list\n";