X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=machines.cgi;h=e8670987a80fcd0c357da7aa8481fca8032cab39;hp=383f7cd08ba0d7a2098b7d441f15b7927b18efa6;hb=HEAD;hpb=7d4df26c66fcce393db4f57374f92ed9407c43dd diff --git a/machines.cgi b/machines.cgi index 383f7cd..e867098 100755 --- a/machines.cgi +++ b/machines.cgi @@ -4,19 +4,20 @@ # (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; #use Apache::Registry; use CGI; use Util; -use Net::LDAP qw(:all); +use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR); use Fcntl; use POSIX; use MIME::Base64; use Digest::MD5 qw(md5_hex); -my (%attrs, @attrorder, %summaryattrs, @summaryorder); +my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems); # This defines the description of the fields, and which fields are retrieved %attrs = ('hostname' => 'Host name', @@ -34,8 +35,8 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder); 'status' => 'Status', 'notes' => 'Notes', 'sshrsahostkey' => 'SSH host key', - 'sshrsahostfprint' => 'SSH host fingerprint', 'description' => 'Description', + 'purpose' => 'purposes of this server', # 'createtimestamp' => 'Entry created', # 'modifytimestamp' => 'Entry modified' ); @@ -44,17 +45,19 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder); @attrorder = qw(hostname admin architecture distribution access sponsor sponsor-admin location machine memory disk bandwidth status notes sshrsahostkey sshrsahostfprint - description); + description purpose); # ditto for summary %summaryattrs = ('hostname' => 'Host name', - 'host' => 'just for a link', - 'architecture' => 'Architecture', - 'distribution' => 'Distribution', + 'host' => 'just for a link', + 'description' => 'Description', + 'architecture' => 'Architecture', 'status' => 'Status', - 'access' => 'Access'); - -@summaryorder = ('hostname', 'architecture', 'distribution', 'status', 'access'); + 'access' => 'Access', + 'sponsor' => 'Sponsor', + 'purpose' => 'Purpose'); +@summaryorder = qw{hostname description architecture sponsor purpose status access}; +%summarylistitems = map {$_=>1} qw{purpose sponsor}; # Global settings... my %config = &Util::ReadConfigFile; @@ -64,30 +67,52 @@ sub DieHandler { $ldap->unbind if (defined($ldap)); } -# human readable fingerprint -sub sshfingerprint { - my $key = shift; - - return '' if (!$key); +sub wiki_link($) { + my ($in) = @_; + # [[hostname|text]] makes a link + # [[hostname]] makes a link too + # if you add a * after [[ it's still the same, only not used for ssh_known_hosts in ud-generate + # [[-hostname]] are not links, but get added to known_hosts. we should drop the [[- ]] tho + $in =~ s#\[\[-(.*?)\]\]#$1#g; + $in =~ s#\[\[\*?(.*?)\|(.*?)\]\]#$2#g; + $in =~ s#\[\[\*?(.*?)\]\]#$1#g; + return $in; +} - 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; +# in the purpose field [[host|some other text]] (where some other text is optional) +# makes a hyperlink on the web thing. we now also add these hosts to the ssh known_hosts +# file. But so that we don't have to add everything we link we can add an asterisk +# and say [[*... to ignore it. In order to be able to add stuff to ssh without +# http linking it we also support [[-hostname]] entries. +# +# sponsors are also wikified like purpose. maybe others as well +sub item_uplist($) { + my ($items) = @_; + my $out = undef; + my(@tmp) = @$items; + + if (scalar @tmp>= 1) { + $out = "
    ". + join("", map { + "
  • ".wiki_link($_)."
    • \n"; + } sort {my $A=$a; my $B=$b; $A =~ s/[\[\]\*]//g; $B =~ s/[\[\]\*]//g; $A cmp $B} @tmp + ). + "
"; + } + return $out; } -$SIG{__DIE__} = \&DieHandler; +#$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($!); +&Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False'; $mesg; $ldap->bind; @@ -126,35 +151,26 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]} $output{sshrsahostkey} .= $key . "
"; } - foreach $key (@{$data->{sshrsahostkey}}) { - $output{sshrsahostfprint} .= sshfingerprint($key) . "
"; - } - - # URL - my ($sponsor, $url) = undef; - $output{sponsor} = undef; - foreach $sponsor (@{$data->{sponsor}}) { - $sponsor =~ m#((http|ftp)://\S+)#i; - $url = $1; - $sponsor =~ s/\s*$url\s*//; - $output{sponsor} .= "
" if ($output{sponsor}); - if ($url) { - $output{sponsor} .= sprintf("%s", $url, $sponsor); - } else { - $output{sponsor} .= $sponsor; - } - } - - $selected = " selected "; + my $sponsor = item_uplist($data->{sponsor}); + $output{sponsor} = $sponsor if defined $sponsor; + my $purpose = item_uplist($data->{purpose}); + $output{purpose} = $purpose if defined $purpose; + + $selected = " selected "; } - - $hostlist .= "