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

luci-mod-system: sshkeys.js: use common fs.js class

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-10-02 20:01:27 +02:00
parent 811012cab5
commit 55fb53e995
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
'use strict'; 'use strict';
'require rpc'; 'require fs';
var SSHPubkeyDecoder = L.Class.singleton({ var SSHPubkeyDecoder = L.Class.singleton({
lengthDecode: function(s, off) lengthDecode: function(s, off)
@ -90,19 +90,6 @@ var SSHPubkeyDecoder = L.Class.singleton({
} }
}); });
var callFileRead = rpc.declare({
object: 'file',
method: 'read',
params: [ 'path' ],
expect: { data: '' }
});
var callFileWrite = rpc.declare({
object: 'file',
method: 'write',
params: [ 'path', 'data' ]
});
function renderKeys(keys) { function renderKeys(keys) {
var list = document.querySelector('.cbi-dynlist'); var list = document.querySelector('.cbi-dynlist');
@ -130,9 +117,10 @@ function renderKeys(keys) {
} }
function saveKeys(keys) { function saveKeys(keys) {
return callFileWrite('/etc/dropbear/authorized_keys', keys.join('\n') + '\n') return fs.write('/etc/dropbear/authorized_keys', keys.join('\n') + '\n')
.then(renderKeys.bind(this, keys)) .then(renderKeys.bind(this, keys))
.then(L.ui.hideModal); .catch(function(e) { L.ui.addNotification(null, E('p', e.message)) })
.finally(L.ui.hideModal);
} }
function addKey(ev) { function addKey(ev) {
@ -226,10 +214,8 @@ function handleWindowDragDropIgnore(ev) {
return L.view.extend({ return L.view.extend({
load: function() { load: function() {
return callFileRead('/etc/dropbear/authorized_keys').then(function(data) { return fs.lines('/etc/dropbear/authorized_keys').then(function(lines) {
return (data || '').split(/\n/).map(function(line) { return lines.filter(function(line) {
return line.trim();
}).filter(function(line) {
return line.match(/^ssh-/) != null; return line.match(/^ssh-/) != null;
}); });
}); });