X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=machines.cgi;h=34d622a9536db5860e2f313aef53d5181e50a0a9;hb=43878ea9452342f57b453ae2098100de2089517d;hp=1b2c0228235c96427c3b87039b8e414c33487b6c;hpb=a624b016dbd549ba5afb72e09478dccab18f53b6;p=mirror%2Fuserdir-ldap-cgi.git diff --git a/machines.cgi b/machines.cgi index 1b2c022..34d622a 100755 --- a/machines.cgi +++ b/machines.cgi @@ -1,7 +1,10 @@ #!/usr/bin/perl -# $Id: machines.cgi,v 1.3 1999/09/30 06:21:28 tausq Exp $ +# $Id: machines.cgi,v 1.12 2006/12/27 23:00:04 rmurray Exp $ # (c) 1999 Randolph Chung. Licensed under the GPL. +# (c) 2004 Martin Schulze. Licensed under the GPL. +# (c) 2006 Ryan Murray. Licensed under the GPL. +# (c) 2008 Martin Zobel-Helas. Licensed under the GPL. use lib '.'; use strict vars; @@ -9,6 +12,10 @@ use strict vars; use CGI; use Util; use Net::LDAP qw(:all); +use Fcntl; +use POSIX; +use MIME::Base64; +use Digest::MD5 qw(md5_hex); my (%attrs, @attrorder, %summaryattrs, @summaryorder); @@ -25,23 +32,31 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder); 'memory' => 'Memory', 'disk' => 'Disk space', 'bandwidth' => 'Bandwidth', + 'status' => 'Status', 'notes' => 'Notes', - 'createtimestamp' => 'Entry created', - 'modifytimestamp' => 'Entry modified' + 'sshrsahostkey' => 'SSH host key', + 'sshrsahostfprint' => 'SSH host fingerprint', + 'description' => 'Description', + 'purpose' => 'purposes of this server', +# 'createtimestamp' => 'Entry created', +# 'modifytimestamp' => 'Entry modified' ); # This defines what fields are displayed, and in what order -@attrorder = ('hostname', 'admin', 'architecture', 'distribution', 'access', - 'sponsor', 'sponsor-admin', 'location', 'machine', 'memory', - 'disk', 'bandwidth', 'notes', 'createtimestamp', 'modifytimestamp'); +@attrorder = qw(hostname admin architecture distribution access + sponsor sponsor-admin location machine memory + disk bandwidth status notes sshrsahostkey sshrsahostfprint + description purpose); # ditto for summary %summaryattrs = ('hostname' => 'Host name', 'host' => 'just for a link', 'architecture' => 'Architecture', + 'distribution' => 'Distribution', + 'status' => 'Status', 'access' => 'Access'); -@summaryorder = ('hostname', 'architecture', 'access'); +@summaryorder = ('hostname', 'architecture', 'distribution', 'status', 'access'); # Global settings... my %config = &Util::ReadConfigFile; @@ -51,10 +66,29 @@ sub DieHandler { $ldap->unbind if (defined($ldap)); } +# human readable fingerprint +sub sshfingerprint { + my $key = shift; + + return '' if (!$key); + + my @field = split(/ /, $key); + return '' if $field[0] ne 'ssh-dss' and $field[0] ne 'ssh-rsa'; + 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; +} + $SIG{__DIE__} = \&DieHandler; my $query = new CGI; my $host = lc($query->param('host')); +my $sortby = lc($query->param('sortby')) || "host"; +my $sortorder = lc($query->param('sortorder')) || "asc"; &Util::HTMLSendHeader; $ldap = Net::LDAP->new($config{ldaphost}) || &Util::HTMLError($!); @@ -65,7 +99,7 @@ $mesg = $ldap->search(base => $config{hostbasedn}, filter => 'host=*'); $mesg->code && &Util::HTMLError($mesg->error); $entries = $mesg->as_struct; -foreach $dn (sort {$entries->{$a}->{host}->[0] <=> $entries->{$b}->{host}->[0]} keys(%$entries)) { +foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]} keys(%$entries)) { $data = $entries->{$dn}; my $thishost = $data->{host}->[0]; @@ -77,6 +111,11 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] <=> $entries->{$b}->{host}->[0]} foreach $key (keys(%attrs)) { $output{$key} = $data->{$key}->[0]; } + + $output{hostname} = undef; + foreach my $hostname (@{$data->{hostname}}) { + $output{hostname} .= sprintf("%s%s", ($output{hostname} ? ', ' : ''), $hostname); + } # Modified/created time. TODO: maybe add is the name of the creator/modifier $output{modifytimestamp} = &Util::FormatTimestamp($output{modifytimestamp}); @@ -85,20 +124,33 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] <=> $entries->{$b}->{host}->[0]} # Format email addresses $output{admin} = sprintf("%s", $output{admin}, $output{admin}); $output{'sponsor-admin'} = sprintf("%s", $output{'sponsor-admin'}, $output{'sponsor-admin'}); + + $output{sshrsahostkey} = undef; + foreach $key (@{$data->{sshrsahostkey}}) { + $output{sshrsahostkey} .= $key . "
"; + } + + foreach $key (@{$data->{sshrsahostkey}}) { + $output{sshrsahostfprint} .= sshfingerprint($key) . "
"; + } # URL - my $sponsor; + my ($sponsor, $url) = undef; $output{sponsor} = undef; foreach $sponsor (@{$data->{sponsor}}) { - print "\n"; - $sponsor =~ /(.*)\s*(http.*)?/i; + $sponsor =~ m#((http|ftp)://\S+)#i; + $url = $1; + $sponsor =~ s/\s*$url\s*//; $output{sponsor} .= "
" if ($output{sponsor}); - if ($2) { - $output{sponsor} .= sprintf("%s", $1, $2); + if ($url) { + $output{sponsor} .= sprintf("%s", $url, $sponsor); } else { - $output{sponsor} .= $1; + $output{sponsor} .= $sponsor; } } + + #Reformat purposes to be pleasing for the human eye: + $output{purpose} = join(",", @{$data->{purpose}}); $selected = " selected "; } @@ -110,8 +162,10 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] <=> $entries->{$b}->{host}->[0]} $summary{$thishost}{$key} = $data->{$key}->[0]; } - $summary{$thishost}{hostname} = sprintf("%s", - $summary{$thishost}{host}, $summary{$thishost}{hostname}); + $summary{$thishost}{hostname} = undef; + foreach my $hostname (@{$data->{hostname}}) { + $summary{$thishost}{hostname} .= sprintf("%s%s", ($summary{$thishost}{hostname} ? '
' : ''), $summary{$thishost}{host}, $hostname); + } } $ldap->unbind; @@ -120,20 +174,34 @@ if ($output{havehostdata}) { $hostdetails .= "
    \n"; foreach $key (@attrorder) { if ($output{$key}) { - $hostdetails .= "
  • $attrs{$key}: $output{$key}\n"; + $hostdetails .= "
  • $attrs{$key}:$output{$key}\n"; } } $hostdetails .= "
\n"; } else { # display summary info $hostdetails = "

Summary

\n"; - $hostdetails .= "\n
"; + $hostdetails .= "\n"; foreach $key (@summaryorder) { - $hostdetails .= ""; + if ($sortby ne $key) { + $hostdetails .= ""; + } else { + if ($sortorder ne "dsc") { + $hostdetails .= ""; + } else { + $hostdetails .= ""; + } + } } - $hostdetails .= "\n"; + $hostdetails .= "\n"; - foreach $host (sort(keys(%summary))) { + my @sorted; + if ($sortorder eq "asc") { + @sorted = sort {$summary{$a}->{$sortby} cmp $summary{$b}->{$sortby}} keys(%summary); + } else { + @sorted = sort {$summary{$b}->{$sortby} cmp $summary{$a}->{$sortby}} keys(%summary); + } + foreach $host (@sorted) { $hostdetails .= ""; foreach $key (@summaryorder) { $hostdetails .= "";
$summaryattrs{$key}$summaryattrs{$key}$summaryattrs{$key}$summaryattrs{$key}
$summary{$host}{$key}