X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-nrpe-config%2Fweak-ssh-keys-check;h=25cde53c92d21afeea2cc3e53fcf0bd045b62f18;hb=682fa1a77ef21e4b1ccd5ee3cf9a1759690d80df;hp=a1a52949e0e381271a0b57b45070d7479c77bea2;hpb=3b1d57580fdf016809a35b1f98d95a65bc875a69;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-nrpe-config/weak-ssh-keys-check b/dsa-nagios-nrpe-config/weak-ssh-keys-check
index a1a5294..25cde53 100755
--- a/dsa-nagios-nrpe-config/weak-ssh-keys-check
+++ b/dsa-nagios-nrpe-config/weak-ssh-keys-check
@@ -121,7 +121,8 @@ my %key_sizes;
 
 
 
-&from_user_all;
+#&from_user_all;
+&from_debianorg_places;
 &from_ssh_host(qw(localhost));
 
 my $status="OK";
@@ -194,7 +195,7 @@ sub from_ssh_key_file ($) {
     my $name = shift;
     if (open (my $FH, '<', $name)) {
 	my $key = <$FH>; 
-	if ($key =~ m/^ssh-dss/) {
+	if ($key =~ m/ssh-dss/) {
 		$dsa_keys++;
 		$text .= "$name is a DSA key\n";
 	}
@@ -229,7 +230,7 @@ sub from_ssh_auth_file ($) {
 	clear_tmp $tmp;
 	next if $line =~ m/^$/; # ignore empty lines
 	next if $line =~ m/^#/; # ignore comments
-	if ($line =~ m/^ssh-dss/) {
+	if ($line =~ m/ssh-dss/) {
 		$dsa_keys++;
 		$text .= "$name:$lineno is a DSA key\n";
 	}
@@ -253,6 +254,7 @@ sub from_ssh_host (@) {
     my $tmp = new File::Temp;
     for my $line (@lines) {
 	next if $line =~ /^#/;
+	next if $line =~ /^no hostkey alg/;
 	my ($host, $data) = $line =~ /^(\S+) (.*)$/;
 	clear_tmp $tmp;
 	print $tmp "$data\n" or die "print: $!";
@@ -289,3 +291,43 @@ sub from_user_all () {
 }
 
 
+sub from_debianorg_places () {
+    open(F, "/etc/ssh/sshd_config") or die ("Cannot open /etc/ssh/sshd_config: $!\n");
+    my @lines = <F>;
+    close(F);
+
+    my @ak = grep { /^AuthorizedKeysFile\s/i } @lines;
+    my @ak2 = grep { /^AuthorizedKeysFile2\s/i } @lines;
+
+    if (scalar @ak != 1) {
+	print $fh "UNKNOWN\n";
+	print $fh "There is more than one AuthorizedKeysFile definition in sshd_config\n";
+	exit
+    }
+    if (scalar @ak2 != 1) {
+	print $fh "UNKNOWN\n";
+	print $fh "There is more than one AuthorizedKeysFile2 definition in sshd_config\n";
+	exit
+    }
+    unless ($ak[0] =~ m#^((?i)AuthorizedKeysFile)\s+/etc/ssh/userkeys/%u$# ) {
+	print $fh "UNKNOWN\n";
+	print $fh "The AuthorizedKeysFile definition has an unexpected value.  Should be /etc/ssh/userkeys/%u\n";
+	exit
+    }
+    unless ($ak2[0] =~ m#^((?i)AuthorizedKeysFile2)\s+/var/lib/misc/userkeys/%u$# ) {
+	print $fh "UNKNOWN\n";
+	print $fh "The AuthorizedKeysFile2 definition has an unexpected value.  Should be /var/lib/misc/userkeys/%u\n";
+	exit
+    }
+
+    for my $d (qw{/etc/ssh/userkeys /var/lib/misc/userkeys}) {
+	next unless (-d $d);
+	opendir(D, $d) or die "Cannot opendir $d: $!\n";
+	for my $file (grep { $_ ne "." && $_ ne ".."  } readdir(D)) {
+	    my $f = $d.'/'.$file;
+	    from_ssh_key_file $f if -r $f;
+	};
+    };
+}
+
+