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

luci-mod-system: fix parsing SSH pubkeys with options

Browse source 
Also eliminate some duplicate code while we're at it.

Fixes: #4684
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-12-23 15:31:58 +01:00
parent af20ec8e07
commit 846b89c5bf
1 changed files with 47 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js
View file

@ -22,12 +22,13 @@ var SSHPubkeyDecoder = baseclass.singleton({
decode: function(s) decode: function(s)
{ {
var parts = s.split(/\s+/); var parts = s.trim().match(/^((?:(?:^|,)[^ =,]+(?:=(?:[^ ",]+|"(?:[^"\\]|\\.)*"))?)+ +)?(ssh-dss|ssh-rsa|ssh-ed25519|ecdsa-sha2-nistp[0-9]+) +([^ ]+)( +.*)?$/);
if (parts.length < 2)
if (!parts)
return null; return null;
var key = null; var key = null;
try { key = atob(parts[1]); } catch(e) {} try { key = atob(parts[3]); } catch(e) {}
if (!key) if (!key)
return null; return null;
@ -40,7 +41,7 @@ var SSHPubkeyDecoder = baseclass.singleton({
return null; return null;
var type = key.substr(off + 4, len); var type = key.substr(off + 4, len);
if (type !== parts[0]) if (type !== parts[2])
return null; return null;
off += 4 + len; off += 4 + len;
@ -72,22 +73,32 @@ var SSHPubkeyDecoder = baseclass.singleton({
if (len2 & 1) if (len2 & 1)
len2--; len2--;
var comment = parts.slice(2).join(' '), var comment = (parts[4] || '').trim(),
fprint = parts[1].length > 68 ? parts[1].substr(0, 33) + '…' + parts[1].substr(-34) : parts[1]; fprint = parts[3].length > 68 ? parts[3].substr(0, 33) + '…' + parts[3].substr(-34) : parts[3];
var options = null;
(parts[1] || '').trim().replace(/(?:^|,)([^ =,]+)(?:=(?:([^ ",]+)|"((?:[^"\\]|\\.)*)"))?/g, function(m, k, p, q) {
options = options || {};
if (options.hasOwnProperty(k))
options[k] += ',' + (q || p || true);
else
options[k] = (q || p || true);
});
switch (type) switch (type)
{ {
case 'ssh-rsa': case 'ssh-rsa':
return { type: 'RSA', bits: len2 * 8, comment: comment, fprint: fprint }; return { type: 'RSA', bits: len2 * 8, comment: comment, options: options, fprint: fprint, src: s };
case 'ssh-dss': case 'ssh-dss':
return { type: 'DSA', bits: len1 * 8, comment: comment, fprint: fprint }; return { type: 'DSA', bits: len1 * 8, comment: comment, options: options, fprint: fprint, src: s };
case 'ssh-ed25519': case 'ssh-ed25519':
return { type: 'ECDH', curve: 'Curve25519', comment: comment, fprint: fprint }; return { type: 'ECDH', curve: 'Curve25519', comment: comment, options: options, fprint: fprint, src: s };
case 'ecdsa-sha2': case 'ecdsa-sha2':
return { type: 'ECDSA', curve: curve, comment: comment, fprint: fprint }; return { type: 'ECDSA', curve: curve, comment: comment, options: options, fprint: fprint, src: s };
default: default:
return null; return null;
@ -95,6 +106,24 @@ var SSHPubkeyDecoder = baseclass.singleton({
} }
}); });
function renderKeyItem(pubkey) {
return E('div', {
class: 'item',
click: isReadonlyView ? null : removeKey,
'data-key': pubkey.src
}, [
E('strong', pubkey.comment || _('Unnamed key')), E('br'),
E('small', [
'%s, %s'.format(pubkey.type, pubkey.curve || _('%d Bit').format(pubkey.bits)),
pubkey.options ? E([], [
' / ', _('Options:'), ' ',
E('code', Object.keys(pubkey.options).sort().join(', '))
]) : '',
E('br'), E('code', pubkey.fprint)
])
]);
}
function renderKeys(keys) { function renderKeys(keys) {
var list = document.querySelector('.cbi-dynlist'); var list = document.querySelector('.cbi-dynlist');
@ -104,17 +133,7 @@ function renderKeys(keys) {
keys.forEach(function(key) { keys.forEach(function(key) {
var pubkey = SSHPubkeyDecoder.decode(key); var pubkey = SSHPubkeyDecoder.decode(key);
if (pubkey) if (pubkey)
list.insertBefore(E('div', { list.insertBefore(renderKeyItem(pubkey), list.lastElementChild);
class: 'item',
click: removeKey,
'data-key': key
}, [
E('strong', pubkey.comment || _('Unnamed key')), E('br'),
E('small', [
'%s, %s'.format(pubkey.type, pubkey.curve || _('%d Bit').format(pubkey.bits)),
E('br'), E('code', pubkey.fprint)
])
]), list.lastElementChild);
}); });
if (list.firstElementChild === list.lastElementChild) if (list.firstElementChild === list.lastElementChild)
@ -159,7 +178,7 @@ function addKey(ev) {
input.value = ''; input.value = '';
return saveKeys(keys).then(function() { return saveKeys(keys).then(function() {
var added = list.querySelector('[data-key="%s"]'.format(key)); var added = list.querySelector('[data-key="%s"]'.format(key.replace(/["\\]/g, '\\$&')));
if (added) if (added)
added.classList.add('flash'); added.classList.add('flash');
}); });
@ -220,8 +239,10 @@ function handleWindowDragDropIgnore(ev) {
return view.extend({ return view.extend({
load: function() { load: function() {
return fs.lines('/etc/dropbear/authorized_keys').then(function(lines) { return fs.lines('/etc/dropbear/authorized_keys').then(function(lines) {
return lines.filter(function(line) { return lines.map(function(line) {
return line.match(/^(ssh-rsa|ssh-dss|ssh-ed25519|ecdsa-sha2)\b/) != null; return SSHPubkeyDecoder.decode(line);
}).filter(function(line) {
return line != null;
}); });
}); });
}, },
@ -248,20 +269,8 @@ return view.extend({
]) ])
]); ]);
keys.forEach(L.bind(function(key) { keys.forEach(L.bind(function(pubkey) {
var pubkey = SSHPubkeyDecoder.decode(key); list.insertBefore(renderKeyItem(pubkey), list.lastElementChild);
if (pubkey)
list.insertBefore(E('div', {
class: 'item',
click: isReadonlyView ? null : ui.createHandlerFn(this, removeKey),
'data-key': key
}, [
E('strong', pubkey.comment || _('Unnamed key')), E('br'),
E('small', [
'%s, %s'.format(pubkey.type, pubkey.curve || _('%d Bit').format(pubkey.bits)),
E('br'), E('code', pubkey.fprint)
])
]), list.lastElementChild);
}, this)); }, this));
if (list.firstElementChild === list.lastElementChild) if (list.firstElementChild === list.lastElementChild)