process_zones($mode ? @zone_cfg_list : @ARGV);
debug_dump('%output_contents');
+
+#-------------------- configuration reading
+
+sub cfg_fail ($) { die "$0: $where:\n $_[0]\n"; }
+
+sub read_config ($) {
+ my ($if) = @_;
+ my ($fh,$z,@self, $dir,$prefix,$suffix,$lprefix,$lsuffix);
+ local ($_);
+
+ $fh= new IO::File $if,'r' or cfg_fail("open $if:\n $!");
+ for (;;) {
+ if (!defined($_= <$fh>)) {
+ cfg_fail("read config file $if:\n $!") if $fh->error();
+ last;
+ }
+ $where= "$if:$.";
+ s/^\s+//; chomp; s/\s+$//;
+ next if m/^\#/;
+ last if m/^end$/;
+ next unless m/\S/;
+ if (m/^self(\-ns|\-soa|)\s+(\S.*\S)/) {
+ @self= split /\s+/, $2;
+ @self_ns= @self if $1 ne '-soa';
+ @self_soa= @self if $1 ne '-ns';
+ } elsif (m/^primary\-dir\s+(\S+)((?:\s+(\S+))??:\s+(\S+))?$/) {
+ ($dir, $prefix, $suffix) = (qualify($1),$2,$3);
+ $suffix= '_db' if !length $suffix;
+ opendir D, $dir or cfg_fail("open primary-dir $dir:\n $!");
+ $lprefix= length $prefix; $lsuffix= length $suffix;
+ while ($!=0, $_= readdir D) {
+ next if m/^\./ && !$lprefix;
+ next unless length > $lprefix+$lsuffix;
+ next unless substr($_,0,$lprefix) eq $prefix;
+ next unless substr($_,length($_)-$lsuffix) eq $suffix;
+ $z= substr($_,$lprefix,length($_)-($lprefix+$lsuffix));
+ zone_conf($z,'primary',"$dir/$_");
+ }
+ $! and cfg_fail("read primary-dir $dir:\n $!");
+ closedir D or cfg_fail("close primary-dir $dir:\n $!");
+ } elsif (m/^primary\s+(\S+)\s+(\S+)$/) {
+ zone_conf($1,'primary',qualify($2));
+ } elsif (m/^secondary\s+(\S+)\s+([0-9.\t]+)$/) {
+ zone_conf($1,'secondary','',$2);
+ } elsif (m/^stealth\s+(\S+)\s+([0-9. \t]+)$/) {
+ zone_conf($1,'stealth','',split /\s+/, $2);
+ } 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")
+ if @zone_cfg_list && length $default_output;
+ set_output(qualify($1));
+ } elsif (m/^include\s+(\S+)$/) {
+ read_config($1);
+ } else {
+ cfg_fail("unknown configuration directive".
+ " or incorrect syntax or arguments");
+ }
+ }
+ $fh->close or cfg_fail("close config file $if:\n $!");
+}
+
+sub qualify ($) {
+ my ($i) = @_;
+ $i= "$default_dir/$i" unless $i =~ m,^/,;
+}
+
+sub zone_conf ($$@) {
+ my ($zone,$style,$file,@servers) = @_;
+ $file= qualify("$slave_dir/$slave_prefix".$zone.$slave_suffix)
+ unless length $file;
+ if (!length $output) {
+ $default_output= qualify('chiark-conf-gen.bind8')
+ unless length $default_output;
+ set_output($default_output);
+ }
+ cfg_fail("redefined zone $zone") if exists $zone_cfg{$zone};
+ $zone_cfg{$zone}{'file'}= $file;
+ $zone_cfg{$zone}{'style'}= $style;
+ $zone_cfg{$zone}{'servers'}= [ @servers ];
+ $zone_cfg{$zone}{'self_soa'}= [ @self_soa ];
+ $zone_cfg{$zone}{'self_ns'}= [ @self_ns ];
+ $zone_cfg{$zone}{'output'}= $output;
+ push @zone_cfg_list, $zone;
+}
+
+sub set_output($) {
+ my ($newout) = @_;
+ $output= $newout;
+ $output_contents{$output}= '';
+}
+
+
+#-------------------- checking
+
use vars qw($zone $cfg $warnings);
$warnings= 0;
local ($zone,$cfg);
foreach $zone (@zones) {
- $cfg= $zone_cfg{$zone} || { 'style' => 'foreign' };
+ $cfg= $zone_cfg{$zone} || {
+ 'style' => 'foreign',
+ 'servers' => [ ],
+ };
progress(sprintf "%-40s %s", $zone, $$cfg{'style'});
if ($check) {
eval { zone_check() };
%soas # $soa{"$origin $serial"} = [ $whosaidandwhy ]
@to_check # ($addr,$whyask,\%delgs_or_auths,$glueless_ok, ...)
@to_check_soa # ($addr,$whyask, ...)
+ %addr_is_ok
);
sub zone_check () {
}
sub zone_consistency() {
- my ($d);
+ my ($d, $org_ser, $origin, $a, $showok);
zone_consistency_set('delegations',%delgs);
foreach $d (keys %delgs) { delete $auths{$d}; }
zone_consistency_set('zone nameserver rrset',%auths);
foreach $h (keys %glue) {
zone_consistency_set("glue for $h", %{ $glue{$h} });
}
+ zone_consistency_set("SOA ORIGIN and SERIAL",%soas);
+ if ($cfg->{'style'} eq 'primary') {
+ 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(s) @self_soa not in SOA ORIGIN $origin,".
+ " eg from ".((values %{ $soas{$org_ser} })[1]));
+ }
+ }
+ $showok= 0;
+ foreach $a (@{ $cfg->{'servers'} }) {
+ next if $addr_is_ok{$a};
+ zone_warning("we slave from $a"); $showok=1;
+ }
+ if ($showok) {
+ zone_warnmore("we must slave from one of ".
+ join ' ', keys %addr_is_ok);
+ }
}
sub zone_consistency_set ($\%) {
$lame= $dig::rdata =~ m/ aa / ? 'lame' : '';
} elsif ($dig::type eq 'soa' && $dig::owner eq $zone && !$lame) {
die "several SOAs ? $why" if defined $origin;
- $dig::rdata =~ m/^(\S+) \S+ (\d+) /
- or die "soa $dig::rdata ? $why";
+ $got= $dig::rdata;
+ $got =~ m/^(\S+) \d+/ or die "$got ?";
$origin= $1;
- $got= "$1 $2";
}
},
$zone,'soa',$uaddr);
push @{ $soas{$got} }, $why;
($rcode,@soa_addrs)= lookup($origin,'a','0');
foreach $soa_addr (@soa_addrs) {
+ $addr_is_ok{$soa_addr}= 1;
push @to_check,
$soa_addr,
"addr for $origin, SOA ORIGIN from $why";
$dig::rdata,
"glue for $dig::owner, from (eg) $why",
\%auths, 0;
+ $addr_is_ok{$dig::rdata}= 1 if $cfg->{'style'} eq 'stealth';
push @{ $s2g{$dig::rdata} }, $dig::rdata;
}
},
push @{ $nsrrset_ref->{$s} }, $why;
}
+
+#-------------------- outputting
+
sub zone_output () {
$output_contents{$$cfg{'output'}}.=
sprintf(<<'END',
$$cfg{'file'});
}
+
+#-------------------- general utilities
+
sub debug_dump ($) {
my ($vn);
return unless $debug;
}
}
-sub cfg_fail ($) { die "$0: $where:\n $_[0]\n"; }
-
-sub read_config ($) {
- my ($if) = @_;
- my ($fh,$z,@self, $dir,$prefix,$suffix,$lprefix,$lsuffix);
- local ($_,$1,$2,$3);
-
- $fh= new IO::File $if,'r' or cfg_fail("open $if:\n $!");
- for (;;) {
- if (!defined($_= <$fh>)) {
- cfg_fail("read config file $if:\n $!") if $fh->error();
- last;
- }
- $where= "$if:$.";
- s/^\s+//; chomp; s/\s+$//;
- next if m/^\#/;
- last if m/^end$/;
- next unless m/\S/;
- if (m/^self(\-ns|\-soa|)\s+(\S.*\S)/) {
- @self= split /\s+/, $2;
- @self_ns= @self if $1 ne '-soa';
- @self_soa= @self if $1 ne '-ns';
- } elsif (m/^primary\-dir\s+(\S+)((?:\s+(\S+))??:\s+(\S+))?$/) {
- ($dir, $prefix, $suffix) = (qualify($1),$2,$3);
- $suffix= '_db' if !length $suffix;
- opendir D, $dir or cfg_fail("open primary-dir $dir:\n $!");
- $lprefix= length $prefix; $lsuffix= length $suffix;
- while ($!=0, $_= readdir D) {
- next if m/^\./ && !$lprefix;
- next unless length > $lprefix+$lsuffix;
- next unless substr($_,0,$lprefix) eq $prefix;
- next unless substr($_,length($_)-$lsuffix) eq $suffix;
- $z= substr($_,$lprefix,length($_)-($lprefix+$lsuffix));
- zone_conf($z,'primary',"$dir/$_");
- }
- $! and cfg_fail("read primary-dir $dir:\n $!");
- closedir D or cfg_fail("close primary-dir $dir:\n $!");
- } elsif (m/^primary\s+(\S+)\s+(\S+)$/) {
- zone_conf($1,'primary',qualify($2));
- } elsif (m/^secondary\s+(\S+)\s+([0-9.\t]+)$/) {
- zone_conf($1,'secondary','',$2);
- } elsif (m/^stealth\s+(\S+)\s+([0-9. \t]+)$/) {
- zone_conf($1,'stealth','',split /\s+/, $2);
- } 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")
- if @zone_cfg_list && length $default_output;
- set_output(qualify($1));
- } elsif (m/^include\s+(\S+)$/) {
- read_config($1);
- } else {
- cfg_fail("unknown configuration directive".
- " or incorrect syntax or arguments");
- }
- }
- $fh->close or cfg_fail("close config file $if:\n $!");
-}
-
-sub qualify ($) {
- my ($i) = @_;
- $i= "$default_dir/$i" unless $i =~ m,^/,;
-}
-
-sub zone_conf ($$@) {
- my ($zone,$style,$file,@servers) = @_;
- $file= qualify("$slave_dir/$slave_prefix".$zone.$slave_suffix)
- unless length $file;
- if (!length $output) {
- $default_output= qualify('chiark-conf-gen.bind8')
- unless length $default_output;
- set_output($default_output);
- }
- cfg_fail("redefined zone $zone") if exists $zone_cfg{$zone};
- $zone_cfg{$zone}{'file'}= $file;
- $zone_cfg{$zone}{'style'}= $style;
- $zone_cfg{$zone}{'servers'}= [ @servers ];
- $zone_cfg{$zone}{'self_soa'}= [ @self_soa ];
- $zone_cfg{$zone}{'self_ns'}= [ @self_ns ];
- $zone_cfg{$zone}{'output'}= $output;
- push @zone_cfg_list, $zone;
-}
-
-sub set_output($) {
- my ($newout) = @_;
- $output= $newout;
- $output_contents{$output}= '';
+sub debug_trace ($) {
+ return unless $debug;
+ print "D $_[0]\n";
}
sub lookup ($$$) {
return ($?,@result);
}
+
+package dig;
+
+use vars $owner, $type, $rdata;
+
+sub dig (&$$$) {
+ my ($eachrr, $qowner,$qtype,$qaddr) = @_;
+ # also pseudo-rr with type `flags:'
+ my ($h,$inmid);
+ local ($_);
+
+ $h= new IO::Handle;
+ defined($c= open $h, "-|") or die "$0: fork dig:\n $!\n";
+ if (!$c) {
+ exec ('dig',
+ '+nodef','+nosea','+nodebug','+norecurse',
+ "\@$qaddr",'-t',$qtype,$qowner);
+ die "$0: exec dig:\n $!\n";
+ }
+ $inmid='';
+ for (;;) {
+ if (!defined($_= $h->getline())) {
+ $h->error() and die "$0: read from dig:\n $!\n";
+ last;
+ }
+ chomp;
+ if (length $inmid) {
+ s/^\s+/ / or die "$inmid // $_ ?";
+ s/\;.*$//;
+ $_= $inmid.$_;
+ $inmid='';
+ s/$/ \(/ unless s/\s*\)$//;
+ }
+ if (s/\s*\($//) { $inmid= $_; next; }
+ if (m/^\;\; flags\:( [-0-9a-z ]+)\;/) {
+ $owner=''; $type='flags:'; $rdata= "$1 ";
+ { package main; &$dig::eachrr; };
+ } elsif (m/^\;/) {
+ } elsif (!m/\S/) {
+ } elsif (m/^([-.0-9a-z]+)\s+\d\w+\s+IN\s+([A-Z]+)\s+(\S.*)/) {
+ $owner=$1; $type=$2; $rdata=$3;
+ if ($type eq 'A') {
+ $rdata =~ m/^[.0-9]$/ or die;
+ } elsif ($type eq 'NS') {
+ $rdata =~ m/^[-.0-9a-z]+$/ or die "bad nameserver $rdata ?";
+ $rdata= lc $rdata;
+ } elsif ($type eq 'SOA') {
+ $rdata =~ m/^([-.0-9a-z]+)\s+.*\s+(\d+)(?:\s+\d\w+){4}$/
+ or die "bad SOA $rdata ?";
+ $rdata= (lc $1).$2;
+ } else {
+ debug_trace("ignoring uknown RR type $rtype");
+ next;
+ }
+ { package mina; &$dig::eachrr; }
+ } else {
+ debug_trace("ignoring unknown dig output $_");
+ }
+ }
+ $h->close or die $!;
+}
+
__DATA__
~ian / chiark-utils.git / blobdiff