All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit d590eb18 authored by Leigh B Stoller's avatar Leigh B Stoller

Change CanDoSSH() to operate on nonlocal users, except if the instance

is in the Cloudlab or aptguest projects.
parent aa458ada
......@@ -413,19 +413,24 @@ class Instance
return 1;
}
#
# IsNonLocal() is not the correct test, since we now allow geni users
# to start/join real projects. Need to think about this.
# These are the guest projects.
#
if (!$user->IsNonLocal()) {
# Otherwise a project membership test.
$project = Project::Lookup($this->pid_idx());
if (!$project) {
return 0;
}
$isapproved = 0;
if ($project->IsMember($user, $isapproved) && $isapproved) {
return 1;
}
$APT_HOLDINGPROJECT = "aptguests";
$CLOUD_HOLDINGPROJECT = "CloudLab";
if ($this->pid() == $APT_HOLDINGPROJECT ||
$this->pid() == $CLOUD_HOLDINGPROJECT) {
return 0;
}
# Otherwise a project membership test.
$project = Project::Lookup($this->pid_idx());
if (!$project) {
return 0;
}
$isapproved = 0;
if ($project->IsMember($user, $isapproved) && $isapproved) {
return 1;
}
return 0;
}
......
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