use vars qw($quis
$mode $doall
$etcfile $where
- $debug $needglue $localonly $verbosity);
+ $debug $needglue $localonly $repeat $verbosity);
$quis= $0; $quis =~ s,.*/,,;
$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 @conv_glueless);
+@self_ns= @self_soa= @self_addr= @forbid_addr= ();
+@conv_glueless= qw(in-addr.arpa ip6.arpa ip6.int);
use vars qw(%zone_cfg @zone_cfg_list);
%zone_cfg= ();
last;
}
chomp; s/\s+$//;
- if (m/\\$/) { $before.= $_; next; }
+ if (s/\\$//) { $before.= $_; next; }
$_= $before.$_;
$before= '';
s/^\s+//;
@self= split /\s+/, $2;
@self_ns= @self if $1 ne '-soa';
@self_soa= @self if $1 ne '-ns';
+ } elsif (m/^serverless\-glueless\s+(\S.*\S)/) {
+ @conv_glueless= split /\s+/, $1;
} 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]*)
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;
read_config($1);
} else {
cfg_fail("unknown configuration directive".
- " or incorrect syntax or arguments");
+ " or incorrect syntax or arguments:\n".
+ " \`$_'");
}
}
$fh->close or cfg_fail("close config file $if:\n $!");
$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 ];
- 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;
+ foreach $sfx (qw(self_soa self_ns self_addr forbid_addr)) {
+ { no strict 'refs'; $aref= [ @$sfx ]; }
+ @$aref or cfg_fail("failed to specify $sfx before zone")
+ if $sfx =~ m/^self/;
+ $zone_cfg{$zone}{$sfx}= $aref;
}
$zone_cfg{$zone}{'output'}= $output;
push @zone_cfg_list, $zone;
local ($zone,$cfg);
foreach $zone (@zones) {
+ zone_reset();
$cfg= $zone_cfg{$zone} || {
'style_p' => 'foreign',
's' => 'f',
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 $@;
}
$output_contents{$$cfg{'output'}} .= zone_output()
if $install;
if $warnings;
}
-sub zone_warning ($) {
- my ($w) = @_;
+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 %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_warning ($$) {
+ my ($w,$o) = @_;
+ my ($wk);
+
+ return 0 if !$repeat && $warned{$w}++;
+
$w =~ s/\n$//;
$w =~ s,\n, // ,g;
+
+ $w .= " ($o)" if length $o;
print STDERR "$zone: warning: $w\n" or die $!;
$warnings++;
+ return 1;
}
sub zone_warnmore ($) {
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 %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_check_full () {
- zone_reset();
zone_investigate();
zone_consistency();
zone_servers_ok();
}
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 [$addr]");
} 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);
+ $ww= "[$uaddr] $wa";
verbose("checking delegation by $ww");
dig(sub {
if ($dig_type eq 'ns' && $dig_owner eq $zone) {
}
},
$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 ". (join '', keys %s2g),
+ $ww);
+ }
@s= sort keys %s2g;
foreach $s (@s) {
+ $delg_to_us=1 if grep { $s eq $_ } @{ $cfg->{'self_ns'} };
@glue= @{ $s2g{$s} };
if (!@glue) {
- zone_warning("glueless NS $s,".
- ($needglue<=1 ? " (eg)" : "").
- " from $ww")
+ zone_warning("glueless NS $s", $ww)
unless $glueless_ok || !$needglue ||
- ($needglue<=1 && $warned_glueless{$s}++);
+ grep { has_suffix_of($s,".$_"); } @conv_glueless;
next;
}
$glue= join ' ', sort @glue;
sub zone_server_addr ($$$$$) {
my ($addr,$name,$ww,$wwq,$is_soa) = @_;
+ my ($cg);
+ debug_trace("zone_server_addr ".join '|',@_);
$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)")
+ foreach $cg (@conv_glueless) {
+ next unless has_suffix_of(".$name",".$cg");
+ zone_warning("nameserver [$addr] $name in serverless-glueless".
+ " namespace area $cg",
+ $ww);
+ }
+ 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 } @{ $cfg->{'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}++;
- } 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("our $name supplied with wrong address [$addr]", $ww);
}
- $delg_to_us=1 if $name_is_self;
+ if (!$name_is_self && $addr_is_self) {
+ zone_warning("we [$addr] are named in ".
+ ($is_soa ? "SOA" : "NS").
+ " by wrong name $name",
+ $ww);
+ }
+ if (!$name_is_self && !$addr_is_self &&
+ $is_soa && $cfg->{'s'} =~ m/p/) {
+ zone_warning("SOA ORIGIN $name is not us (".
+ (join ' ', @{ $cfg->{'self_soa'} }).")", $ww);
+ }
+ $delg_to_us=1 if $addr_is_self && !$is_soa;
}
sub zone_check_soa ($$$) {
- my ($uaddr,$ww,$wwq) = @_;
- my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr,$wwn);
- verbose("checking service at $wwq");
+ my ($uaddr,$wa,$waq) = @_;
+ my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr,$ww,$wwn);
+ verbose("checking service at [$uaddr] $waq");
$lame= 'dead or lame';
+ $ww= "[$uaddr] $wa";
dig(sub {
if ($dig_type eq 'flags:') {
$lame= $dig_rdata =~ m/ aa / ? '' : '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');
+ $wwn= "SOA ORIGIN from $ww";
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, $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);
}
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("SOA ORIGIN $origin is not our name (@$self_soa),".
- " eg from ".($soas{$org_ser}[0]));
- }
- }
}
sub zone_servers_ok () {
- my ($showok);
+ my ($showok,%fs);
if (%addr_is_ok) {
$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_warning("we are supposedly published secondary,".
- " but not listed as a nameserver");
+ " but not listed as a nameserver",'');
+ map { $fs{$_}=1 } keys(%delgs), keys(%auths);
+ zone_warnmore("servers are: ". join ' ', sort keys %fs);
}
}
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"); }
}
}
sub zone_check_local () {
- zone_reset();
zone_servers_simplefind();
zone_servers_ok();
}
($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);
+ zone_server_simple(domain_canon($1,"lookup $zone SOA"),'SOA',1);
}
sub zone_server_simple ($$$) {
#-------------------- outputting
sub zone_output () {
- my ($o);
+ my ($o,$m);
$o= "zone \"$zone\" {\n";
if ($$cfg{'s'} =~ m/p/) {
- $o.= " type master\n";
+ $o.= " type master;\n";
} else {
- $o.= " type slave\n".
+ $o.= " type slave;\n".
" masters {\n";
- foreach $m (@{ $cfg{'servers'} }) { $o.= " $m;\n"; }
+ foreach $m (@{ $$cfg{'servers'} }) { $o.= " $m;\n"; }
$o.= " };\n";
}
+ $o.= " file \"$$cfg{'file'}\";\n";
+ $o.= "};\n";
return $o;
}
print "D $_[0]\n";
}
+sub has_suffix_of ($$) {
+ my ($whole,$suffix) = @_;
+ return 0 if length $whole < length $suffix;
+ return 0 if substr($whole, length($whole) - length($suffix)) ne $suffix;
+ return 1;
+}
+
sub lookup ($$$) {
my ($domain,$type,$okrcodes) = @_;
my ($c,$h,@result);
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);
}
sub dig (&$$$) {
my ($eachrr, $qowner,$qtype,$qaddr) = @_;
# also pseudo-rr with type `flags:'
- my ($h,$inmid,$irdata,$c);
+ my ($h,$inmid,$irdata,$c,$digwhy);
local ($_);
debug_trace("dig ==> \@$qaddr $qowner $qtype");
s/$/ \(/ unless s/\s*\)\s*$//;
}
if (s/\s*\(\s*$//) { $inmid= $_; next; }
+ $digwhy= "dig $qowner $qtype $qaddr \`$_'";
if (m/^\;\; flags\:( [-0-9a-z ]+)\;/) {
$dig_owner=''; $dig_type='flags:'; $dig_rdata= "$1 ";
debug_trace("dig f: $dig_rdata");
} elsif (m/^\;/) {
} elsif (!m/\S/) {
} 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;
+ $dig_owner=domain_canon($1,$digwhy); $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);
+ $dig_rdata= domain_canon($irdata,$digwhy);
} 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;
+ $dig_rdata= domain_canon($1,$digwhy).' '.$2;
} else {
debug_trace("ignoring uknown RR type $dig_type");
next;
debug_trace("dig <== gave $?");
}
-sub domain_canon ($) {
- local ($_) = @_;
- s/(.)\.$/$1/;
- die "domain $_ ?" unless m/^[0-9a-z]/i;
- return lc $_;
+sub domain_canon ($$) {
+ my ($i,$w) = @_;
+ $i =~ s/(.)\.$/$1/;
+ return '.' if $i eq '.';
+ die "domain $i ($w) ?" unless $i =~ m/^[0-9a-z]/i;
+ return lc $i;
}
~ian / chiark-utils.git / blobdiff