projects
/
mirror
/
userdir-ldap-cgi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop overrids - LDAP has it on its own
[mirror/userdir-ldap-cgi.git]
/
machines.cgi
diff --git
a/machines.cgi
b/machines.cgi
index
4108fff
..
98567ec
100755
(executable)
--- a/
machines.cgi
+++ b/
machines.cgi
@@
-11,7
+11,7
@@
use strict vars;
#use Apache::Registry;
use CGI;
use Util;
#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 Fcntl;
use POSIX;
use MIME::Base64;
@@
-74,7
+74,8
@@
sub sshfingerprint {
return '' if (!$key);
my @field = split(/ /, $key);
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});
+ 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,"");
return '' if !$field[1];
my $fpr = md5_hex(decode_base64($field[1]));
my $hrfpr = $field[0] . " " . substr($fpr,0,2,"");
@@
-119,13
+120,14
@@
sub item_uplist($) {
return $out;
}
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";
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';
&Util::HTMLSendHeader;
$ldap = Net::LDAP->new($config{ldaphost}) || &Util::HTMLError($!);
&Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False';
@@
-210,19
+212,19
@@
if ($output{havehostdata}) {
} else {
# display summary info
$hostdetails = "<h1>Summary</h1>\n";
} else {
# display summary info
$hostdetails = "<h1>Summary</h1>\n";
- $hostdetails .= "<table
border=\"1\" width=\"90%\"
>\n<tr>";
+ $hostdetails .= "<table
id=\"machines\" class=\"tablesorter\" border=\"1\" cellpadding=\"0\" cellspacing=\"1\">\n<thead
>\n<tr>";
foreach $key (@summaryorder) {
if ($sortby ne $key) {
foreach $key (@summaryorder) {
if ($sortby ne $key) {
- $hostdetails .= "<th><a href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
+ $hostdetails .= "<th><a
class=\"sort\"
href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
} else {
if ($sortorder ne "dsc") {
} else {
if ($sortorder ne "dsc") {
- $hostdetails .= "<th><a href=\"machines.cgi?sortby=$key&sortorder=dsc\">$summaryattrs{$key}</a></th>";
+ $hostdetails .= "<th><a
class=\"sort\"
href=\"machines.cgi?sortby=$key&sortorder=dsc\">$summaryattrs{$key}</a></th>";
} else {
} else {
- $hostdetails .= "<th><a href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
+ $hostdetails .= "<th><a
class=\"sort\"
href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
}
}
}
}
}
}
- $hostdetails .= "</tr>\n";
+ $hostdetails .= "</tr>\n
</thead>\n<tbody>\n
";
my @sorted;
if ($sortorder eq "asc") {
my @sorted;
if ($sortorder eq "asc") {
@@
-238,7
+240,7
@@
if ($output{havehostdata}) {
}
$hostdetails .= "</tr>\n";
}
}
$hostdetails .= "</tr>\n";
}
- $hostdetails .= "</table>\n";
+ $hostdetails .= "</t
body>\n</t
able>\n";
}
# Finally, we can write the output... yuck...
}
# Finally, we can write the output... yuck...