use strict;
use IO::File;
use Data::Dumper;
+use POSIX;
use vars qw($quis
$mode $doall
" -v --verbose extra verbose\n";
}
-cfg_fail("config filename $etcfile should have been absolute path of a file")
- unless $etcfile =~ m,^/, && $etcfile !~ m,/$,;
+cfg_fail("config filename $etcfile should not be directory")
+ if $etcfile =~ m,/$,;
use vars qw($default_dir);
-$default_dir= $etcfile;
-$default_dir =~ s,/[^/]+$,,;
+$default_dir= $etcfile =~ m,^.*/, ? $& : './';
use vars qw($slave_dir $slave_prefix $slave_suffix);
$slave_dir= 'slave';
$slave_prefix= '';
$slave_suffix= '';
-use vars qw(@self_ns @self_soa);
-@self_ns= @self_soa= ();
+use vars qw(@self_ns @self_soa @self_addr);
+@self_ns= @self_soa= @self_addr= ();
use vars qw(%zone_cfg @zone_cfg_list);
%zone_cfg= ();
debug_dump('@zone_cfg_list %zone_cfg');
process_zones($mode ? @zone_cfg_list : @ARGV);
debug_dump('%output_contents');
+output_files() if $install;
exit 0;
sub read_config ($) {
my ($if) = @_;
- my ($fh,$z,@self, $dir,$prefix,$suffix,$lprefix,$lsuffix);
+ my ($fh,$z,@self,$before,
+ $mod,$dir,$prefix,$suffix,$subfile,$lprefix,$lsuffix,$zf);
local ($_);
$fh= new IO::File $if,'r' or cfg_fail("open $if:\n $!");
+ $before= '';
for (;;) {
if (!defined($_= <$fh>)) {
cfg_fail("read config file $if:\n $!") if $fh->error();
last;
}
+ chomp; s/\s+$//;
+ if (m/\\$/) { $before.= $_; next; }
+ $_= $before.$_;
+ $before= '';
+ s/^\s+//;
$where= "$if:$.";
- s/^\s+//; chomp; s/\s+$//;
next if m/^\#/;
last if m/^end$/;
next unless m/\S/;
@self_ns= @self if $1 ne '-soa';
@self_soa= @self if $1 ne '-ns';
} elsif (m/^self\-addr\s+([0-9. \t]+)/) {
- @self_addr= split /\s+/, $2;
- } elsif (m/^primary\-dir([*?]?)\s+(\S+)((?:\s+(\S+))?:\s+(\S+))?$/) {
- ($mod, $dir, $prefix, $suffix) = ($1,qualify($2),$3,$4);
- $suffix= '_db' if !defined $suffix;
- $prefix= '' if !defined $prefix;
+ @self_addr= split /\s+/, $1;
+ } elsif (m,^
+ primary\-dir ([*?]?)
+ \s+ (\S+)/([^/ \t]*)
+ (?: \s+ ([^/ \t]*) (?: (/.+) )?
+ )?
+ $,x) {
+ ($mod, $dir, $prefix, $suffix, $subfile) =
+ ($1,qualify($2),$3,$4,$5);
+ $suffix= '' if !defined $suffix;
+ $subfile= '' if !defined $subfile;
+ $suffix= '_db' if !length $suffix && !length $subfile;
+ if (-d "$dir/$prefix") { $dir.='/'; $dir.=$prefix; $prefix=''; }
opendir D, $dir or cfg_fail("open primary-dir $dir:\n $!");
$lprefix= length $prefix; $lsuffix= length $suffix;
while (defined($_= readdir D)) {
next unless substr($_,0,$lprefix) eq $prefix;
next unless substr($_,length($_)-$lsuffix) eq $suffix;
$z= substr($_,$lprefix,length($_)-($lprefix+$lsuffix));
- zone_conf($z,'primary',"p$mod","$dir/$_");
+ $zf= $dir.'/'.$prefix.$z.$suffix.$subfile;
+ if (!stat $zf) {
+ next if length $subfile && $! == &ENOENT;
+ cfg_fail("cannot stat zonefile $zf:\n $!");
+ }
+ -f _ or cfg_fail("zonefile $zf is not a plain file");
+ zone_conf($z,'primary','p',$mod,$zf);
}
closedir D or cfg_fail("close primary-dir $dir:\n $!");
} elsif (m/^primary([*?]?)\s+(\S+)\s+(\S+)$/) {
- zone_conf($2,'primary',"p$1",qualify($3));
+ zone_conf($2,'primary','p',$1,qualify($3));
} elsif (m/^published([*?]?)\s+(\S+)\s+([0-9.\t]+)$/) {
- zone_conf($2,'published',"s$1",'',$3);
+ zone_conf($2,'published','s',$1,'',$3);
} elsif (m/^stealth([*?]?)\s+(\S+)\s+([0-9. \t]+)$/) {
- zone_conf($2,'stealth',"u$1",'',split /\s+/, $3);
- } elsif (m/^slave\-dir\s+(\S+)((?:\s+(\S+))?:\s+(\S+))?$/) {
+ zone_conf($2,'stealth','u',$1,'',split /\s+/, $3);
+ } elsif (m/^slave\-dir\s+(\S+)(?:(?:\s+(\S+))\s+(\S+))?$/) {
($slave_dir, $slave_prefix, $slave_suffix) = (qualify($1),$2,$3);
} elsif (m/^output\s+bind8\+(\S+)$/) {
cfg_fail("default output may not apply to only some zones")
sub qualify ($) {
my ($i) = @_;
- $i= "$default_dir/$i" unless $i =~ m,^/,;
+ $i= "$default_dir$i" unless $i =~ m,^/,;
return $i;
}
-sub zone_conf ($$$@) {
- my ($zone,$style,$s,$file,@servers) = @_;
+sub zone_conf ($$$$$@) {
+ my ($zone,$style,$sabbr,$mod,$file,@servers) = @_;
+ my ($sfx,$aref);
$file= qualify("$slave_dir/$slave_prefix".$zone.$slave_suffix)
unless length $file;
if (!length $output) {
unless length $default_output;
set_output($default_output);
}
- cfg_fail("redefined zone $zone") if exists $zone_cfg{$zone};
+ cfg_fail("redefined zone $zone\n".
+ " earlier definition $zone_cfg{$zone}{'where'}")
+ if exists $zone_cfg{$zone};
+ $zone_cfg{$zone}{'where'}= $where;
$zone_cfg{$zone}{'file'}= $file;
$zone_cfg{$zone}{'style_p'}= $style.$mod;
- $zone_cfg{$zone}{'s'}= $s; # p)rimary s)econdary u)npublished f)oreign
+ $zone_cfg{$zone}{'s'}= $sabbr.$mod; # p)rimary s)econdary u)npub f)oreign
$zone_cfg{$zone}{'servers'}= [ @servers ];
- $zone_cfg{$zone}{'self_soa'}= [ @self_soa ];
- $zone_cfg{$zone}{'self_ns'}= [ @self_ns ];
+ foreach $sfx (qw(soa ns addr)) {
+ { no strict 'refs'; $aref= [ @{ "self_$sfx" } ]; }
+ @$aref or cfg_fail("failed to specify self-$sfx before zone");
+ $zone_cfg{$zone}{"self_$sfx"}= $aref;
+ }
$zone_cfg{$zone}{'output'}= $output;
push @zone_cfg_list, $zone;
}
'servers' => [ ],
};
progress(sprintf "%-40s %s", $zone, $$cfg{'style_p'});
- if ($check && ($doall || $cfg{'s'} !~ m/\?/)) {
+ if ($check && ($doall || $cfg->{'s'} !~ m/\?/)) {
eval {
if ($localonly && $cfg->{'s'} =~ m/f/) {
zone_warning("foreign zone specified with -l");
};
zone_warning("checks failed: $@") if length $@;
}
- zone_output() if $install;
+ $output_contents{$$cfg{'output'}} .= zone_output()
+ if $install;
}
print STDERR "$quis: $warnings warnings\n" or die $!
if $warnings;
}
sub zone_warnmore ($) {
- print STDERR " $_[0]\n" or die $!;
+ print STDERR "$zone: $_[0]\n" or die $!;
}
use vars qw(%delgs); # $delgs{$nameserver_list} = [ $whosaidandwhy ]
use vars qw(%auths); # $auths{$nameserver_list} = [ $whosaidandwhy ]
use vars qw(%glue); # $glue{$name}{$addr_list} = [ $whosaidandwhy ]
use vars qw(%soas); # $soa{"$origin $serial"} = [ $whosaidandwhy ]
-use vars qw(%addr_is_ok %gluelesswarned);
+use vars qw(%addr_is_ok %warned_glueless %warned_mynameaddr);
+use vars qw($delg_to_us);
use vars qw(@to_check); # ($addr,$whyask,$is_auth,$glueless_ok, ...)
use vars qw(@to_check_soa); # ($addr,$whyask, ...)
}
sub zone_reset() {
- %delgs= %auths= %glue= %soas= %gluelesswarned= %addr_is_ok= ();
+ %delgs= %auths= %glue= %soas=
+ %warned_glueless= %warned_mynameaddr=
+ %addr_is_ok= ();
+ $delg_to_us= 0;
@to_check= @to_check_soa= ();
}
$is_auth, $glueless_ok);
} elsif (($addr,$wa,@to_check_soa) = @to_check_soa) {
next if $soa_checked{$addr}++;
- zone_check_soa($addr,"[$addr] $wa");
+ zone_check_soa($addr,"[$addr] $wa","[$addr] NS");
} else {
last;
}
sub zone_check_nsrrset ($$$$) {
my ($uaddr,$ww, $is_auth, $glueless_ok) = @_;
- my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths);
+ my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths, $wwn);
verbose("checking delegation by $ww");
dig(sub {
if ($dig_type eq 'ns' && $dig_owner eq $zone) {
$s2g{lc $dig_rdata} = [ ];
} elsif ($dig_type eq 'a' && exists $s2g{$dig_owner}) {
- push @to_check,
- $dig_rdata,
- "$dig_owner, in glue from $ww",
- 1, 0;
- zone_server_addr($dig_rdata,$dig_owner,"NS [$uaddr]");
+ $wwn= "in glue from $ww";
+ push @to_check, $dig_rdata, "$dig_owner, $wwn", 1, 0;
+ zone_server_addr($dig_rdata,$dig_owner,$wwn,"NS [$uaddr]",0);
push @{ $s2g{$dig_owner} }, $dig_rdata;
}
},
($needglue<=1 ? " (eg)" : "").
" from $ww")
unless $glueless_ok || !$needglue ||
- ($needglue<=1 && $gluelesswarned{$s}++);
+ ($needglue<=1 && $warned_glueless{$s}++);
next;
}
$glue= join ' ', sort @glue;
push @{ $delgs_or_auths->{$s} }, $ww;
}
-sub zone_server_addr ($$$$) {
- my ($addr,$name,$ww,$is_soa) = @_;
- $addr_is_ok{$addr}= "$name ($ww)"
- if $is_soa || $cfg{'s'} =~ m/u/;
+sub zone_server_addr ($$$$$) {
+ my ($addr,$name,$ww,$wwq,$is_soa) = @_;
+ $addr_is_ok{$addr}= "$name ($wwq)"
+ if $is_soa || $cfg->{'s'} =~ m/u/;
zone_warning("configured as stealth but we [$addr]".
- " are published ($name $ww)")
+ " are published ($name $wwq)")
if $cfg->{'s'} =~ m/u/ && grep { $_ eq $addr } @self_addr;
+
+ my ($name_is_self, $addr_is_self);
+ $name_is_self= grep { $_ eq $name }
+ @{ $cfg->{$is_soa ? 'self_soa' : 'self_ns'} };
+ $addr_is_self= grep { $_ eq $addr }
+ @{ $cfg->{'self_addr'} };
+ if ($name_is_self && !$addr_is_self) {
+ zone_warning("our name $name with wrong address [$addr], (eg) $ww")
+ unless $warned_mynameaddr{$name}{$addr}++;
+ } elsif (!$name_is_self && $addr_is_self) {
+ zone_warning(($is_soa ? "SOA ORIGIN maps to" : "allegedly served by").
+ " us [$addr] with wrong name $name, (eg) $ww")
+ unless $warned_mynameaddr{$name}{$addr}++;
+ }
+ $delg_to_us=1 if $name_is_self;
}
-sub zone_check_soa ($$) {
- my ($uaddr,$ww) = @_;
- my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr);
- verbose("checking service at $ww");
+sub zone_check_soa ($$$) {
+ my ($uaddr,$ww,$wwq) = @_;
+ my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr,$wwn);
+ verbose("checking service at $wwq");
$lame= 'dead or lame';
dig(sub {
if ($dig_type eq 'flags:') {
push @{ $soas{$got} }, $ww;
($rcode,@soa_addrs)= lookup($origin,'a','0');
foreach $soa_addr (@soa_addrs) {
- zone_server_addr($addr,$origin,"SOA [$uaddr]"
- push @to_check,
- $soa_addr,
- "$origin, SOA ORIGIN from $ww";
+ $wwn= "SOA ORIGIN from $ww";
+ zone_server_addr($soa_addr,$origin,$wwn,"SOA [$uaddr]",1);
+ push @to_check, $soa_addr, "$origin, $wwn";
}
}
sub zone_consistency() {
- my ($d, $org_ser, $origin, $a, $h);
+ my ($d, $org_ser, $origin, $a, $h, $self_soa);
zone_consistency_set('delegations',\%delgs);
foreach $d (keys %delgs) { delete $auths{$d}; }
zone_consistency_set('zone nameserver rrset',\%auths);
zone_consistency_set("glue for $h", $glue{$h});
}
zone_consistency_set("SOA ORIGIN and SERIAL",\%soas);
+ $self_soa= $cfg->{'self_soa'};
if ($cfg->{'s'} =~ m/p/) {
foreach $org_ser (keys %soas) {
$org_ser =~ m/^(\S+) \d+$/ or die "$org_ser ?";
$origin= $1;
- next if grep { $_ eq $origin } @self_soa;
- zone_warning("our name (@self_soa) not in SOA ORIGIN $origin,".
- " eg from ".((values %{ $soas{$org_ser} })[1]));
+ next if grep { $_ eq $origin } @$self_soa;
+ zone_warning("SOA ORIGIN $origin is not our name (@$self_soa),".
+ " eg from ".($soas{$org_ser}[0]));
}
}
}
}
}
}
+ if ($cfg->{'s'} =~ m/s/ && !$delg_to_us) {
+ zone_warning("we are supposedly published secondary,".
+ " but not listed as a nameserver");
+ }
}
sub zone_consistency_set ($%) {
my ($rcode,@nsnames,$ns,@soas,$origin);
($rcode,@nsnames)= lookup($zone,'ns-','0');
- foreach $ns (@nsnames) { zone_server_simple($ns,'NS'); }
+ foreach $ns (@nsnames) { zone_server_simple($ns,'NS',0); }
($rcode,@soas)= lookup($zone,'soa','0');
die "multiple SOA RRs in set! @soas ?" if @soas!=1;
$soas[0] =~ m/^(\S+)\s/ or die "SOA ? $_";
- zone_server_simple(domain_canon($1),'SOA');
+ zone_server_simple(domain_canon($1),'SOA',1);
}
-sub zone_server_simple ($$) {
- my ($name,$why) = @_;
+sub zone_server_simple ($$$) {
+ my ($name,$ww,$is_soa) = @_;
my ($rcode,@addrs,$addr);
($rcode,@addrs)= lookup($name,'a','0');
- foreach $addr (@addrs) { zone_server_addr($addr,$name,$why); }
+ foreach $addr (@addrs) { zone_server_addr($addr,$name,$ww,$ww,$is_soa); }
}
#-------------------- outputting
sub zone_output () {
- $output_contents{$$cfg{'output'}}.=
- sprintf(<<'END',
-zone "%s" {
- type %s;
- file "%s";
-};
-END
- $zone,
- $$cfg{'s'} =~ m/p/ ? 'master' : 'slave',
- $$cfg{'file'});
+ my ($o);
+
+ $o= "zone \"$zone\" {\n";
+ if ($$cfg{'s'} =~ m/p/) {
+ $o.= " type master\n";
+ } else {
+ $o.= " type slave\n".
+ " masters {\n";
+ foreach $m (@{ $cfg{'servers'} }) { $o.= " $m;\n"; }
+ $o.= " };\n";
+ }
+ return $o;
}
+sub output_files () {
+ my ($fn,$ofn,$mfn,$l,$dir, $maxmode,$h,@to_install);
+
+ foreach $ofn (keys %output_contents) {
+ $fn= $ofn; $mfn= "output file $fn";
+ for (;;) {
+ if (!lstat $fn) {
+ $! == &ENOENT or die "$quis: stat $mfn:\n $!\n";
+ $maxmode= 0666;
+ last;
+ } elsif (-f _) {
+ $maxmode= (stat _)[2];
+ last;
+ } elsif (-l _) {
+ defined($l= readlink $fn)
+ or die "$quis: readlink $mfn:\n $!\n";
+ $dir= $fn =~ m,^.*/, ? $& : './';
+ $fn= "$dir$l" unless $l =~ m,^/,;
+ $mfn= "output file $fn (symlink target of $ofn)";
+ } else {
+ die "$quis: output file $mfn exists but is not a file".
+ " (or symlink to one)";
+ }
+ }
+ unlink "$fn.new" or $! == &ENOENT or
+ die "$quis: cannot clear out old .new version of $mfn:\n $!";
+ $h= new IO::File "$fn.new",'w',$maxmode
+ or die("$quis: create .new version of $mfn:\n $!");
+ print $h
+ "# generated by $quis, do not edit\n",
+ $output_contents{$ofn}
+ or die "$quis: write data to .new version of $mfn:\n $!";
+ $h->close
+ or die "$quis: close .new version of $mfn:\n $!";
+ push @to_install, $fn,$mfn;
+ }
+
+ while (($fn,$mfn, @to_install) = @to_install) {
+ rename "$fn.new",$fn
+ or die "$quis: install new version of $mfn:\n $!";
+ }
+}
#-------------------- general utilities
$h->error and die "$quis: read from adnshost:\n $!\n";
chomp @result;
$!=0; $h->close;
- die "$quis: lookup -t$type $domain $okrcodes failed $? $!\n"
+ die "$quis: lookup -t$type $domain $okrcodes failed $? $! @result\n"
if $! or $?>6 or index($okrcodes,$?)<0;
debug_trace("lookup <== $? @result");
return ($?,@result);