projects
/
mirror
/
userdir-ldap-cgi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
036702e
)
Drop SSH key fingerprint info from machines.cgi pages
author
Paul Wise
<pabs@debian.org>
Wed, 9 Mar 2016 14:57:36 +0000
(22:57 +0800)
committer
Paul Wise
<pabs@debian.org>
Wed, 9 Mar 2016 14:57:44 +0000
(22:57 +0800)
Suggested-by: Drew Parsons <dparsons@debian.org>
Suggested-in: <
1457492501
.9688.6.camel@debian.org>
debian/changelog
patch
|
blob
|
history
machines.cgi
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
e7b0c4d
..
c16c92a
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-10,6
+10,7
@@
userdir-ldap-cgi (0.3.40) UNRELEASED; urgency=medium
* ravel is no longer recommended for general shell usage
* Add a hint about how to merge existing SSH keys
* Update LDAP search docs for the usergroups changes
* ravel is no longer recommended for general shell usage
* Add a hint about how to merge existing SSH keys
* Update LDAP search docs for the usergroups changes
+ * Drop SSH key fingerprint info from machines.cgi pages
-- Peter Palfrader <weasel@debian.org> Sat, 03 Jan 2015 13:56:47 +0100
-- Peter Palfrader <weasel@debian.org> Sat, 03 Jan 2015 13:56:47 +0100
diff --git
a/machines.cgi
b/machines.cgi
index
41ebe25
..
e867098
100755
(executable)
--- a/
machines.cgi
+++ b/
machines.cgi
@@
-35,7
+35,6
@@
my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems);
'status' => 'Status',
'notes' => 'Notes',
'sshrsahostkey' => 'SSH host key',
'status' => 'Status',
'notes' => 'Notes',
'sshrsahostkey' => 'SSH host key',
- 'sshrsahostfprint' => 'SSH host fingerprint',
'description' => 'Description',
'purpose' => 'purposes of this server',
# 'createtimestamp' => 'Entry created',
'description' => 'Description',
'purpose' => 'purposes of this server',
# 'createtimestamp' => 'Entry created',
@@
-68,24
+67,6
@@
sub DieHandler {
$ldap->unbind if (defined($ldap));
}
$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 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,"");
- while (length $fpr > 0) {
- $hrfpr .= ':' . substr($fpr,0,2,"");
- }
- return $hrfpr;
-}
-
sub wiki_link($) {
my ($in) = @_;
# [[hostname|text]] makes a link
sub wiki_link($) {
my ($in) = @_;
# [[hostname|text]] makes a link
@@
-170,10
+151,6
@@
foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]}
$output{sshrsahostkey} .= $key . "<br>";
}
$output{sshrsahostkey} .= $key . "<br>";
}
- foreach $key (@{$data->{sshrsahostkey}}) {
- $output{sshrsahostfprint} .= sshfingerprint($key) . "<br>";
- }
-
my $sponsor = item_uplist($data->{sponsor});
$output{sponsor} = $sponsor if defined $sponsor;
my $purpose = item_uplist($data->{purpose});
my $sponsor = item_uplist($data->{sponsor});
$output{sponsor} = $sponsor if defined $sponsor;
my $purpose = item_uplist($data->{purpose});