Sort of working?

[chiark-utils.git] / scripts / named-conf

diff --git a/scripts/named-conf b/scripts/named-conf
index 9360c6d59e5bb58f2511c5b4963027d4b5ed1be0..1c20660a77c747f948511830c8adff7f6d9b4dda 100755 (executable)
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -13,6 +13,8 @@ $mode= '';
 $verbosity= 1;
 $debug= 0;
 
 $verbosity= 1;
 $debug= 0;
 

+use vars qw($dig_owner $dig_type $dig_rdata);
+

 while (@ARGV && $ARGV[0] =~ m/^\-/) {
     $_= shift @ARGV;
     if (s/^\-\-//) {
 while (@ARGV && $ARGV[0] =~ m/^\-/) {
     $_= shift @ARGV;
     if (s/^\-\-//) {


@@ -29,7 +31,7 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
            if (s/^[ynf]//) { $mode=$&; }
            elsif (s/^v//) { $verbosity=2; }
            elsif (s/^q//) { $verbosity=0; }
            if (s/^[ynf]//) { $mode=$&; }
            elsif (s/^v//) { $verbosity=2; }
            elsif (s/^q//) { $verbosity=0; }

-           elsif (s/^D//) { $debug=1; }
+           elsif (s/^D//) { $debug++; }

            elsif (s/^C//) { $etcfile= soarg(); $where= '-C option'; }
            else { usageerr("unknown option -$&"); }
        }
            elsif (s/^C//) { $etcfile= soarg(); $where= '-C option'; }
            else { usageerr("unknown option -$&"); }
        }


@@ -80,7 +82,7 @@ $default_output= '';
 %output_contents= ();
 
 use vars qw($check $install);
 %output_contents= ();
 
 use vars qw($check $install);

-$check= $mode !~ m/^n/;
+$check= $mode !~ m/^f/;

 $install= $mode =~ m/^[yf]/;
 
 read_config($etcfile);
 $install= $mode =~ m/^[yf]/;
 
 read_config($etcfile);


@@ -191,6 +193,11 @@ sub progress ($) {
     print "$_[0]\n";
 }
 
     print "$_[0]\n";
 }
 

+sub verbose ($) {
+    return if $verbosity<2;
+    print "    $_[0]\n";
+}
+

 sub process_zones (@) {
     my (@zones) = @_;
     local ($zone,$cfg);
 sub process_zones (@) {
     my (@zones) = @_;
     local ($zone,$cfg);


@@ -225,16 +232,16 @@ 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(%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);
 use vars qw(%addr_is_ok);

+use vars qw(@to_check); # ($addr,$whyask,$is_auth,$glueless_ok, ...)
+use vars qw(@to_check_soa); # ($addr,$whyask, ...)

 
 sub zone_check () {
     my ($super_zone, @super_nsnames,
 
 sub zone_check () {
     my ($super_zone, @super_nsnames,

-       $super_ns, @super_ns_addrs, $super_ns_addr, $s, $wa, $zcr,
-       %nsrrset_checked, %soa_checked);
+       $super_ns, @super_ns_addrs, $s, $wa, $is_auth,
+       %nsrrset_checked, %soa_checked, $addr, $glueless_ok, $rcode);

 
 

-    %delgs= %auths= %glue= ();
+    %delgs= %auths= %glue= %soas= %addr_is_ok= ();

     @to_check= @to_check_soa= ();
 
     $super_zone= $zone;
     @to_check= @to_check_soa= ();
 
     $super_zone= $zone;


@@ -246,12 +253,12 @@ sub zone_check () {
     }
     for $super_ns (@super_nsnames) {
        $super_ns= lc $super_ns;
     }
     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,
            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 (;;) {
        }
     }
     for (;;) {


@@ -259,21 +266,87 @@ sub zone_check () {
        # 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.
        # 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, "[$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");
+       } else {
+           last;

        }
     }
     zone_consistency();
 }
 
        }
     }
     zone_consistency();
 }
 

+sub zone_check_nsrrset ($$$$) {
+    my ($uaddr,$ww, $is_auth, $glueless_ok) = @_;
+    my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths);
+    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;
+           $addr_is_ok{$dig_rdata}= "$dig_owner (NS [$uaddr])"
+               if $cfg->{'style'} eq 'stealth';
+           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"); }
+    @s= sort keys %s2g;
+    foreach $s (@s) {
+       @glue= @{ $s2g{$s} };
+       if (!@glue) {
+           zone_warning("glueless NS $s, from $ww") unless $glueless_ok;
+           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_check_soa ($$) {
+    my ($uaddr,$ww) = @_;
+    my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr);
+    verbose("checking service at $ww");
+    $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 $ww"); return; }
+    push @{ $soas{$got} }, $ww;
+    ($rcode,@soa_addrs)= lookup($origin,'a','0');
+    foreach $soa_addr (@soa_addrs) {
+       $addr_is_ok{$soa_addr}= "$origin (SOA [$uaddr])";
+       push @to_check,
+            $soa_addr,
+             "$origin, SOA ORIGIN from $ww";
+    }
+}
+

 sub zone_consistency() {
 sub zone_consistency() {

-    my ($d, $org_ser, $origin, $a, $showok);
+    my ($d, $org_ser, $origin, $a, $showok, $h);

     zone_consistency_set('delegations',\%delgs);
     foreach $d (keys %delgs) { delete $auths{$d}; }
     zone_consistency_set('zone nameserver rrset',\%auths);
     zone_consistency_set('delegations',\%delgs);
     foreach $d (keys %delgs) { delete $auths{$d}; }
     zone_consistency_set('zone nameserver rrset',\%auths);


@@ -290,85 +363,31 @@ sub zone_consistency() {
                         " eg from ".((values %{ $soas{$org_ser} })[1]));
        }
     }
                         " 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);
+    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;
+       }
+       if ($showok) {
+           foreach $a (keys %addr_is_ok) {
+               zone_warnmore("permitted master [$a] $addr_is_ok{$a}");
+           }
+       }

     }
 }
 
 sub zone_consistency_set ($%) {
     my ($msg,$set) = @_;
     my ($d,$o);
     }
 }
 
 sub zone_consistency_set ($%) {
     my ($msg,$set) = @_;
     my ($d,$o);

-    if (keys(%$set) != 1) {
+    if (keys(%$set) > 1) {

        zone_warning("inconsistent $msg:");
        foreach $d (keys %$set) {
        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_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
 
 
 #-------------------- outputting
 


@@ -390,7 +409,7 @@ END
 
 sub debug_dump ($) {
     my ($vn);
 
 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)";
     local $Data::Dumper::Terse=1;
     foreach $vn (split /\s+/, $_[0]) {
        print "$vn := ", eval "Dumper(\\$vn)";


@@ -403,36 +422,40 @@ sub debug_trace ($) {
 }
 
 sub lookup ($$$) {
 }
 
 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 "$0: fork adnshost:\n $!\n";

     if (!$c) {
        exec 'adnshost','-Fi','+Do','+Dt','+Dc','-Cf',"-t$type",
             '-',"$domain.";
        die "$0: exec adnshost:\n $!\n";
     }
     if (!$c) {
        exec 'adnshost','-Fi','+Do','+Dt','+Dc','-Cf',"-t$type",
             '-',"$domain.";
        die "$0: exec adnshost:\n $!\n";
     }

-    @result= <ADH>;
+    @result= $h->getlines();
+    $h->error and die "$0: read from adnshost:\n $!\n";

     chomp @result;
     chomp @result;

-    $!=0; close ADH;
+    $!=0; $h->close;

     die "$0: lookup -t$type $domain $okrcodes failed $? $!\n"
        if $! or $?>6 or index($okrcodes,$?)<0;
     die "$0: lookup -t$type $domain $okrcodes failed $? $!\n"
        if $! or $?>6 or index($okrcodes,$?)<0;

+    debug_trace("lookup <== $? @result");

     return ($?,@result);
 }
 
 
     return ($?,@result);
 }
 
 

-package dig;
-
-use vars $owner, $type, $rdata;
-

 sub dig (&$$$) {
     my ($eachrr, $qowner,$qtype,$qaddr) = @_;
     # also pseudo-rr with type `flags:'
 sub dig (&$$$) {
     my ($eachrr, $qowner,$qtype,$qaddr) = @_;
     # also pseudo-rr with type `flags:'

-    my ($h,$inmid);
+    my ($h,$inmid,$irdata,$c);

     local ($_);
 
     local ($_);
 

+    debug_trace("dig ==> \@$qaddr $qowner $qtype");
+

     $h= new IO::Handle;
     defined($c= open $h, "-|") or die "$0: fork dig:\n $!\n";
     if (!$c) {
     $h= new IO::Handle;
     defined($c= open $h, "-|") or die "$0: fork dig:\n $!\n";
     if (!$c) {

+       open STDERR, ">&STDOUT" or die $!;

        exec ('dig',
              '+nodef','+nosea','+nodebug','+norecurse',
              "\@$qaddr",'-t',$qtype,$qowner);
        exec ('dig',
              '+nodef','+nosea','+nodebug','+norecurse',
              "\@$qaddr",'-t',$qtype,$qowner);


@@ -450,35 +473,45 @@ sub dig (&$$$) {
            s/\;.*$//;
            $_= $inmid.$_;
            $inmid='';
            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 ]+)\;/) {
        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/^\;/) {
        } 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 {
            } else {

-               debug_trace("ignoring uknown RR type $rtype");
+               debug_trace("ignoring uknown RR type $dig_type");

                next;
            }
                next;
            }

-           { package mina; &$dig::eachrr; }
+           debug_trace("dig  $dig_owner $dig_type $dig_rdata");
+           &$eachrr;

        } else {
            debug_trace("ignoring unknown dig output $_");
        }
     }
        } else {
            debug_trace("ignoring unknown dig output $_");
        }
     }

-    $h->close or die $!;
+    $h->close;
+    debug_trace("dig <== gave $?");
+}
+
+sub domain_canon ($) {
+    local ($_) = @_;
+    s/(.)\.$/$1/;
+    return lc $_;

 }
 
 __DATA__
 }
 
 __DATA__