X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=scripts%2Fnamed-conf;h=cee377400ffc8916cccf0a9ad7a2c3d1b41c843a;hb=1a320384bf338f93d3c42974750b57d97202a8dd;hp=e788f07a4251f034d08a030e13c583ff3be5eeca;hpb=4f4c11add419e120b2800a350f23091f47e7e03f;p=chiark-utils.git

diff --git a/scripts/named-conf b/scripts/named-conf
index e788f07..cee3774 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -1,74 +1,491 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
-$base= "/var/named";
-$conf= "$base/conf";
-$etcfile= "/etc/named/zones-rgc";
+use strict;
+use IO::File;
+use Data::Dumper;
 
-$check= 1;
-$progress= 1;
+use vars qw($etcfile $where);
+$etcfile= "/etc/bind/chiark-conf-gen.zones";
+$where= '<built-in>';
 
-while ($ARGV[0] =~ m/^\-/) {
+use vars qw($mode $verbosity $debug);
+$mode= '';
+$verbosity= 1;
+$debug= 0;
+
+while (@ARGV && $ARGV[0] =~ m/^\-/) {
     $_= shift @ARGV;
-    last if m/^\-\-?$/;
-    while (m/^\-./) {
-	if (s/^\-f/-/) { $usage=0; $check=0; $install++; }
-	elsif (s/^\-y/-/) { $usage=0; $check=1; $install++; }
-	elsif (s/^\-n/-/) { $usage=0; $check=1; $install=0; }
-	elsif (s/^\-h/-/) { $hostdelg=1; $hostzone=0; }
-	elsif (s/^\-z/-/) { $hostdelg=1; $hostzone=1; }
-	elsif (s/^\-q/-/) { $progress=0; }
-	else { $usage=1; break; }
+    if (s/^\-\-//) {
+	last if m/^$/;
+	if (m/^quiet$/) { $verbosity=0; }
+	elsif (m/^verbose$/) { $verbosity=2; }
+	elsif (m/^(yes|no|force)$/) { m/^./; $mode= $&; }
+	elsif (m/^config$/) { $etcfile= loarg(); $where= '--config option'; }
+	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/^C//) { $etcfile= soarg(); $where= '-C option'; }
+	    else { usageerr("unknown option -$&"); }
+	}
     }
 }
 
-die
-"usage: named-conf-regen -f|-y|-n [-h|-z]\n".
+sub loarg() { usageerr("missing option value") if !@ARGV; return shift @ARGV; }
+sub soarg() { my ($rv); $rv=$_; $_=''; return length $rv ? $rv : loarg(); }
+
+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".
 "operation modes:\n".
-" -f   install without checking     -ff  and then ndc reload\n".
-" -y   check and install            -yy  and then ndc reload\n".
-" -n   check only\n".
+" -f --force   install without checking\n".
+" -y --yes     check and install\n".
+" -n --no      check only\n".
 "additional options:\n".
-" -h   check output from host -C\n".
-" -z   check output from host -C and host -val\n".
-    if $usage;
-
-beginfile('secondary.zones');
-open E, "< $etcfile" or die "$0: open $etcfile: $!\n";
-for (;;) {
-    $!=0; defined $_=<E> or die "$0: read $etcfile $!\n";
-    s/^\s+//; chomp; s/\s+$//;
-    next if m/^\#/;
-    last if m/^end$/;
-    if (m/^myname\s+(\S.*\S)/) {
-	@mynames= split /\s+/, $1;
-    } elsif (m/^(secondary|backup|unoff)\s+(\S+)\s+([0-9. \t]+)$/) {
-	$style= $1;
-	$zone= $2;
-	@servers= split /\s+/, $3;
-	$file= "slave/$zone";
-	progress();
-	check();
-    } else {
-	die "$0: $etcfile:$.: syntax error in \`$_'\n";
+" -q --quiet   no output for OK zones\n".
+" -v --verbose extra verbose\n";
+}
+
+cfg_fail("config filename $etcfile should have been absolute path of a file")
+    unless $etcfile =~ m,^/, && $etcfile !~ m,/$,;
+
+use vars qw($default_dir);
+$default_dir= $etcfile;
+$default_dir =~ s,/[^/]+$,,;
+
+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(%zone_cfg @zone_cfg_list);
+%zone_cfg= ();
+@zone_cfg_list= ();
+
+use vars qw($output $default_output %output_contents);
+$output= '';
+$default_output= '';
+%output_contents= ();
+
+use vars qw($check $install);
+$check= $mode !~ m/^n/;
+$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');
+
+
+#-------------------- 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 lookup ($$) {
-    my ($type,$domain) = @_;
+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;
+
+sub progress ($) {
+    return if !$verbosity;
+    print "$_[0]\n";
+}
+
+sub process_zones (@) {
+    my (@zones) = @_;
+    local ($zone,$cfg);
+
+    foreach $zone (@zones) {
+	$cfg= $zone_cfg{$zone} || {
+	    'style' => 'foreign',
+	    'servers' => [ ],
+	    };
+	progress(sprintf "%-40s %s", $zone, $$cfg{'style'});
+	if ($check) {
+	    eval { zone_check() };
+	    zone_warning("checks failed: $@") if length $@;
+	}
+	zone_output() if $install;
+    }
+}
+
+sub zone_warning ($) {
+    my ($w) = @_;
+    $w =~ s/\n$//;
+    $w =~ s,\n, // ,g;
+    print STDERR "$zone: warning: $w\n" or die $!;
+    $warnings++;
+}
+
+sub zone_warnmore ($) {
+    print STDERR " $_[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(@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);
+
+    %delgs= %auths= %glue= ();
+    @to_check= @to_check_soa= ();
+
+    $super_zone= $zone;
+    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');
+	last if !$rcode;
+    }
+    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) {
+	    push @to_check,
+	         $super_ns_addr,
+		 "addr for $super_ns, server for $super_zone, parent"
+		 \%delgs, 0;
+	}
+    }
+    for (;;) {
+	# We do these in order so that we always do NS RRset checks on
+	# 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");
+	}
+    }
+    zone_consistency();
+}
+
+sub zone_consistency() {
+    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 ($\%) {
+    my ($msg,$set) = @_;
+    my ($d,$o);
+    if (keys(%$set) != 1) {
+	zone_warning("inconsistent $msg:");
+	foreach $d (keys %$set) {
+	    foreach $o (@$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_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;
+}
+
+
+#-------------------- 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'});
+}
+
+
+#-------------------- general utilities
+
+sub debug_dump ($) {
+    my ($vn);
+    return unless $debug;
+    local $Data::Dumper::Terse=1;
+    foreach $vn (split /\s+/, $_[0]) {
+	print "$vn := ", eval "Dumper(\\$vn)";
+    }
+}
+
+sub debug_trace ($) {
+    return unless $debug;
+    print "D $_[0]\n";
+}
+
+sub lookup ($$$) {
+    my ($type,$domain,$okrcodes) = @_;
     my ($c,@result);
-    defined($c=open ADH, "-|") or die "$0: fork adnshost: $!\n";
+    defined($c= open ADH, "-|") or die "$0: fork adnshost:\n $!\n";
     if (!$c) {
-	exec 'adnshost','+Do','+Dt','+Dc','-Cf',"-t$type",
+	exec 'adnshost','-Fi','+Do','+Dt','+Dc','-Cf',"-t$type",
 	     '-',"$domain.";
-	die "$0: exec adnshost: $!\n";
+	die "$0: exec adnshost:\n $!\n";
     }
     @result= <ADH>;
     chomp @result;
     $!=0; close ADH;
-    die "$0: lookup -t$type $domain failed $? $!\n" if $? or $!;
-    return @result;
+    die "$0: lookup -t$type $domain $okrcodes failed $? $!\n"
+	if $! or $?>6 or index($okrcodes,$?)<0;
+    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__
+
+
+
+
 sub lookup1 ($$) {
     my ($type,$domain) = @_;
     my (@result)= lookup($type,$domain);
@@ -121,7 +538,7 @@ sub check () {
 	for $super_ns (@super_ns) {
 	    @deleg_ns= ();
 	    open DIG, "dig @$super_ns. -t ns +norecurse $zone."
-		or die "$0: fork for dig: $!\n";
+		or die "$0: fork for dig:\n $!\n";
 	    while (<DIG>) {
 		
 
@@ -197,7 +614,7 @@ done
 endfile
 
     
-chdir "$base/primary" or die "$0: chdir $base/primary: $!";
+chdir "$base/primary" or die "$0: chdir $base/primary:\n $!";
 beginfile('primary.zones');
 
 for $f (<*_db>) {
@@ -207,11 +624,6 @@ for $f (<*_db>) {
 for f in $zones
 do
 	zone="`echo $f | sed -e 's/_db$//'`"
-	cat <<END
-zone "$zone" {
-	type master;
-	file "primary/$f";
-};
 END
 done
 endfile
@@ -221,19 +633,19 @@ endfile
 sub beginfile ($) {
     $currentfile= $_[0];
     $currentfile_opened= $install ? "$conf/$currentfile.new" : "/dev/null";
-    open CFF, "> $toopen" or die "$0: begin $currentfile_opened: $!\n";
+    open CFF, "> $toopen" or die "$0: begin $currentfile_opened:\n $!\n";
 }
 
 endfile () {
-    close CFF or die "$0: close $currentfile_opened: $!\n";
+    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";
+    chdir $conf or die "$0: chdir $conf:\n $!\n";
     for $f (@files) {
-	rename "$f.new", $f or die "$0: install new $f: $!\n";
+	rename "$f.new", $f or die "$0: install new $f:\n $!\n";
     }
 }