Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-sshtunnel: generate a new key

Browse source 
Make the Generate a new key as a separate section and move to bottom.
Extend the key name pattern to be an email address so allow symbols @ - +.
Force the id_ prefix for key names.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
This commit is contained in:
Sergey Ponomarev 2023-12-17 12:55:29 +02:00 committed by Paul Donald
parent b8638323c4
commit 3933633dd0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js
View file

@ -67,16 +67,17 @@ function _renderSshKeys(sshKeys) {
cbi_update_table(table, rows, null); cbi_update_table(table, rows, null);
var keyGenBtn = E('div', {}, [ var keyGenBtn = E('div', {}, [
E('h4', _('Generate a new key')),
E('form', { E('form', {
'submit': _handleKeyGenSubmit, 'submit': _handleKeyGenSubmit,
}, [ }, [
E('label', {}, _('Generate a new key') + ': '), E('label', {}, _('Name') + ': '),
E('span', {'class': 'control-group'}, [ E('span', {'class': 'control-group'}, [
E('input', { E('input', {
'type': 'text', 'type': 'text',
'name': 'keyName', 'name': 'keyName',
'value': 'id_ed25519', 'value': 'id_ed25519',
'pattern': '^[a-zA-Z][a-zA-Z0-9_\.]+', 'pattern': '^[a-zA-Z][a-zA-Z0-9_.@\\-+]+',
'required': 'required', 'required': 'required',
'maxsize': '35', 'maxsize': '35',
'autocomplete': 'off', 'autocomplete': 'off',
@ -97,13 +98,14 @@ function _renderSshKeys(sshKeys) {
_('In LuCI you can do that with <a %s>System / Administration / SSH-Keys</a>') _('In LuCI you can do that with <a %s>System / Administration / SSH-Keys</a>')
.format('href="/cgi-bin/luci/admin/system/admin/sshkeys"') .format('href="/cgi-bin/luci/admin/system/admin/sshkeys"')
), ),
keyGenBtn, table table, keyGenBtn,
]); ]);
} }
function _handleKeyGenSubmit(event) { function _handleKeyGenSubmit(event) {
event.preventDefault(); event.preventDefault();
var keyName = document.querySelector('input[name="keyName"]').value; var keyName = document.querySelector('input[name="keyName"]').value;
keyName = keyName.startsWith('id_') ? keyName : 'id_' + keyName;
if (allSshKeys[keyName]) { if (allSshKeys[keyName]) {
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
ui.addNotification(null, E('p', _('A key with that name already exists.'), 'error')); ui.addNotification(null, E('p', _('A key with that name already exists.'), 'error'));