X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=machines.cgi;h=ce41198dcd44da4dadd569eca5c1e83a8c0fe059;hb=2810251c37f6e1b1ae68fcda76c1a776315633cb;hp=b1951faad7700b8b383ae4824be7625f45c855f3;hpb=564e86b5e750fb3f448a336fdd7f441b6e57e4ed;p=mirror%2Fuserdir-ldap-cgi.git diff --git a/machines.cgi b/machines.cgi index b1951fa..ce41198 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 @@ -113,20 +95,21 @@ sub item_uplist($) { $out = "
$summaryattrs{$key} | "; + $hostdetails .= "$summaryattrs{$key} | "; } else { if ($sortorder ne "dsc") { - $hostdetails .= "$summaryattrs{$key} | "; + $hostdetails .= "$summaryattrs{$key} | "; } else { - $hostdetails .= "$summaryattrs{$key} | "; + $hostdetails .= "$summaryattrs{$key} | "; } } } - $hostdetails .= "
---|