use strict;
use IO::File;
use Data::Dumper;
+use POSIX;
-use vars qw($etcfile $where);
-$etcfile= "/etc/bind/chiark-conf-gen.zones";
-$where= '<built-in>';
+use vars qw($quis
+ $mode $doall
+ $etcfile $where
+ $debug $needglue $localonly $verbosity);
+
+$quis= $0; $quis =~ s,.*/,,;
-use vars qw($mode $verbosity $debug);
$mode= '';
-$verbosity= 1;
+$doall= 0;
+$etcfile= "/etc/bind/chiark-conf-gen.zones";
+$where= '<built-in>';
$debug= 0;
+$needglue= 1;
+$localonly= 0;
+$verbosity= 1;
+$repeat= 0;
+
+use vars qw($dig_owner $dig_type $dig_rdata);
while (@ARGV && $ARGV[0] =~ m/^\-/) {
$_= shift @ARGV;
if (s/^\-\-//) {
last if m/^$/;
- if (m/^quiet$/) { $verbosity=0; }
- elsif (m/^verbose$/) { $verbosity=2; }
- elsif (m/^(yes|no|force)$/) { m/^./; $mode= $&; }
+ if (m/^(yes|no|force)$/) { m/^./; $mode= $&; }
+ elsif (m/^all$/) { $doall=1; }
elsif (m/^config$/) { $etcfile= loarg(); $where= '--config option'; }
+ elsif (m/^glueless$/) { $needglue=0; }
+ elsif (m/^localonly$/) { $localonly=1; }
+ elsif (m/^quiet$/) { $verbosity=0; }
+ elsif (m/^repeat$/) { $repeat=1; }
+ elsif (m/^verbose$/) { $verbosity=2; }
else { usageerr("unknown option --$_"); }
} else {
s/^\-//;
last if m/^$/;
while (m/^./) {
if (s/^[ynf]//) { $mode=$&; }
- elsif (s/^v//) { $verbosity=2; }
- elsif (s/^q//) { $verbosity=0; }
- elsif (s/^D//) { $debug=1; }
+ elsif (s/^A//) { $doall=1; }
elsif (s/^C//) { $etcfile= soarg(); $where= '-C option'; }
+ elsif (s/^D//) { $debug++; }
+ elsif (s/^g//) { $needglue=0; }
+ elsif (s/^l//) { $localonly=1; }
+ elsif (s/^q//) { $verbosity=0; }
+ elsif (s/^r//) { $repeat=1; }
+ elsif (s/^v//) { $verbosity=2; }
else { usageerr("unknown option -$&"); }
}
}
sub loarg() { usageerr("missing option value") if !@ARGV; return shift @ARGV; }
sub soarg() { my ($rv); $rv=$_; $_=''; return length $rv ? $rv : loarg(); }
+usageerr("-D may be specified at most twice") if $debug>2;
usageerr("must specify either -f|-y|-n or zones (and not both)")
if !!$mode == !!@ARGV;
sub usageerr ($) {
die
"$_[0]
-usage: named-conf-regen [-rvq] -f|-y|-n|<zone>...\n".
+usage: named-conf-regen [options] -f|-y|-n|<zone>...\n".
"operation modes:\n".
" -f --force install without checking\n".
" -y --yes check and install\n".
" -n --no check only\n".
"additional options:\n".
-" -q --quiet no output for OK zones\n".
-" -v --verbose extra verbose\n";
+" -A --all report on zones marked ? (ones we know are broken)\n".
+" -D debug $quis (does not help debug your DNS config)\n".
+" -g --glueless do not warn about any glueless referrals (not recommended)\n".
+" -l --localonly full checks only on zones which we primary\n".
+" -q --quiet no output for OK zones\n".
+" -r --repeat repeat warnings for all sources of imperfect data\n".
+" -v --verbose extra verbose info about each zone\n"
+" -C|--config <DIR/FILE use FILE as default config and DIR as default dir\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 @forbid_addr);
+@self_ns= @self_soa= @self_addr= @forbid_addr= ();
use vars qw(%zone_cfg @zone_cfg_list);
%zone_cfg= ();
%output_contents= ();
use vars qw($check $install);
-$check= $mode !~ m/^n/;
+$check= $mode !~ m/^f/;
$install= $mode =~ m/^[yf]/;
read_config($etcfile);
debug_dump('@zone_cfg_list %zone_cfg');
process_zones($mode ? @zone_cfg_list : @ARGV);
debug_dump('%output_contents');
+output_files() if $install;
+exit 0;
#-------------------- configuration reading
-sub cfg_fail ($) { die "$0: $where:\n $_[0]\n"; }
+sub cfg_fail ($) { die "$quis: $where:\n $_[0]\n"; }
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= 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;
+ } elsif (m/^self\-addr\s+([0-9. \t]+)/) {
+ @self_addr= split /\s+/, $1;
+ } elsif (m/^forbid\-addr(?:\s+([0-9. \t]+))?/) {
+ @forbid_addr= defined $1 ? 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 ($!=0, $_= readdir D) {
+ while (defined($_= 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/$_");
+ $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);
}
- $! 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+))?$/) {
+ } elsif (m/^primary([*?]?)\s+(\S+)\s+(\S+)$/) {
+ zone_conf($2,'primary','p',$1,qualify($3));
+ } elsif (m/^published([*?]?)\s+(\S+)\s+([0-9.\t]+)$/) {
+ 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+))?$/) {
($slave_dir, $slave_prefix, $slave_suffix) = (qualify($1),$2,$3);
+ $slave_prefix='' if !defined $slave_prefix;
+ $slave_suffix='' if !defined $slave_suffix;
} elsif (m/^output\s+bind8\+(\S+)$/) {
cfg_fail("default output may not apply to only some zones")
if @zone_cfg_list && length $default_output;
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,$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'}= $style;
+ $zone_cfg{$zone}{'style_p'}= $style.$mod;
+ $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;
}
print "$_[0]\n";
}
+sub verbose ($) {
+ return if $verbosity<2;
+ print " $_[0]\n";
+}
+
sub process_zones (@) {
my (@zones) = @_;
local ($zone,$cfg);
foreach $zone (@zones) {
$cfg= $zone_cfg{$zone} || {
- 'style' => 'foreign',
+ 'style_p' => 'foreign',
+ 's' => 'f',
'servers' => [ ],
};
- progress(sprintf "%-40s %s", $zone, $$cfg{'style'});
- if ($check) {
- eval { zone_check() };
- zone_warning("checks failed: $@") if length $@;
+ progress(sprintf "%-40s %s", $zone, $$cfg{'style_p'});
+ if ($check && ($doall || $cfg->{'s'} !~ m/\?/)) {
+ eval {
+ if ($localonly && $cfg->{'s'} =~ m/f/) {
+ zone_warning("foreign zone specified with -l",'');
+ } elsif ($cfg->{'s'} =~ m/\*/ ||
+ ($localonly && $cfg->{'s'} !~ m/p/)) {
+ zone_check_local();
+ } else {
+ zone_check_full();
+ }
+ };
+ 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_warning ($) {
- my ($w) = @_;
+sub zone_warning ($$) {
+ my ($w,$o) = @_;
+ my ($wk);
+
+ $wk= $w;
+ $wk =~ s/,.*// if !$repeat;
+ return 0 if $$warned{$w}{$wk}++;
+
$w =~ s/\n$//;
$w =~ s,\n, // ,g;
+
print STDERR "$zone: warning: $w\n" or die $!;
$warnings++;
+ return 1;
}
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(@to_check); # ($addr,$whyask,\%delgs_or_auths,$glueless_ok, ...)
+use vars qw(%addr_is_ok %warned);
+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, ...)
-use vars qw(%addr_is_ok);
-sub zone_check () {
- my ($super_zone, @super_nsnames,
- $super_ns, @super_ns_addrs, $super_ns_addr, $s, $wa, $zcr,
- %nsrrset_checked, %soa_checked);
+sub zone_check_full () {
+ zone_reset();
+ zone_investigate();
+ zone_consistency();
+ zone_servers_ok();
+}
- %delgs= %auths= %glue= ();
+sub zone_reset() {
+ %delgs= %auths= %glue= %soas= %warned= %addr_is_ok= ();
+ $delg_to_us= 0;
@to_check= @to_check_soa= ();
+}
+
+sub zone_investigate() {
+ my ($super_zone, @super_nsnames,
+ $super_ns, @super_ns_addrs, $s, $wa, $is_auth,
+ %nsrrset_checked, %soa_checked, $addr, $glueless_ok, $rcode);
$super_zone= $zone;
for (;;) {
}
for $super_ns (@super_nsnames) {
$super_ns= lc $super_ns;
- ($rcode,@this_ns_addrs)= lookup($super_ns,'a','0');
- foreach $super_ns_addr (@this_ns_addrs) {
+ ($rcode,@super_ns_addrs)= lookup($super_ns,'a','0');
+ foreach $addr (@super_ns_addrs) {
push @to_check,
- $super_ns_addr,
- "addr for $super_ns, server for $super_zone, parent"
- \%delgs, 0;
+ $addr,
+ "$super_ns, server for $super_zone",
+ 0, 0;
}
}
for (;;) {
# nameservers that came from other NS RRsets first; otherwise
# we might set nsrrset_checked due to a glueless_ok check,
# and then not check for gluefulness later.
- if (($addr,$wa,$nsrrset_ref,$glueless_ok,@to_check) = @to_check) {
- next if $nsrrset_checked{$ns}++;
- push @to_check_soa, $addr, $why;
- zone_check_nsrrset($super_ns_addr,"$addr, $wa",
- $delgs_or_auths,$glueless_ok);
- } elsif (($addr,$wa) = @to_check_soa) {
- next if !$soa_checked{$ns}++;
- zone_check_soa($addr,"$addr, $wa");
+ debug_dump('@to_check @to_check_soa');
+ if (($addr,$wa,$is_auth,$glueless_ok,@to_check) = @to_check) {
+ push @to_check_soa, $addr, $wa if $is_auth;
+ next if $nsrrset_checked{$addr}++;
+ zone_check_nsrrset($addr, $wa, $is_auth, $glueless_ok);
+ } elsif (($addr,$wa,@to_check_soa) = @to_check_soa) {
+ next if $soa_checked{$addr}++;
+ zone_check_soa($addr, $wa, "NS [$uaddr]");
+ } else {
+ last;
}
}
- zone_consistency();
+}
+
+sub zone_check_nsrrset ($$$$) {
+ my ($uaddr,$wa, $is_auth, $glueless_ok) = @_;
+ my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths, $wwn, $ww);
+ verbose("checking delegation by $ww");
+ $ww= "[$uaddr] $wa";
+ dig(sub {
+ if ($dig_type eq 'ns' && $dig_owner eq $zone) {
+ $s2g{lc $dig_rdata} = [ ];
+ } elsif ($dig_type eq 'a' && exists $s2g{$dig_owner}) {
+ $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;
+ }
+ },
+ $zone,'ns',$uaddr);
+ if (!%s2g) {
+ zone_warning("unable to find NS RRset at [$uaddr]", $wa);
+ return;
+ } elsif (keys %s2g == 1) {
+ zone_warning("only one nameserver",$ww);
+ }
+ @s= sort keys %s2g;
+ foreach $s (@s) {
+ @glue= @{ $s2g{$s} };
+ if (!@glue) {
+ zone_warning("glueless NS $s,".($needglue<=1 ? " (eg)" : ""),
+ $ww)
+ unless $glueless_ok || !$needglue;
+ next;
+ }
+ $glue= join ' ', sort @glue;
+ push @{ $glue{$s}{$glue} }, $ww;
+ }
+ $s= join ' ', @s;
+ $delgs_or_auths= $is_auth ? \%auths : \%delgs;
+ push @{ $delgs_or_auths->{$s} }, $ww;
+}
+
+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] $name are published",
+ $ww)
+ if $cfg->{'s'} =~ m/u/ && grep { $_ eq $addr } @self_addr;
+ zone_warning("forbidden nameserver address [$addr] $name",$ww)
+ if grep { $_ eq $addr } @forbid_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]",$ww);
+ } elsif (!$name_is_self && $addr_is_self) {
+ zone_warning(($is_soa ? "SOA ORIGIN maps to" : "referral to").
+ " us [$addr] with wrong name $name",
+ $ww);
+ }
+ $delg_to_us=1 if $name_is_self;
+}
+
+sub zone_check_soa ($$$) {
+ my ($uaddr,$wa,$waq) = @_;
+ 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:') {
+ $lame= $dig_rdata =~ m/ aa / ? '' : 'lame';
+ } elsif ($dig_type eq 'soa' && $dig_owner eq $zone && !$lame) {
+ die "several SOAs ? $ww" if defined $origin;
+ $got= $dig_rdata;
+ $got =~ m/^(\S+) \d+/ or die "$got ?";
+ $origin= $1;
+ }
+ },
+ $zone,'soa',$uaddr);
+ $lame= 'broken' if !$lame && !defined $origin;
+ if ($lame) { zone_warning("$lame server [$uaddr]",$wa); return; }
+ push @{ $soas{$got} }, $ww;
+ ($rcode,@soa_addrs)= lookup($origin,'a','0');
+ foreach $soa_addr (@soa_addrs) {
+ $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, $showok);
+ my ($d, $org_ser, $origin, $a, $h, $self_soa, $wa);
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);
- if ($cfg->{'style'} eq 'primary') {
+ $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(s) @self_soa not in SOA ORIGIN $origin,".
- " eg from ".((values %{ $soas{$org_ser} })[1]));
+ next if grep { $_ eq $origin } @$self_soa;
+ foreach $wa (@{ $soas{$org_ser} }) {
+ zone_warning("SOA ORIGIN $origin is not our name (@$self_soa)",
+ $wa);
+ }
}
}
- $showok= 0;
- foreach $a (@{ $cfg->{'servers'} }) {
- next if $addr_is_ok{$a};
- zone_warning("we slave from $a"); $showok=1;
+}
+
+sub zone_servers_ok () {
+ my ($showok);
+ if (%addr_is_ok) {
+ $showok= 0;
+ foreach $a (@{ $cfg->{'servers'} }) {
+ next if exists $addr_is_ok{$a};
+ zone_warning("we slave from [$a]",'')
+ and $showok=1;
+ }
+ if ($showok) {
+ foreach $a (keys %addr_is_ok) {
+ zone_warnmore("permitted master [$a] $addr_is_ok{$a}");
+ }
+ }
}
- if ($showok) {
- zone_warnmore("we must slave from one of ".
- join ' ', keys %addr_is_ok);
+ 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 ($msg,$set) = @_;
my ($d,$o);
- if (keys(%$set) != 1) {
- zone_warning("inconsistent $msg:");
+ if (keys(%$set) > 1) {
+ zone_warning("inconsistent $msg:",'');
foreach $d (keys %$set) {
- foreach $o (@$d) { zone_warnmore(" $d from $o"); }
+ foreach $o (@{ $set->{$d} }) { zone_warnmore(" $d from $o"); }
}
}
}
-sub zone_check_soa ($$) {
- my ($uaddr,$ww) = @_;
- my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr);
- $lame= 'dead or lame';
- dig::dig({
- if ($dig::type eq 'flags:') {
- $lame= $dig::rdata =~ m/ aa / ? 'lame' : '';
- } elsif ($dig::type eq 'soa' && $dig::owner eq $zone && !$lame) {
- die "several SOAs ? $why" if defined $origin;
- $got= $dig::rdata;
- $got =~ m/^(\S+) \d+/ or die "$got ?";
- $origin= $1;
- }
- },
- $zone,'soa',$uaddr);
- $lame= 'broken' if !$lame && !defined $origin;
- if ($lame) { zone_warning("$lame server $ww"); return; }
- 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";
- }
+sub zone_check_local () {
+ zone_reset();
+ zone_servers_simplefind();
+ zone_servers_ok();
}
-sub zone_check_nsrrset ($$$$) {
- my ($uaddr,$ww, $delgs_or_auths,$glueless_ok) = @_;
- my (@s, $s, %s2g, @glue, $glue);
- dig::dig({
- 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,
- "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;
- }
- },
- $zone,'ns',$uaddr);
- @s= sort keys %s2g;
- foreach $s (@s) {
- @glue= @{ $s2g{$s} };
- if (!length @glue) {
- zone_warning("glueless NS $s, from $ww") unless $glueless_ok;
- next;
- }
- $glue= join ' ', sort @glue;
- push @{ $glue{$s}{$glue} }, $why;
- }
- $s= join ' ', @s;
- push @{ $nsrrset_ref->{$s} }, $why;
+sub zone_servers_simplefind () {
+ my ($rcode,@nsnames,$ns,@soas,$origin);
+
+ ($rcode,@nsnames)= lookup($zone,'ns-','0');
+ 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',1);
}
+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,$ww,$ww,$is_soa); }
+}
#-------------------- outputting
sub zone_output () {
- $output_contents{$$cfg{'output'}}.=
- sprintf(<<'END',
-zone "%s" {
- type %s;
- file "%s";
-};
-END
- $zone,
- $$cfg{'style'} eq 'primary' ? 'master' : 'slave',
- $$cfg{'file'});
+ my ($o,$m);
+
+ $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";
+ }
+ $o.= " file \"$$cfg{'file'}\";\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
sub debug_dump ($) {
my ($vn);
- return unless $debug;
+ return unless $debug>1;
local $Data::Dumper::Terse=1;
foreach $vn (split /\s+/, $_[0]) {
print "$vn := ", eval "Dumper(\\$vn)";
}
sub lookup ($$$) {
- my ($type,$domain,$okrcodes) = @_;
- my ($c,@result);
- defined($c= open ADH, "-|") or die "$0: fork adnshost:\n $!\n";
+ my ($domain,$type,$okrcodes) = @_;
+ my ($c,$h,@result);
+ debug_trace("lookup ==> (->$okrcodes) $domain $type");
+ $h= new IO::Handle;
+
+ defined($c= open $h, "-|") or die "$quis: fork adnshost:\n $!\n";
if (!$c) {
exec 'adnshost','-Fi','+Do','+Dt','+Dc','-Cf',"-t$type",
'-',"$domain.";
- die "$0: exec adnshost:\n $!\n";
+ die "$quis: exec adnshost:\n $!\n";
}
- @result= <ADH>;
+ @result= $h->getlines();
+ $h->error and die "$quis: read from adnshost:\n $!\n";
chomp @result;
- $!=0; close ADH;
- die "$0: lookup -t$type $domain $okrcodes failed $? $!\n"
- if $! or $?>6 or index($okrcodes,$?)<0;
+ $!=0; $h->close;
+ die "$quis: lookup -t$type $domain $okrcodes failed $? $! @result\n"
+ if $! or $?&255 or $?>1536 or index($okrcodes,$?>>8)<0;
+ debug_trace("lookup <== $? @result");
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);
+ my ($h,$inmid,$irdata,$c);
local ($_);
+ debug_trace("dig ==> \@$qaddr $qowner $qtype");
+
$h= new IO::Handle;
- defined($c= open $h, "-|") or die "$0: fork dig:\n $!\n";
+ defined($c= open $h, "-|") or die "$quis: fork dig:\n $!\n";
if (!$c) {
+ open STDERR, ">&STDOUT" or die $!;
exec ('dig',
'+nodef','+nosea','+nodebug','+norecurse',
"\@$qaddr",'-t',$qtype,$qowner);
- die "$0: exec dig:\n $!\n";
+ die "$quis: exec dig:\n $!\n";
}
$inmid='';
for (;;) {
if (!defined($_= $h->getline())) {
- $h->error() and die "$0: read from dig:\n $!\n";
+ $h->error() and die "$quis: read from dig:\n $!\n";
last;
}
chomp;
s/\;.*$//;
$_= $inmid.$_;
$inmid='';
- s/$/ \(/ unless s/\s*\)$//;
+ s/$/ \(/ unless s/\s*\)\s*$//;
}
- if (s/\s*\($//) { $inmid= $_; next; }
+ if (s/\s*\(\s*$//) { $inmid= $_; next; }
if (m/^\;\; flags\:( [-0-9a-z ]+)\;/) {
- $owner=''; $type='flags:'; $rdata= "$1 ";
- { package main; &$dig::eachrr; };
+ $dig_owner=''; $dig_type='flags:'; $dig_rdata= "$1 ";
+ debug_trace("dig f: $dig_rdata");
+ &$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;
+ } elsif (m/^([-.0-9a-z]+)\s+\d\w+\s+in\s+([a-z]+)\s+(\S.*)/i) {
+ $dig_owner=domain_canon($1); $dig_type=lc $2; $irdata=$3;
+ if ($dig_type eq 'a') {
+ $irdata =~ m/^[.0-9]+$/ or die "$irdata ?";
+ $dig_rdata= $&;
+ } elsif ($dig_type eq 'ns') {
+ $irdata =~ m/^[-.0-9a-z]+$/i or die "bad nameserver $irdata ?";
+ $dig_rdata= domain_canon($irdata);
+ } elsif ($dig_type eq 'soa') {
+ $irdata =~ m/^([-.0-9a-z]+)\s+.*\s+(\d+)(?:\s+\d\w+){4}$/i
+ or die "bad SOA $irdata ?";
+ $dig_rdata= domain_canon($1).' '.$2;
} else {
- debug_trace("ignoring uknown RR type $rtype");
+ debug_trace("ignoring uknown RR type $dig_type");
next;
}
- { package mina; &$dig::eachrr; }
+ debug_trace("dig $dig_owner $dig_type $dig_rdata");
+ &$eachrr;
} else {
debug_trace("ignoring unknown dig output $_");
}
}
- $h->close or die $!;
-}
-
-__DATA__
-
-
-
-
-sub lookup1 ($$) {
- my ($type,$domain) = @_;
- my (@result)= lookup($type,$domain);
- @result==1 or die "$0: lookup -t$type $domain gave more than one RR\n";
- return $result[0];
-}
-
-sub check () {
- return unless $check;
- eval {
- $soa= lookup1('soa',$zone);
- $soa_origin=$soa; $soa_origin =~ s/ .*//;
- $soa_origin_addr= lookup1('a',$soa_origin);
-
- @zone_ns= lookup('ns-',$zone);
-
- @ok_sources= ($soa_origin_addr);
- $ok_sources_descr= "SOA ORIGIN $soa_origin [$soa_origin_addr]";
-
- if ($style eq 'unoff' || $style eq 'backup') {
- for $zone_ns (@zone_ns) {
- @zone_ns_addrs= lookup('a',$zone_ns);
- push @ok_sources, @zone_ns_addrs;
- $ok_sources_descr.= ", NS $zone_ns [@zone_ns_addrs]";
- }
- }
-
- for $server (@servers) {
- grep { $server eq $_ } @ok_sources
- or warn "secondarying from $server which is not ".
- "$ok_sources_desc\n";
- }
-
- if ($style eq 'secondary') {
- grep { $zone_ns=$_, grep { $myname eq $_ } @mynames } @zone_n
- or warn "supposedly published secondary but we ".
- "(@mynames) are not published ($@zone_ns)\n";
- }
- }
- check_after_eval();
-
-
-
-# $superzone= $zone; $superzone =~ s/^[^\.]+\.//;
-# @super_ns= lookup('ns-',$zone);
- }
-
- eval {
-
- for $super_ns (@super_ns) {
- @deleg_ns= ();
- open DIG, "dig @$super_ns. -t ns +norecurse $zone."
- or die "$0: fork for dig:\n $!\n";
- while (<DIG>) {
-
-
- split /\n/, lookup("
-
- case "$style" in
- secondary|backup)
- if [ $meadvert = 0 ]
- then
- warning "$myname unlisted NS $nsnames"
- fi
- ;;
- unoff)
- if $meadvert = 0
- then
- warning "$myname advertised NS $nsnames"
- fi
- ;;
- esac
-
- addrs=''
- for ns in $names
- do
- set -e; a="`host -t a \"$ns\".`"; set +e
- taddrs="`echo \" $a\" | expand | sed -n '
- 1s/^ //
- s/^[^ ][^ ]* *A *\([0-9][.0-9]*\)/\1/p
- '`"
- equlines "A $ns" "$a" "$taddrs"
- addrs="$addrs $taddrs"
- done
- fi
-
- cat <<END
-zone "$zone" {
- type slave;
- file "$file";
- masters {
-END
- for server in $servers
- do
- echo " $server;"
- if $check
- then
- notfound=1
- for addr in $addrs
- do
- if [ "x$addr" = "x$server" ]
- then
- notfound=0
- fi
- done
- if $notfound
- then
- warning "server $server? but $rectype $names" $addrs
- fi
- fi
- done
- cat <<END
- };
-};
-END
- hostfirstwarn=1
- if $hostdelg
- then
- checkhostout -C
- fi
- if $hostzone
- then
- checkhostout -val localhost
- fi
-done
-endfile
-
-
-chdir "$base/primary" or die "$0: chdir $base/primary:\n $!";
-beginfile('primary.zones');
-
-for $f (<*_db>) {
- $zone= $f; $zone =~ s/_db$//;
-
-
-for f in $zones
-do
- zone="`echo $f | sed -e 's/_db$//'`"
-END
-done
-endfile
-
-
-
-sub beginfile ($) {
- $currentfile= $_[0];
- $currentfile_opened= $install ? "$conf/$currentfile.new" : "/dev/null";
- open CFF, "> $toopen" or die "$0: begin $currentfile_opened:\n $!\n";
-}
-
-endfile () {
- close CFF or die "$0: close $currentfile_opened:\n $!\n";
- push @files, $currentfile;
-}
-
-sub installfiles () {
- return unless $install;
- chdir $conf or die "$0: chdir $conf:\n $!\n";
- for $f (@files) {
- rename "$f.new", $f or die "$0: install new $f:\n $!\n";
- }
+ $h->close;
+ debug_trace("dig <== gave $?");
}
-warning () {
- echo >&2 "$zone $style: $*"
- warnings=$[$warnings+1]
+sub domain_canon ($) {
+ local ($_) = @_;
+ s/(.)\.$/$1/;
+ die "domain $_ ?" unless m/^[0-9a-z]/i;
+ return lc $_;
}
-
-equlines () {
- if [ "x`echo \" $2\" | wc -l`" != "x`echo \" $3\" | wc -l`" ]
- then
- warning "$1 >$2|$3<"
- fi
-}
-
-checkhostout () {
- set +e
- hostout="`host $1 \"$zone\" 2>&1 >/dev/null $2 | egrep -v \
-'^ \!\!\! .* SOA primary .* is not advertised via NS$'`"
- set -e
- if [ "x$hostout" = x ]; then return; fi
- if $hostfirstwarn
- then
- warning "warnings from host:"
- hostfirstwarn=0
- fi
- echo >&2 "$hostout"
-}
-
-progress () {
- if $progress
- then
- echo -n "$zone $style " >&2
- echo -ne '\r' >&2
- fi
-}
-
-myname=''
-
-if [ $warnings != 0 ]
-then
- echo >&2 "$warnings warnings "
-fi
-
-installfiles
~ian / chiark-utils.git / blobdiff