Skip to content

Commit

Permalink
gargoyle: Fix formatting of unnamed SSH keys
Browse files Browse the repository at this point in the history
- Also add hint in i18n translation that OpenSSH format should be used
  • Loading branch information
lantis1008 committed Sep 4, 2021
1 parent 596ef61 commit 72844b3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions package/gargoyle/files/www/js/access.js
Expand Up @@ -741,15 +741,14 @@ function addKey()
}
else
{
splitKey[1] = splitKey[1].replace(/[\r\n\t ]+$/, "");
var key = splitKey[0] + " " + splitKey[1] + " " + keyName
authorizedKeyMap[keyName]=key;
resetAuthorizedKeysTable()
document.getElementById('public_key_file').value = '';
document.getElementById('public_key_name').value = '';
document.getElementById('file_contents').value = '';

}

}


Expand Down
Expand Up @@ -39,7 +39,7 @@ accessStr.SSHHelp2="It is strongly recommended that you setup a SSH key-pair and
accessStr.SSHHelp3="You may use an existing SSH key-pair or create a new key-pair.";
accessStr.SSHHelp3a="Linux and Mac SSH clients usually keep SSH keys in <code>~/.ssh/</code> and a new key-pair can be generated with <code>ssh-keygen -t rsa -b 4096 -f gargoyle</code>";
accessStr.SSHHelp3b="Windows has been known to keep private keys in <code>C:\Documents and Settings\mylogin\Application Data\SSH\UserKeys\</code> ";
accessStr.SSHHelp4="The <b>private-key</b> should be stored securely and backed-up. Only the <b>public-key</b> (<i>gargoyle.pub</i>) should be uploaded to Gargoyle. Gargoyle will accept multiple public-keys.";
accessStr.SSHHelp4="The <b>private-key</b> should be stored securely and backed-up. Only the <b>public-key</b> (<i>gargoyle.pub</i>) should be uploaded to Gargoyle (in OpenSSH format). Gargoyle will accept multiple public-keys.";
accessStr.SSHInvalidKey="Invalid Key\nplease ensure that file contains a valid SSH public-key and try again.";
accessStr.CnntDsblPwd="Cannot disable SSH passwords without setting private key(s)";
accessStr.NoIP6Redi="Port redirection is not supported with IPv6. If you choose different local and remote ports, the web interface will not be accessible over IPv6 remotely.";
Expand Down

0 comments on commit 72844b3

Please sign in to comment.