X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-dnssec-delegation;h=5e25363735cd96c86eddf8757b8baf0aa24dbe2c;hb=ba41213d86fa3d26a0ee0505bb7d72dcfe3d6559;hp=513b098794c91ff8b3a64d2c3395282a3e6d02f5;hpb=e0eb79fce1b07ee711930c2df9a5858daf0b6cc3;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-dnssec-delegation b/dsa-nagios-checks/checks/dsa-check-dnssec-delegation
index 513b098..5e25363 100755
--- a/dsa-nagios-checks/checks/dsa-check-dnssec-delegation
+++ b/dsa-nagios-checks/checks/dsa-check-dnssec-delegation
@@ -31,12 +31,14 @@ $SIG{'__DIE__'} = sub { print @_; exit 4; };
 
 my $RES = Net::DNS::Resolver->new;
 my $DLV = 'dlv.isc.org';
+my $params;
 
 sub get_tag_generic {
 	my $zone = shift;
 	my $type = shift;
 
 	my @result;
+	print "Querying $type $zone\n" if $params->{'verbose'};
 	my $pkt = $RES->send($zone, $type);
 	return () unless $pkt;
 	return () unless $pkt->answer;
@@ -78,19 +80,18 @@ sub has_dnskey_parent {
 		$potential_parent = '.';
 	}
 
+	print "Querying DNSKEY $potential_parent\n" if $params->{'verbose'};
 	my $pkt = $RES->send($potential_parent, 'DNSKEY');
 	return undef unless $pkt;
 	return undef unless $pkt->header;
 
-	# try to find the zone start
 	unless ($pkt->answer) {
-		#print "Looking for zone apex\n";
 		return undef unless $pkt->authority;
 		for my $rr ($pkt->authority) {
 			next unless ($rr->type eq 'SOA');
 
 			$potential_parent = $rr->name;
-			#print "Found it at $potential_parent\n";
+			print "Querying DNSKEY $potential_parent\n" if $params->{'verbose'};
 			$pkt = $RES->send($potential_parent, 'DNSKEY');
 			return undef unless $pkt;
 			last;
@@ -112,7 +113,7 @@ sub get_parent_dnssec_status {
 		last unless defined $status;
 		push @result, ($status ? "yes" : "no") . ("($parent)");
 		$zone = $parent;
-		last if $zone eq "";
+		last if $zone eq "" || $zone eq '.';
 	};
 
 	return join(', ', @result);
@@ -148,12 +149,12 @@ sub what_to_check {
 	return @keys;
 }
 
-my $params;
 Getopt::Long::config('bundling');
 GetOptions (
 	'--help' => \$params->{'help'},
 	'--dir=s' => \$params->{'dir'},
 	'--dlv=s' => \$params->{'dlv'},
+	'--verbose' => \$params->{'verbose'},
 ) or usage(\*STDERR, 1);
 usage(\*STDOUT, 0) if ($params->{'help'});
 
@@ -185,15 +186,16 @@ if (scalar @ARGV) {
 
 $DLV = $params->{'dlv'} if $params->{'dlv'};
 
-my %data;
-for my $zone (@zones) {
-	$data{$zone} = { 'dnskey' => join(', ', get_dnskeytags($zone)),
-	                 'ds'     => join(', ', get_dstags($zone)),
-	                 'dlv'    => join(', ', get_dlvtags($zone)),
-	                 'parent_dnssec' => get_parent_dnssec_status($zone) };
-}
 
 if ($mode eq 'overview') {
+	my %data;
+	for my $zone (@zones) {
+		$data{$zone} = { 'dnskey' => join(', ', get_dnskeytags($zone)),
+				 'ds'     => join(', ', get_dstags($zone)),
+				 'dlv'    => join(', ', get_dlvtags($zone)),
+				 'parent_dnssec' => get_parent_dnssec_status($zone) };
+	}
+
 	my $format = "%60s %-10s %-10s %-10s %-10s\n";
 	printf $format, "zone", "DNSKEY", "DS\@parent", "DLV", "dnssec\@parent";
 	printf $format, "-"x 60,  "-"x 10,  "-"x 10,  "-"x 10, "-"x 10;
@@ -214,15 +216,15 @@ if ($mode eq 'overview') {
 
 	my @warn;
 	my @ok;
-	for my $zone (sort {$a cmp $b} keys %data) {
+	for my $zone (sort {$a cmp $b} @zones) {
 		my @thiskeys = $key eq 'per-zone' ? what_to_check($zone, $params->{'dir'}) : ($key);
 
+		my $dnskey = join(', ', get_dnskeytags($zone)) || '-';
 		for my $thiskey (@thiskeys) {
-			my $dnskey = $data{$zone}->{'dnskey'} || '-';
-			my $target = $data{$zone}->{$thiskey} || '-';
+			my $target = join(', ', $thiskey eq 'ds' ? get_dstags($zone) : get_dlvtags($zone)) || '-';
 
 			if ($dnskey ne $target) {
-				push @warn, "$zone ($dnskey != $target)";
+				push @warn, "$zone ([$dnskey] != [$target])";
 			} else  {
 				push @ok, "$zone ($dnskey)";
 			};