X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=machines.cgi;h=e8670987a80fcd0c357da7aa8481fca8032cab39;hb=bdb0d38c94dd9eebd825e03e5392d6fc6f9fcc71;hp=f01d4e161fb698b6dc2753e8b2bf1c8fb9d80826;hpb=8f5508b9c16b83dd323f0bf8eabdfd67b979eb0e;p=mirror%2Fuserdir-ldap-cgi.git
diff --git a/machines.cgi b/machines.cgi
index f01d4e1..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',
@@ -51,12 +50,13 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems);
# ditto for summary
%summaryattrs = ('hostname' => 'Host name',
'host' => 'just for a link',
+ 'description' => 'Description',
'architecture' => 'Architecture',
'status' => 'Status',
'access' => 'Access',
'sponsor' => 'Sponsor',
'purpose' => 'Purpose');
-@summaryorder = qw{hostname architecture sponsor purpose status access};
+@summaryorder = qw{hostname description architecture sponsor purpose status access};
%summarylistitems = map {$_=>1} qw{purpose sponsor};
# Global settings...
@@ -67,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});
- 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
@@ -120,7 +102,7 @@ sub item_uplist($) {
return $out;
}
-$SIG{__DIE__} = \&DieHandler;
+#$SIG{__DIE__} = \&DieHandler;
my $query = new CGI;
my $host = lc($query->param('host'));
@@ -169,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});
@@ -205,7 +183,7 @@ if ($output{havehostdata}) {
$hostdetails .= "