$etcfile= "/etc/bind/chiark-conf-gen.zones";
$where= '<built-in>';
$debug= 0;
-$needglue= 2;
+$needglue= 1;
$localonly= 0;
$verbosity= 1;
+$repeat= 0;
use vars qw($dig_owner $dig_type $dig_rdata);
if (m/^(yes|no|force)$/) { m/^./; $mode= $&; }
elsif (m/^all$/) { $doall=1; }
elsif (m/^config$/) { $etcfile= loarg(); $where= '--config option'; }
- elsif (m/^glueless$/) { $needglue--; }
+ 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 {
elsif (s/^A//) { $doall=1; }
elsif (s/^C//) { $etcfile= soarg(); $where= '-C option'; }
elsif (s/^D//) { $debug++; }
- elsif (s/^g//) { $needglue--; }
+ 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("-g may be specified at most twice") if $needglue<0;
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 not be directory")
$slave_prefix= '';
$slave_suffix= '';
-use vars qw(@self_ns @self_soa @self_addr);
-@self_ns= @self_soa= @self_addr= ();
+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= ();
sub read_config ($) {
my ($if) = @_;
- my ($fh,$z,@self,$before, $mod,$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 $!");
@self_soa= @self if $1 ne '-ns';
} elsif (m/^self\-addr\s+([0-9. \t]+)/) {
@self_addr= split /\s+/, $1;
- } 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;
+ } 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 (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,'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+))?$/) {
+ } 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;
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'}= $sabbr.$mod; # p)rimary s)econdary u)npub f)oreign
if ($check && ($doall || $cfg->{'s'} !~ m/\?/)) {
eval {
if ($localonly && $cfg->{'s'} =~ m/f/) {
- zone_warning("foreign zone specified with -l");
+ zone_warning("foreign zone specified with -l",'');
} elsif ($cfg->{'s'} =~ m/\*/ ||
($localonly && $cfg->{'s'} !~ m/p/)) {
zone_check_local();
zone_check_full();
}
};
- zone_warning("checks failed: $@") if length $@;
+ 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 ($) {
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 %warned_glueless %warned_mynameaddr);
+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, ...)
}
sub zone_reset() {
- %delgs= %auths= %glue= %soas=
- %warned_glueless= %warned_mynameaddr=
- %addr_is_ok= ();
+ %delgs= %auths= %glue= %soas= %warned= %addr_is_ok= ();
$delg_to_us= 0;
@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, "[$addr] $wa",
- $is_auth, $glueless_ok);
+ 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,"[$addr] $wa","[$addr] NS");
+ zone_check_soa($addr, $wa, "NS [$uaddr]");
} else {
last;
}
}
sub zone_check_nsrrset ($$$$) {
- my ($uaddr,$ww, $is_auth, $glueless_ok) = @_;
- my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths, $wwn);
+ 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} = [ ];
}
},
$zone,'ns',$uaddr);
- if (!%s2g) { zone_warning("unable to find NS RRset at $ww"); return; }
- elsif (keys %s2g == 1) { zone_warning("only one nameserver at $ww"); }
+ 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)" : "").
- " from $ww")
- unless $glueless_ok || !$needglue ||
- ($needglue<=1 && $warned_glueless{$s}++);
+ zone_warning("glueless NS $s,".($needglue<=1 ? " (eg)" : ""),
+ $ww)
+ unless $glueless_ok || !$needglue;
next;
}
$glue= join ' ', sort @glue;
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 $wwq)")
+ 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 }
$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}++;
+ 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" : "allegedly served by").
- " us [$addr] with wrong name $name, (eg) $ww")
- unless $warned_mynameaddr{$name}{$addr}++;
+ 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,$ww,$wwq) = @_;
+ my ($uaddr,$wa,$waq) = @_;
my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr,$wwn);
verbose("checking service at $wwq");
$lame= 'dead or lame';
},
$zone,'soa',$uaddr);
$lame= 'broken' if !$lame && !defined $origin;
- if ($lame) { zone_warning("$lame server $ww"); return; }
+ 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) {
}
sub zone_consistency() {
- my ($d, $org_ser, $origin, $a, $h, $self_soa);
+ 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);
$org_ser =~ m/^(\S+) \d+$/ or die "$org_ser ?";
$origin= $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]));
+ 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 exists $addr_is_ok{$a};
- zone_warning("we slave from $a"); $showok=1;
+ zone_warning("we slave from [$a]",'')
+ and $showok=1;
}
if ($showok) {
foreach $a (keys %addr_is_ok) {
}
}
if ($cfg->{'s'} =~ m/s/ && !$delg_to_us) {
- zone_warnmore("we are supposedly published secondary,".
- " but not listed as a nameserver");
+ zone_warning("we are supposedly published secondary,".
+ " but not listed as a nameserver",'');
}
}
my ($msg,$set) = @_;
my ($d,$o);
if (keys(%$set) > 1) {
- zone_warning("inconsistent $msg:");
+ zone_warning("inconsistent $msg:",'');
foreach $d (keys %$set) {
foreach $o (@{ $set->{$d} }) { zone_warnmore(" $d from $o"); }
}
#-------------------- 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,$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 () {
chomp @result;
$!=0; $h->close;
die "$quis: lookup -t$type $domain $okrcodes failed $? $! @result\n"
- if $! or $?>6 or index($okrcodes,$?)<0;
+ if $! or $?&255 or $?>1536 or index($okrcodes,$?>>8)<0;
debug_trace("lookup <== $? @result");
return ($?,@result);
}