Skip to content

update ssh key adding logic #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2025
Merged

update ssh key adding logic #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
880edc7
update ssh key adding logic
simonLeary42 Apr 30, 2025
9728bb1
Merge branch 'main' into validate-ssh-keys
simonLeary42 Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions resources/lib/UnitySite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,24 @@ public static function forbidden($message)
self::die();
}

public static function removeTrailingWhitespace($arr)
public static function arrayGetOrBadRequest(array $array, ...$keys)
{
$out = array();
foreach ($arr as $str) {
$new_string = rtrim($str);
array_push($out, $new_string);
$cursor = $array;
$keysTraversed = [];
foreach ($keys as $key) {
array_push($keysTraversed, $key);
if (!isset($cursor[$key])) {
self::badRequest("array key not found: " . json_encode($keysTraversed));
}
$cursor = $cursor[$key];
}
return $cursor;
}

return $out;
public static function alert(string $message)
{
// json_encode escapes quotes
echo "<script type='text/javascript'>alert(" . json_encode($message) . ");</script>";
}

public static function testValidSSHKey($key_str)
Expand Down
52 changes: 18 additions & 34 deletions webroot/panel/account.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,35 @@

require_once $LOC_HEADER;

$invalid_ssh_dialogue = "<script type='text/javascript'>
alert('Invalid SSH key. Please verify your public key file is valid.');
</script>";

if ($_SERVER['REQUEST_METHOD'] == "POST") {
switch ($_POST["form_type"]) {
switch (UnitySite::arrayGetOrBadRequest($_POST, "form_type")) {
case "addKey":
$added_keys = array();

switch ($_POST["add_type"]) {
$keys = array();
switch (UnitySite::arrayGetOrBadRequest($_POST, "add_type")) {
case "paste":
$key = $_POST["key"];
if (UnitySite::testValidSSHKey($key)) {
array_push($added_keys, $key);
} else {
echo $invalid_ssh_dialogue;
}
array_push($keys, UnitySite::arrayGetOrBadRequest($_POST, "key"));
break;
case "import":
$keyfile = $_FILES["keyfile"]["tmp_name"];
$key = file_get_contents($keyfile);
if (UnitySite::testValidSSHKey($key)) {
array_push($added_keys, $key);
} else {
echo $invalid_ssh_dialogue;
}
$keyPath = UnitySite::arrayGetOrBadRequest($_FILES, "keyfile", "tmp_name");
$key = file_get_contents($keyPath);
array_push($keys, $key);
break;
case "generate":
array_push($added_keys, $_POST["gen_key"]);
array_push($keys, UnitySite::arrayGetOrBadRequest($_POST, "gen_key"));
break;
case "github":
$gh_user = $_POST["gh_user"];
$keys = $GITHUB->getSshPublicKeys($gh_user);
foreach ($keys as $key) {
if (UnitySite::testValidSSHKey($key)) {
array_push($added_keys, $key);
}
}
$githubUsername = UnitySite::arrayGetOrBadRequest($_POST, "gh_user");
$githubKeys = $GITHUB->getSshPublicKeys($githubUsername);
$keys = array_merge($keys, $githubKeys);
break;
}

if (!empty($added_keys)) {
$added_keys = UnitySite::removeTrailingWhitespace($added_keys);
$totalKeys = array_merge($USER->getSSHKeys(), $added_keys);
$USER->setSSHKeys($totalKeys, $OPERATOR);
if (!empty($keys)) {
$keys = array_map("trim", $keys);
$validKeys = array_filter($keys, ["UnityWebPortal\lib\UnitySite", "testValidSSHKey"]);
$USER->setSSHKeys(array_merge($USER->getSSHKeys(), $validKeys));
if (count($keys) != count($validKeys)) {
UnitySite::alert("invalid SSH key");
}
}
break;
case "delKey":
Expand Down
Loading