X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fnamed-conf;h=dfabc82dc36f9e8c3b08bfb538fc2756c32d64ba;hp=a222db0bab52ca5853035853abc89c1a606a3a2f;hb=b3f3d259857a51c3df303c44276457cad8d99d07;hpb=02b64fd81edc8a7cd109eb9cdecc41eb48501735 diff --git a/scripts/named-conf b/scripts/named-conf index a222db0..dfabc82 100755 --- a/scripts/named-conf +++ b/scripts/named-conf @@ -3,11 +3,12 @@ use strict; use IO::File; use Data::Dumper; +use POSIX; use vars qw($quis $mode $doall $etcfile $where - $debug $needglue $localonly $verbosity); + $debug $needglue $localonly $repeat $verbosity); $quis= $0; $quis =~ s,.*/,,; @@ -16,9 +17,10 @@ $doall= 0; $etcfile= "/etc/bind/chiark-conf-gen.zones"; $where= ''; $debug= 0; -$needglue= 2; +$needglue= 1; $localonly= 0; $verbosity= 1; +$repeat= 0; use vars qw($dig_owner $dig_type $dig_rdata); @@ -29,9 +31,10 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) { 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 { @@ -42,9 +45,10 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) { 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 -$&"); } } @@ -54,7 +58,6 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) { 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; @@ -62,30 +65,36 @@ usageerr("must specify either -f|-y|-n or zones (and not both)") sub usageerr ($) { die "$_[0] -usage: named-conf-regen [-rvq] -f|-y|-n|...\n". +usage: named-conf-regen [options] -f|-y|-n|...\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 )) { cfg_fail("read config file $if:\n $!") if $fh->error(); last; } + chomp; s/\s+$//; + if (s/\\$//) { $before.= $_; next; } + $_= $before.$_; + $before= ''; + s/^\s+//; $where= "$if:$."; - s/^\s+//; chomp; s/\s+$//; next if m/^\#/; last if m/^end$/; next unless m/\S/; @@ -131,12 +147,24 @@ sub read_config ($) { @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+/, $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/^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)) { @@ -145,17 +173,25 @@ sub read_config ($) { 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); + $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; @@ -164,7 +200,8 @@ sub read_config ($) { 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 $!"); @@ -172,12 +209,13 @@ sub read_config ($) { 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) { @@ -185,13 +223,20 @@ sub zone_conf ($$$@) { 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(self_soa self_ns self_addr forbid_addr conv_glueless)) { + { 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; } @@ -205,7 +250,7 @@ sub set_output($) { #-------------------- checking -use vars qw($zone $cfg $warnings); +use vars qw($zone $cfg $warnings %zone_warnings); $warnings= 0; sub progress ($) { @@ -223,16 +268,17 @@ sub process_zones (@) { local ($zone,$cfg); foreach $zone (@zones) { + zone_reset(); $cfg= $zone_cfg{$zone} || { 'style_p' => 'foreign', 's' => 'f', '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("foreign zone specified with -l",''); } elsif ($cfg->{'s'} =~ m/\*/ || ($localonly && $cfg->{'s'} !~ m/p/)) { zone_check_local(); @@ -240,43 +286,61 @@ sub process_zones (@) { 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; + } + if ($warnings) { + printf STDERR ("%s: %d warning(s) in %d zone(s);". + " %d zone(s) checked ok.\n", + $quis, + $warnings, + scalar(keys %zone_warnings), + scalar(@zones - keys %zone_warnings)); + } else { + progress(sprintf "%d zone(s) checked ok", scalar @zones); } - print STDERR "$quis: $warnings warnings\n" or die $! - 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{"$serial $origin"} = [ $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++; + $zone_warnings{$zone}++; + 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(%addr_is_ok %gluelesswarned); -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= %gluelesswarned= %addr_is_ok= (); + %delgs= %auths= %glue= %soas= %warned= %addr_is_ok= (); + $delg_to_us= 0; @to_check= @to_check_soa= (); } @@ -289,12 +353,14 @@ sub zone_investigate() { for (;;) { debug_trace("zone $zone superzone $super_zone"); $super_zone =~ s/^[^.]+\.// or die "no superzone ? ($super_zone)\n"; - ($rcode,@super_nsnames)= lookup($super_zone,'ns-','06'); + ($rcode,@super_nsnames)= + lookup($super_zone,'ns-','06',"superzone search"); last if !$rcode; } for $super_ns (@super_nsnames) { $super_ns= lc $super_ns; - ($rcode,@super_ns_addrs)= lookup($super_ns,'a','0'); + ($rcode,@super_ns_addrs)= + lookup($super_ns,'a','0',"published nameserver"); foreach $addr (@super_ns_addrs) { push @to_check, $addr, @@ -311,11 +377,10 @@ sub zone_investigate() { 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"); + zone_check_soa($addr, $wa, "NS [$addr]"); } else { last; } @@ -323,33 +388,37 @@ sub zone_investigate() { } sub zone_check_nsrrset ($$$$) { - my ($uaddr,$ww, $is_auth, $glueless_ok) = @_; - my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths); + 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) { $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; } }, $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) { + zone_ns_name($s,$ww); @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 && $gluelesswarned{$s}++); + grep { has_suffix_of($s,".$_"); } + @{ $cfg->{'conv_glueless'} }; next; } $glue= join ' ', sort @glue; @@ -360,70 +429,101 @@ sub zone_check_nsrrset ($$$$) { 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/; - zone_warning("configured as stealth but we [$addr]". - " are published ($name $ww)") - if $cfg->{'s'} =~ m/u/ && grep { $_ eq $addr } @self_addr; +sub zone_ns_name ($$) { + my ($name,$ww) = @_; + my ($cg); + $delg_to_us=1 if grep { $name eq $_ } @{ $cfg->{'self_ns'} }; + foreach $cg (@{ $cfg->{'conv_glueless'} }) { + zone_warning("nameserver $name in serverless-glueless". + " namespace area $cg", + $ww) + if has_suffix_of(".$name",".$cg"); + } + zone_warning("published server, as $name, but configured as stealth", + $ww) + if $cfg->{'s'} =~ m/u/ && + grep { $_ eq $name } + @{ $cfg->{'self_ns'} }, @{ $cfg->{'self_soa'} }; } -sub zone_check_soa ($$) { - my ($uaddr,$ww) = @_; - my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr); - verbose("checking service at $ww"); +sub zone_server_addr ($$$$$) { + my ($addr,$name,$ww,$wwq,$is_soa) = @_; + debug_trace("zone_server_addr ".join '|',@_); + $addr_is_ok{$addr}= "$name ($wwq)" + if $is_soa || $cfg->{'s'} =~ m/u/; + 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 } + @{ $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 supplied with wrong address [$addr]", $ww); + } + 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,$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'; } 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 ?"; + $got =~ m/^\d+ (\S+)$/ or die "$got ?"; $origin= $1; } }, $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'); + ($rcode,@soa_addrs)= lookup($origin,'a','0',"SOA ORIGIN"); + $wwn= "SOA ORIGIN from $ww"; foreach $soa_addr (@soa_addrs) { - zone_server_addr($addr,$origin,"SOA [$uaddr]" - push @to_check, - $soa_addr, - "$origin, 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, $wa); 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->{'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])); - } - } + zone_consistency_set("serial number and/or SOA ORIGIN",\%soas); + $self_soa= $cfg->{'self_soa'}; } 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) { @@ -431,13 +531,19 @@ sub zone_servers_ok () { } } } + if ($cfg->{'s'} =~ m/s/ && !$delg_to_us) { + zone_warning("we are supposedly published secondary,". + " but not listed as a nameserver",''); + map { $fs{$_}=1 } keys(%delgs), keys(%auths); + zone_warnmore("servers are: ". join ' ', sort keys %fs); + } } sub zone_consistency_set ($%) { 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"); } } @@ -445,7 +551,6 @@ sub zone_consistency_set ($%) { } sub zone_check_local () { - zone_reset(); zone_servers_simplefind(); zone_servers_ok(); } @@ -453,37 +558,87 @@ sub zone_check_local () { sub zone_servers_simplefind () { my ($rcode,@nsnames,$ns,@soas,$origin); - ($rcode,@nsnames)= lookup($zone,'ns-','0'); - foreach $ns (@nsnames) { zone_server_simple($ns,'NS'); } + ($rcode,@nsnames)= lookup($zone,'ns-','0',"zone's servers"); + foreach $ns (@nsnames) { + zone_ns_name($ns,"NS"); + zone_server_simple($ns,'NS',0); + } - ($rcode,@soas)= lookup($zone,'soa','0'); + ($rcode,@soas)= lookup($zone,'soa','0',"SOA ORIGIN"); 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,"lookup $zone SOA"),'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); } + ($rcode,@addrs)= lookup($name,'a','0', "server - ". + ($is_soa ? "SOA ORIGIN" : "NS")); + 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,$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 @@ -501,8 +656,17 @@ sub debug_trace ($) { print "D $_[0]\n"; } -sub lookup ($$$) { - my ($domain,$type,$okrcodes) = @_; +sub has_suffix_of ($$) { + my ($whole,$suffix) = @_; + debug_trace("has_suffix_of $whole $suffix"); + return 0 if length $whole < length $suffix; + return 0 if substr($whole, length($whole) - length($suffix)) ne $suffix; + debug_trace("has_suffix_of $whole $suffix YES"); + return 1; +} + +sub lookup ($$$$) { + my ($domain,$type,$okrcodes,$w) = @_; my ($c,$h,@result); debug_trace("lookup ==> (->$okrcodes) $domain $type"); $h= new IO::Handle; @@ -517,17 +681,16 @@ sub lookup ($$$) { $h->error and die "$quis: read from adnshost:\n $!\n"; chomp @result; $!=0; $h->close; - die "$quis: lookup -t$type $domain $okrcodes failed $? $!\n" - if $! or $?>6 or index($okrcodes,$?)<0; + die "$quis: lookup -t$type $domain $okrcodes ($w) failed $? $! @result\n" + 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"); @@ -556,6 +719,7 @@ sub dig (&$$$) { 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"); @@ -563,17 +727,17 @@ sub dig (&$$$) { } 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= $2.' '.domain_canon($1,$digwhy); } else { debug_trace("ignoring uknown RR type $dig_type"); next; @@ -588,9 +752,10 @@ sub dig (&$$$) { 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; }