From 7a07142a185dab94879a254a480312bbaa537cd7 Mon Sep 17 00:00:00 2001 From: Leigh B Stoller Date: Tue, 27 Jan 2015 07:32:49 -0700 Subject: [PATCH] Add ssh key management to Actions menu, do not delete keys in create_instance, now that user can manage multiple keys. --- apt/create_instance.in | 15 ++++++--------- www/aptui/quickvm_sup.php | 1 + 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/apt/create_instance.in b/apt/create_instance.in index a77259c27..0c3f1885a 100755 --- a/apt/create_instance.in +++ b/apt/create_instance.in @@ -1,6 +1,6 @@ #!/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 # @@ -463,15 +463,12 @@ if ($localuser) { # 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 # 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 only allows one (which is replaced in the DB - # 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 - # for all users. + # APT/Cloud UI. The key provided in the web interface will + # replace this key. + # + # XXX This is in flux, we now allow APT users to manage all + # their keys via the web interface. # - if (!$emulab_user->isEmulab()) { - $emulab_user->DeleteSSHKeys(); - } my ($fh, $keyfile) = tempfile(UNLINK => 0); print $fh $sshkey; diff --git a/www/aptui/quickvm_sup.php b/www/aptui/quickvm_sup.php index 562e6339f..b03af3b9c 100644 --- a/www/aptui/quickvm_sup.php +++ b/www/aptui/quickvm_sup.php @@ -269,6 +269,7 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL,
  • Create Profile
  • Start Experiment
  • +
  • Manage SSH Keys
  • Change Password
  • Logout
    • "; if (ISADMIN() || STUDLY()) { -- GitLab