Commit 7a07142a authored by Leigh B Stoller's avatar Leigh B Stoller

Add ssh key management to Actions menu, do not delete keys in

create_instance, now that user can manage multiple keys.
parent 94cb2770
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2008-2014 University of Utah and the Flux Group. # Copyright (c) 2008-2015 University of Utah and the Flux Group.
# #
# {{{GENIPUBLIC-LICENSE # {{{GENIPUBLIC-LICENSE
# #
...@@ -463,15 +463,12 @@ if ($localuser) { ...@@ -463,15 +463,12 @@ if ($localuser) {
# with the isaptkey flag (-a to addpubkey) so that we know # with the isaptkey flag (-a to addpubkey) so that we know
# which key in the DB it is. The reason for this is that the # which key in the DB it is. The reason for this is that the
# user might be a classic emulab user, but is now using the # user might be a classic emulab user, but is now using the
# APT/Cloud UI. Class Emulab allows multiple keys, but the # APT/Cloud UI. The key provided in the web interface will
# APT/Cloud UI only allows one (which is replaced in the DB # replace this key.
# if it changes). We do not want to expose the Emulab ssh key #
# edit page, too messy. So always operate on the one apt key # XXX This is in flux, we now allow APT users to manage all
# for all users. # their keys via the web interface.
# #
if (!$emulab_user->isEmulab()) {
$emulab_user->DeleteSSHKeys();
}
my ($fh, $keyfile) = tempfile(UNLINK => 0); my ($fh, $keyfile) = tempfile(UNLINK => 0);
print $fh $sshkey; print $fh $sshkey;
......
...@@ -269,6 +269,7 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL, ...@@ -269,6 +269,7 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL,
<li><a href='manage_profile.php'>Create Profile</a></li> <li><a href='manage_profile.php'>Create Profile</a></li>
<li><a href='instantiate.php'>Start Experiment</a></li> <li><a href='instantiate.php'>Start Experiment</a></li>
<li class='divider'></li> <li class='divider'></li>
<li><a href='ssh-keys.php'>Manage SSH Keys</a></li>
<li><a href='changepswd.php'>Change Password</a></li> <li><a href='changepswd.php'>Change Password</a></li>
<li><a href='logout.php'>Logout</a></li>"; <li><a href='logout.php'>Logout</a></li>";
if (ISADMIN() || STUDLY()) { if (ISADMIN() || STUDLY()) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment