From 487dab8084a60dd81ecd1079e0ecd6aaac1c4d51 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Wed, 9 Mar 2016 22:57:36 +0800 Subject: [PATCH] Drop SSH key fingerprint info from machines.cgi pages Suggested-by: Drew Parsons Suggested-in: <1457492501.9688.6.camel@debian.org> --- debian/changelog | 1 + machines.cgi | 23 ----------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7b0c4d..c16c92a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ userdir-ldap-cgi (0.3.40) UNRELEASED; urgency=medium * ravel is no longer recommended for general shell usage * Add a hint about how to merge existing SSH keys * Update LDAP search docs for the usergroups changes + * Drop SSH key fingerprint info from machines.cgi pages -- Peter Palfrader Sat, 03 Jan 2015 13:56:47 +0100 diff --git a/machines.cgi b/machines.cgi index 41ebe25..e867098 100755 --- a/machines.cgi +++ b/machines.cgi @@ -35,7 +35,6 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems); 'status' => 'Status', 'notes' => 'Notes', 'sshrsahostkey' => 'SSH host key', - 'sshrsahostfprint' => 'SSH host fingerprint', 'description' => 'Description', 'purpose' => 'purposes of this server', # 'createtimestamp' => 'Entry created', @@ -68,24 +67,6 @@ sub DieHandler { $ldap->unbind if (defined($ldap)); } -# human readable fingerprint -sub sshfingerprint { - my $key = shift; - - return '' if (!$key); - - my @field = split(/ /, $key); - my %keytypes = map {$_=>1} (qw{ssh-dss ssh-rsa ecdsa-sha2-nistp256 ssh-ed25519}); - return '' unless $keytypes{$field[0]}; - return '' if !$field[1]; - my $fpr = md5_hex(decode_base64($field[1])); - my $hrfpr = $field[0] . " " . substr($fpr,0,2,""); - while (length $fpr > 0) { - $hrfpr .= ':' . substr($fpr,0,2,""); - } - return $hrfpr; -} - sub wiki_link($) { my ($in) = @_; # [[hostname|text]] makes a link @@ -170,10 +151,6 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]} $output{sshrsahostkey} .= $key . "
"; } - foreach $key (@{$data->{sshrsahostkey}}) { - $output{sshrsahostfprint} .= sshfingerprint($key) . "
"; - } - my $sponsor = item_uplist($data->{sponsor}); $output{sponsor} = $sponsor if defined $sponsor; my $purpose = item_uplist($data->{purpose}); -- 2.20.1