X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=machines.cgi;h=41ebe250f3d28058edb7c5a2bbd7a8fb62434ce2;hp=de5191ed8b08ee0d23a31196628323e3950671ee;hb=036702ecd044b501dce1b05dfbf19a17921120da;hpb=532616d83a8d807b9315d88d9afb47f842577382 diff --git a/machines.cgi b/machines.cgi index de5191e..41ebe25 100755 --- a/machines.cgi +++ b/machines.cgi @@ -11,13 +11,13 @@ 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', @@ -50,13 +50,15 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder); # 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; @@ -73,7 +75,8 @@ sub sshfingerprint { return '' if (!$key); my @field = split(/ /, $key); - return '' if $field[0] ne 'ssh-dss' and $field[0] ne 'ssh-rsa'; + 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,""); @@ -83,13 +86,49 @@ sub sshfingerprint { return $hrfpr; } -$SIG{__DIE__} = \&DieHandler; +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; +} + +# 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 = ""; + } + return $out; +} + +#$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'; @@ -135,34 +174,26 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]} $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; - } - } + my $sponsor = item_uplist($data->{sponsor}); + $output{sponsor} = $sponsor if defined $sponsor; + my $purpose = item_uplist($data->{purpose}); + $output{purpose} = $purpose if defined $purpose; - #Reformat purposes to be pleasing for the human eye: - $output{purpose} = join(",", @{$data->{purpose}}); - - $selected = " selected "; + $selected = " selected "; } - - $hostlist .= "