Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
7a07142a
Commit
7a07142a
authored
Jan 27, 2015
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ssh key management to Actions menu, do not delete keys in
create_instance, now that user can manage multiple keys.
parent
94cb2770
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
apt/create_instance.in
apt/create_instance.in
+6
-9
www/aptui/quickvm_sup.php
www/aptui/quickvm_sup.php
+1
-0
No files found.
apt/create_instance.in
View file @
7a07142a
#!/usr/bin/perl -w
#
# Copyright (c) 2008-201
4
University of Utah and the Flux Group.
# Copyright (c) 2008-201
5
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
;
...
...
www/aptui/quickvm_sup.php
View file @
7a07142a
...
...
@@ -269,6 +269,7 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL,
<li><a href='manage_profile.php'>Create Profile</a></li>
<li><a href='instantiate.php'>Start Experiment</a></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='logout.php'>Logout</a></li>"
;
if
(
ISADMIN
()
||
STUDLY
())
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment