diff options
Diffstat (limited to 'modules/luci-mod-system/htdocs/luci-static')
9 files changed, 1490 insertions, 116 deletions
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js new file mode 100644 index 0000000000..512f601eb6 --- /dev/null +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js @@ -0,0 +1,49 @@ +'use strict'; +'require rpc'; + +return L.view.extend({ + callFileRead: rpc.declare({ + object: 'file', + method: 'read', + params: [ 'path' ], + expect: { data: '' } + }), + + callFileWrite: rpc.declare({ + object: 'file', + method: 'write', + params: [ 'path', 'data' ] + }), + + load: function() { + return this.callFileRead('/etc/crontabs/root'); + }, + + handleSave: function(ev) { + var value = (document.querySelector('textarea').value || '').trim().replace(/\r\n/g, '\n') + '\n'; + + return this.callFileWrite('/etc/crontabs/root', value).then(function(rc) { + if (rc != 0) + throw rpc.getStatusText(rc); + + document.querySelector('textarea').value = value; + L.ui.addNotification(null, E('p', _('Contents have been saved.')), 'info'); + + }).catch(function(e) { + L.ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e))); + }); + }, + + render: function(crontab) { + return E([ + E('h2', _('Scheduled Tasks')), + E('p', {}, + _('This is the system crontab in which scheduled tasks can be defined.') + + _('<br/>Note: you need to manually restart the cron service if the crontab file was empty before editing.')), + E('p', {}, E('textarea', { 'style': 'width:100%', 'rows': 10 }, [ crontab != null ? crontab : '' ])) + ]); + }, + + handleSaveApply: null, + handleReset: null +}); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js new file mode 100644 index 0000000000..7a8b1428d5 --- /dev/null +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js @@ -0,0 +1,42 @@ +'use strict'; +'require form'; +'require tools.widgets as widgets'; + +return L.view.extend({ + render: function() { + var m, s, o; + + m = new form.Map('dropbear', _('SSH Access'), _('Dropbear offers <abbr title="Secure Shell">SSH</abbr> network shell access and an integrated <abbr title="Secure Copy">SCP</abbr> server')); + + s = m.section(form.TypedSection, 'dropbear', _('Dropbear Instance')); + s.anonymous = true; + s.addremove = true; + s.addbtntitle = _('Add instance'); + + o = s.option(widgets.NetworkSelect, 'Interface', _('Interface'), _('Listen only on the given interface or, if unspecified, on all')); + o.nocreate = true; + o.unspecified = true; + + o = s.option(form.Value, 'Port', _('Port')); + o.datatype = 'port'; + o.placeholder = 22; + + o = s.option(form.Flag, 'PasswordAuth', _('Password authentication'), _('Allow <abbr title="Secure Shell">SSH</abbr> password authentication')); + o.enabled = 'on'; + o.disabled = 'off'; + o.default = o.enabled; + o.rmempty = false; + + o = s.option(form.Flag, 'RootPasswordAuth', _('Allow root logins with password'), _('Allow the <em>root</em> user to login with password')); + o.enabled = 'on'; + o.disabled = 'off'; + o.default = o.enabled; + + o = s.option(form.Flag, 'GatewayPorts', _('Gateway Ports'), _('Allow remote hosts to connect to local SSH forwarded ports')); + o.enabled = 'on'; + o.disabled = 'off'; + o.default = o.disabled; + + return m.render(); + } +}); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js new file mode 100644 index 0000000000..08c97650ea --- /dev/null +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js @@ -0,0 +1,581 @@ +'use strict'; +'require form'; +'require rpc'; + +var callFileStat, callFileRead, callFileWrite, callFileExec, callFileRemove; + +callFileStat = rpc.declare({ + object: 'file', + method: 'stat', + params: [ 'path' ], + expect: { '': {} } +}); + +callFileRead = rpc.declare({ + object: 'file', + method: 'read', + params: [ 'path' ], + expect: { data: '' }, + filter: function(s) { return (s || '').trim() } +}); + +callFileWrite = rpc.declare({ + object: 'file', + method: 'write', + params: [ 'path', 'data' ] +}); + +callFileExec = rpc.declare({ + object: 'file', + method: 'exec', + params: [ 'command', 'params' ], + expect: { '': { code: -1 } } +}); + +callFileRemove = rpc.declare({ + object: 'file', + method: 'remove', + params: [ 'path' ] +}); + +function pingDevice(proto, ipaddr) { + var target = '%s://%s%s?%s'.format(proto || 'http', ipaddr || window.location.host, L.resource('icons/loading.gif'), Math.random()); + + return new Promise(function(resolveFn, rejectFn) { + var img = new Image(); + + img.onload = resolveFn; + img.onerror = rejectFn; + + window.setTimeout(rejectFn, 1000); + + img.src = target; + }); +} + +function awaitReconnect(/* ... */) { + var ipaddrs = arguments.length ? arguments : [ window.location.host ]; + + window.setTimeout(function() { + L.Poll.add(function() { + var tasks = [], reachable = false; + + for (var i = 0; i < 2; i++) + for (var j = 0; j < ipaddrs.length; j++) + tasks.push(pingDevice(i ? 'https' : 'http', ipaddrs[j]) + .then(function(ev) { reachable = ev.target.src.replace(/^(https?:\/\/[^\/]+).*$/, '$1/') }, function() {})); + + return Promise.all(tasks).then(function() { + if (reachable) { + L.Poll.stop(); + window.location = reachable; + } + }); + }) + }, 5000); +} + +function fileUpload(node, path) { + return new Promise(function(resolveFn, rejectFn) { + L.ui.showModal(_('Uploading file…'), [ + E('p', _('Please select the file to upload.')), + E('div', { 'style': 'display:flex' }, [ + E('div', { 'class': 'left', 'style': 'flex:1' }, [ + E('input', { + type: 'file', + style: 'display:none', + change: function(ev) { + L.dom.parent(ev.target, '.modal').querySelector('.cbi-button-action.important').disabled = false; + } + }), + E('button', { + 'class': 'btn', + 'click': function(ev) { + ev.target.previousElementSibling.click(); + } + }, [ _('Browse…') ]) + ]), + E('div', { 'class': 'right', 'style': 'flex:1' }, [ + E('button', { + 'class': 'btn', + 'click': function() { + L.ui.hideModal(); + rejectFn(new Error('Upload has been cancelled')); + } + }, [ _('Cancel') ]), + ' ', + E('button', { + 'class': 'btn cbi-button-action important', + 'disabled': true, + 'click': function(ev) { + var input = L.dom.parent(ev.target, '.modal').querySelector('input[type="file"]'); + + if (!input.files[0]) + return; + + var progress = E('div', { 'class': 'cbi-progressbar', 'title': '0%' }, E('div', { 'style': 'width:0' })); + + L.ui.showModal(_('Uploading file…'), [ progress ]); + + var data = new FormData(); + + data.append('sessionid', rpc.getSessionID()); + data.append('filename', path); + data.append('filedata', input.files[0]); + + L.Request.post('/cgi-bin/cgi-upload', data, { + timeout: 0, + progress: function(pev) { + var percent = (pev.loaded / pev.total) * 100; + + node.data = '%.2f%%'.format(percent); + + progress.setAttribute('title', '%.2f%%'.format(percent)); + progress.firstElementChild.style.width = '%.2f%%'.format(percent); + } + }).then(function(res) { + var reply = res.json(); + + L.ui.hideModal(); + + if (L.isObject(reply) && reply.failure) { + L.ui.addNotification(null, E('p', _('Upload request failed: %s').format(reply.message))); + rejectFn(new Error(reply.failure)); + } + else { + resolveFn(reply); + } + }, function(err) { + L.ui.hideModal(); + rejectFn(err); + }); + } + }, [ _('Upload') ]) + ]) + ]) + ]); + }); +} + +function findStorageSize(procmtd, procpart) { + var kernsize = 0, rootsize = 0, wholesize = 0; + + procmtd.split(/\n/).forEach(function(ln) { + var match = ln.match(/^mtd\d+: ([0-9a-f]+) [0-9a-f]+ "(.+)"$/), + size = match ? parseInt(match[1], 16) : 0; + + switch (match ? match[2] : '') { + case 'linux': + case 'firmware': + if (size > wholesize) + wholesize = size; + break; + + case 'kernel': + case 'kernel0': + kernsize = size; + break; + + case 'rootfs': + case 'rootfs0': + case 'ubi': + case 'ubi0': + rootsize = size; + break; + } + }); + + if (wholesize > 0) + return wholesize; + else if (kernsize > 0 && rootsize > kernsize) + return kernsize + rootsize; + + procpart.split(/\n/).forEach(function(ln) { + var match = ln.match(/^\s*\d+\s+\d+\s+(\d+)\s+(\S+)$/); + if (match) { + var size = parseInt(match[1], 10); + + if (!match[2].match(/\d/) && size > 2048 && wholesize == 0) + wholesize = size * 1024; + } + }); + + return wholesize; +} + + +var mapdata = { actions: {}, config: {} }; + +return L.view.extend({ + load: function() { + var max_mtd = 10, max_ubi = 2, max_ubi_vol = 4; + var tasks = [ + callFileStat('/lib/upgrade/platform.sh'), + callFileRead('/proc/sys/kernel/hostname'), + callFileRead('/proc/mtd'), + callFileRead('/proc/partitions') + ]; + + for (var i = 0; i < max_mtd; i++) + tasks.push(callFileRead('/sys/devices/virtual/mtd/mtd%d/name'.format(i))); + + for (var i = 0; i < max_ubi; i++) + for (var j = 0; j < max_ubi_vol; j++) + tasks.push(callFileRead('/sys/devices/virtual/ubi/ubi%d/ubi%d_%d/name'.format(i, i, j))); + + return Promise.all(tasks); + }, + + handleBackup: function(ev) { + var form = E('form', { + method: 'post', + action: '/cgi-bin/cgi-backup', + enctype: 'application/x-www-form-urlencoded' + }, E('input', { type: 'hidden', name: 'sessionid', value: rpc.getSessionID() })); + + ev.currentTarget.parentNode.appendChild(form); + + form.submit(); + form.parentNode.removeChild(form); + }, + + handleFirstboot: function(ev) { + if (!confirm(_('Do you really want to erase all settings?'))) + return; + + return callFileExec('/sbin/firstboot', [ '-r', '-y' ]).then(function(res) { + if (res.code != 0) + return L.ui.addNotification(null, E('p', _('The firstboot command failed with code %d').format(res.code))); + + L.ui.showModal(_('Erasing...'), [ + E('p', { 'class': 'spinning' }, _('The system is erasing the configuration partition now and will reboot itself when finished.')) + ]); + + awaitReconnect('192.168.1.1', 'openwrt.lan'); + }); + }, + + handleRestore: function(ev) { + return fileUpload(ev.target, '/tmp/backup.tar.gz') + .then(L.bind(function(btn, res) { + btn.firstChild.data = _('Checking archive…'); + return callFileExec('/bin/tar', [ '-tzf', '/tmp/backup.tar.gz' ]); + }, this, ev.target)) + .then(L.bind(function(btn, res) { + if (res.code != 0) { + L.ui.addNotification(null, E('p', _('The uploaded backup archive is not readable'))); + return callFileRemove('/tmp/backup.tar.gz'); + } + + L.ui.showModal(_('Apply backup?'), [ + E('p', _('The uploaded backup archive appears to be valid and contains the files listed below. Press "Continue" to restore the backup and reboot, or "Cancel" to abort the operation.')), + E('pre', {}, [ res.stdout ]), + E('div', { 'class': 'right' }, [ + E('button', { + 'class': 'btn', + 'click': L.ui.createHandlerFn(this, function(ev) { + return callFileRemove('/tmp/backup.tar.gz').finally(L.ui.hideModal); + }) + }, [ _('Cancel') ]), ' ', + E('button', { + 'class': 'btn cbi-button-action important', + 'click': L.ui.createHandlerFn(this, 'handleRestoreConfirm', btn) + }, [ _('Continue') ]) + ]) + ]); + }, this, ev.target)) + .finally(L.bind(function(btn, input) { + btn.firstChild.data = _('Upload archive...'); + }, this, ev.target)); + }, + + handleRestoreConfirm: function(btn, ev) { + return callFileExec('/sbin/sysupgrade', [ '--restore-backup', '/tmp/backup.tar.gz' ]) + .then(L.bind(function(btn, res) { + if (res.code != 0) { + L.ui.addNotification(null, [ + E('p', _('The restore command failed with code %d').format(res.code)), + res.stderr ? E('pre', {}, [ res.stderr ]) : '' + ]); + L.raise('Error', 'Unpack failed'); + } + + btn.firstChild.data = _('Rebooting…'); + return callFileExec('/sbin/reboot'); + }, this, ev.target)) + .then(L.bind(function(res) { + if (res.code != 0) { + L.ui.addNotification(null, E('p', _('The reboot command failed with code %d').format(res.code))); + L.raise('Error', 'Reboot failed'); + } + + L.ui.showModal(_('Rebooting…'), [ + E('p', { 'class': 'spinning' }, _('The system is rebooting now. If the restored configuration changed the current LAN IP address, you might need to reconnect manually.')) + ]); + + awaitReconnect(window.location.host, '192.168.1.1', 'openwrt.lan'); + }, this)) + .catch(function() { btn.firstChild.data = _('Upload archive...') }); + }, + + handleBlock: function(hostname, ev) { + var mtdblock = L.dom.parent(ev.target, '.cbi-section').querySelector('[data-name="mtdselect"] select').value; + var form = E('form', { + 'method': 'post', + 'action': '/cgi-bin/cgi-download', + 'enctype': 'application/x-www-form-urlencoded' + }, [ + E('input', { 'type': 'hidden', 'name': 'sessionid', 'value': rpc.getSessionID() }), + E('input', { 'type': 'hidden', 'name': 'path', 'value': '/dev/mtdblock%d'.format(mtdblock) }), + E('input', { 'type': 'hidden', 'name': 'filename', 'value': '%s.mtd%d.bin'.format(hostname, mtdblock) }) + ]); + + ev.currentTarget.parentNode.appendChild(form); + + form.submit(); + form.parentNode.removeChild(form); + }, + + handleSysupgrade: function(storage_size, ev) { + return fileUpload(ev.target.firstChild, '/tmp/firmware.bin') + .then(L.bind(function(btn, reply) { + btn.firstChild.data = _('Checking image…'); + + L.ui.showModal(_('Checking image…'), [ + E('span', { 'class': 'spinning' }, _('Verifying the uploaded image file.')) + ]); + + return callFileExec('/sbin/sysupgrade', [ '--test', '/tmp/firmware.bin' ]) + .then(function(res) { return [ reply, res ] }); + }, this, ev.target)) + .then(L.bind(function(btn, res) { + var keep = document.querySelector('[data-name="keep"] input[type="checkbox"]'), + force = E('input', { type: 'checkbox' }), + is_invalid = (res[1].code != 0), + is_too_big = (storage_size > 0 && res[0].size > storage_size), + body = []; + + body.push(E('p', _('The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity. <br /> Click "Proceed" below to start the flash procedure.'))); + body.push(E('ul', {}, [ + res[0].size ? E('li', {}, '%s: %1024.2mB'.format(_('Size'), res[0].size)) : '', + res[0].checksum ? E('li', {}, '%s: %s'.format(_('MD5'), res[0].checksum)) : '', + res[0].sha256sum ? E('li', {}, '%s: %s'.format(_('SHA256'), res[0].sha256sum)) : '', + E('li', {}, keep.checked ? _('Configuration files will be kept') : _('Caution: Configuration files will be erased')) + ])); + + if (is_invalid || is_too_big) + body.push(E('hr')); + + if (is_too_big) + body.push(E('p', { 'class': 'alert-message' }, [ + _('It appears that you are trying to flash an image that does not fit into the flash memory, please verify the image file!') + ])); + + if (is_invalid) + body.push(E('p', { 'class': 'alert-message' }, [ + res[1].stderr ? res[1].stderr : '', + res[1].stderr ? E('br') : '', + res[1].stderr ? E('br') : '', + _('The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.') + ])); + + if (is_invalid || is_too_big) + body.push(E('p', {}, E('label', { 'class': 'btn alert-message danger' }, [ + force, ' ', _('Force upgrade'), + E('br'), E('br'), + _('Select \'Force upgrade\' to flash the image even if the image format check fails. Use only if you are sure that the firmware is correct and meant for your device!') + ]))); + + var cntbtn = E('button', { + 'class': 'btn cbi-button-action important', + 'click': L.ui.createHandlerFn(this, 'handleSysupgradeConfirm', btn, keep.checked, force.checked), + 'disabled': (is_invalid || is_too_big) ? true : null + }, [ _('Continue') ]); + + body.push(E('div', { 'class': 'right' }, [ + E('button', { + 'class': 'btn', + 'click': L.ui.createHandlerFn(this, function(ev) { + return callFileRemove('/tmp/firmware.bin').finally(L.ui.hideModal); + }) + }, [ _('Cancel') ]), ' ', cntbtn + ])); + + force.addEventListener('change', function(ev) { + cntbtn.disabled = !ev.target.checked; + }); + + L.ui.showModal(_('Flash image?'), body); + }, this, ev.target)) + .finally(L.bind(function(btn) { + btn.firstChild.data = _('Flash image...'); + }, this, ev.target)); + }, + + handleSysupgradeConfirm: function(btn, keep, force, ev) { + btn.firstChild.data = _('Flashing…'); + + L.ui.showModal(_('Flashing…'), [ + E('p', { 'class': 'spinning' }, _('The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.')) + ]); + + var opts = []; + + if (!keep) + opts.push('-n'); + + if (force) + opts.push('--force'); + + opts.push('/tmp/firmware.bin'); + + /* Currently the sysupgrade rpc call will not return, hence no promise handling */ + callFileExec('/sbin/sysupgrade', opts); + + awaitReconnect(window.location.host, '192.168.1.1', 'openwrt.lan'); + }, + + handleBackupList: function(ev) { + return callFileExec('/sbin/sysupgrade', [ '--list-backup' ]).then(function(res) { + if (res.code != 0) { + L.ui.addNotification(null, [ + E('p', _('The sysupgrade command failed with code %d').format(res.code)), + res.stderr ? E('pre', {}, [ res.stderr ]) : '' + ]); + L.raise('Error', 'Sysupgrade failed'); + } + + L.ui.showModal(_('Backup file list'), [ + E('p', _('Below is the determined list of files to backup. It consists of changed configuration files marked by opkg, essential base files and the user defined backup patterns.')), + E('ul', {}, (res.stdout || '').trim().split(/\n/).map(function(ln) { return E('li', {}, ln) })), + E('div', { 'class': 'right' }, [ + E('button', { + 'class': 'btn', + 'click': L.ui.hideModal + }, [ _('Dismiss') ]) + ]) + ], 'cbi-modal'); + }); + }, + + handleBackupSave: function(m, ev) { + return m.save(function() { + return callFileWrite('/etc/sysupgrade.conf', mapdata.config.editlist.trim().replace(/\r\n/g, '\n') + '\n'); + }).then(function() { + L.ui.addNotification(null, E('p', _('Contents have been saved.')), 'info'); + }).catch(function(e) { + L.ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e))); + }); + }, + + render: function(rpc_replies) { + var has_sysupgrade = (rpc_replies[0].type == 'file'), + hostname = rpc_replies[1], + procmtd = rpc_replies[2], + procpart = rpc_replies[3], + has_rootfs_data = rpc_replies.slice(4).filter(function(n) { return n == 'rootfs_data' })[0], + storage_size = findStorageSize(procmtd, procpart), + m, s, o, ss; + + m = new form.JSONMap(mapdata, _('Flash operations')); + m.tabbed = true; + + s = m.section(form.NamedSection, 'actions', _('Actions')); + + + o = s.option(form.SectionValue, 'actions', form.NamedSection, 'actions', 'actions', _('Backup'), _('Click "Generate archive" to download a tar archive of the current configuration files.')); + ss = o.subsection; + + o = ss.option(form.Button, 'dl_backup', _('Download backup')); + o.inputstyle = 'action important'; + o.inputtitle = _('Generate archive'); + o.onclick = this.handleBackup; + + + o = s.option(form.SectionValue, 'actions', form.NamedSection, 'actions', 'actions', _('Restore'), _('To restore configuration files, you can upload a previously generated backup archive here. To reset the firmware to its initial state, click "Perform reset" (only possible with squashfs images).')); + ss = o.subsection; + + if (has_rootfs_data) { + o = ss.option(form.Button, 'reset', _('Reset to defaults')); + o.inputstyle = 'negative important'; + o.inputtitle = _('Perform reset'); + o.onclick = this.handleFirstboot; + } + + o = ss.option(form.Button, 'restore', _('Restore backup'), _('Custom files (certificates, scripts) may remain on the system. To prevent this, perform a factory-reset first.')); + o.inputstyle = 'action important'; + o.inputtitle = _('Upload archive...'); + o.onclick = L.bind(this.handleRestore, this); + + + if (procmtd.length) { + o = s.option(form.SectionValue, 'actions', form.NamedSection, 'actions', 'actions', _('Save mtdblock contents'), _('Click "Save mtdblock" to download specified mtdblock file. (NOTE: THIS FEATURE IS FOR PROFESSIONALS! )')); + ss = o.subsection; + + o = ss.option(form.ListValue, 'mtdselect', _('Choose mtdblock')); + procmtd.split(/\n/).forEach(function(ln) { + var match = ln.match(/^mtd(\d+): .+ "(.+?)"$/); + if (match) + o.value(match[1], match[2]); + }); + + o = ss.option(form.Button, 'mtddownload', _('Download mtdblock')); + o.inputstyle = 'action important'; + o.inputtitle = _('Save mtdblock'); + o.onclick = L.bind(this.handleBlock, this, hostname); + } + + + o = s.option(form.SectionValue, 'actions', form.NamedSection, 'actions', 'actions', _('Flash new firmware image'), + has_sysupgrade + ? _('Upload a sysupgrade-compatible image here to replace the running firmware. Check "Keep settings" to retain the current configuration (requires a compatible firmware image).') + : _('Sorry, there is no sysupgrade support present; a new firmware image must be flashed manually. Please refer to the wiki for device specific install instructions.')); + + ss = o.subsection; + + if (has_sysupgrade) { + o = ss.option(form.Flag, 'keep', _('Keep settings')); + o.default = o.enabled; + + o = ss.option(form.Button, 'sysupgrade', _('Image')); + o.inputstyle = 'action important'; + o.inputtitle = _('Flash image...'); + o.onclick = L.bind(this.handleSysupgrade, this, storage_size); + } + + + s = m.section(form.NamedSection, 'config', 'config', _('Configuration'), _('This is a list of shell glob patterns for matching files and directories to include during sysupgrade. Modified files in /etc/config/ and certain other configurations are automatically preserved.')); + s.render = L.bind(function(view /*, ... */) { + return form.NamedSection.prototype.render.apply(this, this.varargs(arguments, 1)) + .then(L.bind(function(node) { + node.appendChild(E('div', { 'class': 'cbi-page-actions' }, [ + E('button', { + 'class': 'cbi-button cbi-button-save', + 'click': L.ui.createHandlerFn(view, 'handleBackupSave', this.map) + }, [ _('Save') ]) + ])); + + return node; + }, this)); + }, s, this); + + o = s.option(form.Button, 'showlist', _('Show current backup file list')); + o.inputstyle = 'action'; + o.inputtitle = _('Open list...'); + o.onclick = L.bind(this.handleBackupList, this); + + o = s.option(form.TextValue, 'editlist'); + o.forcewrite = true; + o.rows = 30; + o.load = function(section_id) { + return callFileRead('/etc/sysupgrade.conf'); + }; + + + return m.render(); + }, + + handleSaveApply: null, + handleSave: null, + handleReset: null +}); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js index a5bda05761..8a93aeb8c8 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js @@ -2,8 +2,9 @@ 'require uci'; 'require rpc'; 'require form'; +'require tools.widgets as widgets'; -var callLeds, callUSB, callNetdevs; +var callLeds, callUSB; callLeds = rpc.declare({ object: 'luci', @@ -17,31 +18,17 @@ callUSB = rpc.declare({ expect: { '': {} } }); -callNetdevs = rpc.declare({ - object: 'luci', - method: 'getIfaddrs', - expect: { result: [] }, - filter: function(res) { - var devs = {}; - for (var i = 0; i < res.length; i++) - devs[res[i].name] = true; - return Object.keys(devs).sort(); - } -}); - return L.view.extend({ load: function() { return Promise.all([ callLeds(), - callUSB(), - callNetdevs() + callUSB() ]); }, render: function(results) { var leds = results[0], usb = results[1], - netdevs = results[2], triggers = {}, trigger, m, s, o; @@ -53,9 +40,11 @@ return L.view.extend({ _('<abbr title="Light Emitting Diode">LED</abbr> Configuration'), _('Customizes the behaviour of the device <abbr title="Light Emitting Diode">LED</abbr>s if possible.')); - s = m.section(form.TypedSection, 'led', ''); + s = m.section(form.GridSection, 'led', ''); s.anonymous = true; s.addremove = true; + s.sortable = true; + s.addbtntitle = _('Add LED action'); s.option(form.Value, 'name', _('Name')); @@ -66,32 +55,35 @@ return L.view.extend({ o.rmempty = false; trigger = s.option(form.ListValue, 'trigger', _('Trigger')); - Object.keys(triggers).sort().forEach(function(t) { trigger.value(t, t.replace(/-/g, '')) }); if (usb.devices && usb.devices.length) - trigger.value('usbdev'); + triggers['usbdev'] = true; if (usb.ports && usb.ports.length) - trigger.value('usbport'); + triggers['usbport'] = true; + Object.keys(triggers).sort().forEach(function(t) { trigger.value(t, t.replace(/-/g, '')) }); o = s.option(form.Value, 'delayon', _('On-State Delay')); + o.modalonly = true; o.depends('trigger', 'timer'); o = s.option(form.Value, 'delayoff', _('Off-State Delay')); + o.modalonly = true; o.depends('trigger', 'timer'); - o = s.option(form.ListValue, '_net_dev', _('Device')); + o = s.option(widgets.DeviceSelect, '_net_dev', _('Device')); o.rmempty = true; o.ucioption = 'dev'; + o.modalonly = true; + o.noaliases = true; o.depends('trigger', 'netdev'); o.remove = function(section_id) { var t = trigger.formvalue(section_id); if (t != 'netdev' && t != 'usbdev') uci.unset('system', section_id, 'dev'); }; - o.value(''); - netdevs.sort().forEach(function(dev) { o.value(dev) }); o = s.option(form.MultiValue, 'mode', _('Trigger Mode')); o.rmempty = true; + o.modalonly = true; o.depends('trigger', 'netdev'); o.value('link', _('Link On')); o.value('tx', _('Transmit')); @@ -102,6 +94,7 @@ return L.view.extend({ o.depends('trigger', 'usbdev'); o.rmempty = true; o.ucioption = 'dev'; + o.modalonly = true; o.remove = function(section_id) { var t = trigger.formvalue(section_id); if (t != 'netdev' && t != 'usbdev') @@ -117,6 +110,7 @@ return L.view.extend({ o = s.option(form.MultiValue, 'port', _('USB Ports')); o.depends('trigger', 'usbport'); o.rmempty = true; + o.modalonly = true; o.cfgvalue = function(section_id) { var ports = [], value = uci.get('system', section_id, 'port'); @@ -146,6 +140,7 @@ return L.view.extend({ } o = s.option(form.Value, 'port_mask', _('Switch Port Mask')); + o.modalonly = true; o.depends('trigger', 'switch0'); o.depends('trigger', 'switch1'); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js new file mode 100644 index 0000000000..301ebab331 --- /dev/null +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js @@ -0,0 +1,432 @@ +'use strict'; +'require uci'; +'require rpc'; +'require form'; + +var callBlockDevices, callMountPoints, callBlockDetect, callUmount, + callFileRead, callFileStat, callFileExec; + +callBlockDevices = rpc.declare({ + object: 'luci', + method: 'getBlockDevices', + expect: { '': {} } +}); + +callMountPoints = rpc.declare({ + object: 'luci', + method: 'getMountPoints', + expect: { result: [] } +}); + +callBlockDetect = rpc.declare({ + object: 'luci', + method: 'setBlockDetect', + expect: { result: false } +}); + +callUmount = rpc.declare({ + object: 'luci', + method: 'setUmount', + params: [ 'path' ], + expect: { result: false } +}); + +callFileRead = rpc.declare({ + object: 'file', + method: 'read', + params: [ 'path' ], + expect: { data: '' }, + filter: function(s) { + return (s || '').split(/\n/).filter(function(ln) { + return ln.match(/\S/) && !ln.match(/^nodev\t/); + }).map(function(ln) { + return ln.trim(); + }); + } +}); + +callFileStat = rpc.declare({ + object: 'file', + method: 'stat', + params: [ 'path' ], + expect: { '': {} }, + filter: function(st) { + return (L.isObject(st) && st.path != null); + } +}); + +callFileExec = rpc.declare({ + object: 'file', + method: 'exec', + params: [ 'command', 'params' ], + expect: { code: 255 } +}); + +function device_textvalue(devices, section_id) { + var v = (uci.get('fstab', section_id, 'uuid') || '').toLowerCase(), + e = Object.keys(devices).filter(function(dev) { return (devices[dev].uuid || '-').toLowerCase() == v })[0]; + + if (v) { + this.section.devices[section_id] = devices[e]; + + if (e && devices[e].size) + return E('span', 'UUID: %h (%s, %1024.2mB)'.format(v, devices[e].dev, devices[e].size)); + else if (e) + return E('span', 'UUID: %h (%s)'.format(v, devices[e].dev)); + else + return E('span', 'UUID: %h (<em>%s</em>)'.format(v, _('not present'))); + } + + v = uci.get('fstab', section_id, 'label'); + e = Object.keys(devices).filter(function(dev) { return devices[dev].label == v })[0]; + + if (v) { + this.section.devices[section_id] = this.section.devices[section_id] || devices[e]; + + if (e && devices[e].size) + return E('span', 'Label: %h (%s, %1024.2mB)'.format(v, devices[e].dev, devices[e].size)); + else if (e) + return E('span', 'Label: %h (%s)'.format(v, devices[e].dev)); + else + return E('span', 'Label: %h (<em>%s</em>)'.format(v, _('not present'))); + } + + v = uci.get('fstab', section_id, 'device'); + e = Object.keys(devices).filter(function(dev) { return devices[dev].dev == v })[0]; + + if (v) { + this.section.devices[section_id] = this.section.devices[section_id] || devices[e]; + + if (e && devices[e].size) + return E('span', '%h (%1024.2mB)'.format(v, devices[e].size)); + else if (e) + return E('span', '%h'.format(v)); + else + return E('span', '%h (<em>%s</em>)'.format(v, _('not present'))); + } +} + +return L.view.extend({ + handleDetect: function(m, ev) { + return callBlockDetect() + .then(L.bind(uci.unload, uci, 'fstab')) + .then(L.bind(m.render, m)); + }, + + handleMountAll: function(m, ev) { + return callFileExec('/sbin/block', ['mount']) + .then(function(rc) { + if (rc != 0) + L.ui.addNotification(null, E('p', _('The <em>block mount</em> command failed with code %d').format(rc))); + }) + .then(L.bind(uci.unload, uci, 'fstab')) + .then(L.bind(m.render, m)); + }, + + handleUmount: function(m, path, ev) { + return callUmount(path) + .then(L.bind(uci.unload, uci, 'fstab')) + .then(L.bind(m.render, m)); + }, + + load: function() { + return Promise.all([ + callBlockDevices(), + callFileRead('/proc/filesystems'), + callFileRead('/etc/filesystems'), + callFileStat('/usr/sbin/e2fsck'), + callFileStat('/usr/sbin/fsck.f2fs'), + callFileStat('/usr/sbin/dosfsck'), + callFileStat('/usr/bin/btrfsck'), + uci.load('fstab') + ]); + }, + + render: function(results) { + var devices = results[0], + procfs = results[1], + etcfs = results[2], + triggers = {}, + trigger, m, s, o; + + var filesystems = procfs.concat(etcfs.filter(function(fs) { + return procfs.indexOf(fs) < 0; + })).sort(); + + var fsck = { + ext2: results[3], + ext3: results[3], + ext4: results[3], + f2fs: results[4], + vfat: results[5], + btrfs: results[6] + }; + + if (!uci.sections('fstab', 'global').length) + uci.add('fstab', 'global'); + + m = new form.Map('fstab', _('Mount Points')); + + s = m.section(form.TypedSection, 'global', _('Global Settings')); + s.addremove = false; + s.anonymous = true; + + o = s.option(form.Button, '_detect', _('Generate Config'), _('Find all currently attached filesystems and swap and replace configuration with defaults based on what was detected')); + o.onclick = this.handleDetect.bind(this, m); + o.inputstyle = 'reload'; + + o = s.option(form.Button, '_mountall', _('Mount attached devices'), _('Attempt to enable configured mount points for attached devices')); + o.onclick = this.handleMountAll.bind(this, m); + o.inputstyle = 'reload'; + + o = s.option(form.Flag, 'anon_swap', _('Anonymous Swap'), _('Mount swap not specifically configured')); + o.default = o.disabled; + o.rmempty = false; + + o = s.option(form.Flag, 'anon_mount', _('Anonymous Mount'), _('Mount filesystems not specifically configured')); + o.default = o.disabled; + o.rmempty = false; + + o = s.option(form.Flag, 'auto_swap', _('Automount Swap'), _('Automatically mount swap on hotplug')); + o.default = o.enabled; + o.rmempty = false; + + o = s.option(form.Flag, 'auto_mount', _('Automount Filesystem'), _('Automatically mount filesystems on hotplug')); + o.default = o.enabled; + o.rmempty = false; + + o = s.option(form.Flag, 'check_fs', _('Check filesystems before mount'), _('Automatically check filesystem for errors before mounting')); + o.default = o.disabled; + o.rmempty = false; + + + // Mount status table + o = s.option(form.DummyValue, '_mtab'); + + o.load = function(section_id) { + return callMountPoints().then(L.bind(function(mounts) { + this.mounts = mounts; + }, this)); + }; + + o.render = L.bind(function(view, section_id) { + var table = E('div', { 'class': 'table' }, [ + E('div', { 'class': 'tr table-titles' }, [ + E('div', { 'class': 'th' }, _('Filesystem')), + E('div', { 'class': 'th' }, _('Mount Point')), + E('div', { 'class': 'th center' }, _('Available')), + E('div', { 'class': 'th center' }, _('Used')), + E('div', { 'class': 'th' }, _('Unmount')) + ]) + ]); + + var rows = []; + + for (var i = 0; i < this.mounts.length; i++) { + var used = this.mounts[i].size - this.mounts[i].free, + umount = true; + + if (/^\/(overlay|rom|tmp(?:\/.+)?|dev(?:\/.+)?|)$/.test(this.mounts[i].mount)) + umount = false; + + rows.push([ + this.mounts[i].device, + this.mounts[i].mount, + '%1024.2mB / %1024.2mB'.format(this.mounts[i].avail, this.mounts[i].size), + '%.2f%% (%1024.2mB)'.format(100 / this.mounts[i].size * used, used), + umount ? E('button', { + 'class': 'btn cbi-button-remove', + 'click': L.ui.createHandlerFn(view, 'handleUmount', m, this.mounts[i].mount) + }, [ _('Unmount') ]) : '-' + ]); + } + + cbi_update_table(table, rows, E('em', _('Unable to obtain mount information'))); + + return E([], [ E('h3', _('Mounted file systems')), table ]); + }, o, this); + + + // Mounts + s = m.section(form.GridSection, 'mount', _('Mount Points'), _('Mount Points define at which point a memory device will be attached to the filesystem')); + s.modaltitle = _('Mount Points - Mount Entry'); + s.anonymous = true; + s.addremove = true; + s.sortable = true; + s.devices = {}; + + s.renderHeaderRows = function(/* ... */) { + var trEls = form.GridSection.prototype.renderHeaderRows.apply(this, arguments); + return trEls.childNodes[0]; + } + + s.tab('general', _('General Settings')); + s.tab('advanced', _('Advanced Settings')); + + o = s.taboption('general', form.Flag, 'enabled', _('Enabled')); + o.rmempty = false; + o.editable = true; + + o = s.taboption('general', form.DummyValue, '_device', _('Device')); + o.rawhtml = true; + o.modalonly = false; + o.write = function() {}; + o.remove = function() {}; + o.textvalue = device_textvalue.bind(o, devices); + + o = s.taboption('general', form.Value, 'uuid', _('UUID'), _('If specified, mount the device by its UUID instead of a fixed device node')); + o.modalonly = true; + o.value('', _('-- match by uuid --')); + + var devs = Object.keys(devices).sort(); + for (var i = 0; i < devs.length; i++) { + var dev = devices[devs[i]]; + if (dev.uuid && dev.size) + o.value(dev.uuid, '%s (%s, %1024.2mB)'.format(dev.uuid, dev.dev, dev.size)); + else if (dev.uuid) + o.value(dev.uuid, '%s (%s)'.format(dev.uuid, dev.dev)); + } + + o = s.taboption('general', form.Value, 'label', _('Label'), _('If specified, mount the device by the partition label instead of a fixed device node')); + o.modalonly = true; + o.depends('uuid', ''); + o.value('', _('-- match by label --')); + + for (var i = 0; i < devs.length; i++) { + var dev = devices[devs[i]]; + if (dev.label && dev.size) + o.value(dev.label, '%s (%s, %1024.2mB)'.format(dev.label, dev.dev, dev.size)); + else if (dev.label) + o.value(dev.label, '%s (%s)'.format(dev.label, dev.dev)); + } + + o = s.taboption('general', form.Value, 'device', _('Device'), _('The device file of the memory or partition (<abbr title="for example">e.g.</abbr> <code>/dev/sda1</code>)')); + o.modalonly = true; + o.depends({ uuid: '', label: '' }); + + for (var i = 0; i < devs.length; i++) { + var dev = devices[devs[i]]; + if (dev.size) + o.value(dev.dev, '%s (%1024.2mB)'.format(dev.dev, dev.size)); + else + o.value(dev.dev); + } + + o = s.taboption('general', form.Value, 'target', _('Mount point'), _('Specifies the directory the device is attached to')); + o.value('/', _('Use as root filesystem (/)')); + o.value('/overlay', _('Use as external overlay (/overlay)')); + o.rmempty = false; + + o = s.taboption('general', form.DummyValue, '__notice', _('Root preparation')); + o.depends('target', '/'); + o.modalonly = true; + o.rawhtml = true; + o.default = '' + + '<p>%s</p>'.format(_('Make sure to clone the root filesystem using something like the commands below:')) + + '<pre>' + + 'mkdir -p /tmp/introot\n' + + 'mkdir -p /tmp/extroot\n' + + 'mount --bind / /tmp/introot\n' + + 'mount /dev/sda1 /tmp/extroot\n' + + 'tar -C /tmp/introot -cvf - . | tar -C /tmp/extroot -xf -\n' + + 'umount /tmp/introot\n' + + 'umount /tmp/extroot\n' + + '</pre>' + ; + + o = s.taboption('advanced', form.ListValue, 'fstype', _('Filesystem')); + + o.textvalue = function(section_id) { + var dev = this.section.devices[section_id], + text = this.cfgvalue(section_id) || 'auto'; + + if (dev && dev.type && dev.type != text) + text += ' (%s)'.format(dev.type); + + return text; + }; + + o.value('', 'auto'); + + for (var i = 0; i < filesystems.length; i++) + o.value(filesystems[i]); + + o = s.taboption('advanced', form.Value, 'options', _('Mount options'), _('See "mount" manpage for details')); + o.textvalue = function(section_id) { return this.cfgvalue(section_id) || 'defaults' }; + o.placeholder = 'defaults'; + + s.taboption('advanced', form.Flag, 'enabled_fsck', _('Run filesystem check'), _('Run a filesystem check before mounting the device')); + + + // Swaps + s = m.section(form.GridSection, 'swap', _('SWAP'), _('If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title="Random Access Memory">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title="Random Access Memory">RAM</abbr>.')); + s.modaltitle = _('Mount Points - Swap Entry'); + s.anonymous = true; + s.addremove = true; + s.sortable = true; + s.devices = {}; + + s.renderHeaderRows = function(/* ... */) { + var trEls = form.GridSection.prototype.renderHeaderRows.apply(this, arguments); + trEls.childNodes[0].childNodes[1].style.width = '90%'; + return trEls.childNodes[0]; + } + + o = s.option(form.Flag, 'enabled', _('Enabled')); + o.rmempty = false; + o.editable = true; + + o = s.option(form.DummyValue, '_device', _('Device')); + o.modalonly = false; + o.textvalue = device_textvalue.bind(o, devices); + + o = s.option(form.Value, 'uuid', _('UUID'), _('If specified, mount the device by its UUID instead of a fixed device node')); + o.modalonly = true; + o.value('', _('-- match by uuid --')); + + var devs = Object.keys(devices).sort(); + for (var i = 0; i < devs.length; i++) { + var dev = devices[devs[i]]; + if (dev.dev.match(/^\/dev\/(mtdblock|ubi|ubiblock)\d/)) + continue; + + if (dev.uuid && dev.size) + o.value(dev.uuid, '%s (%s, %1024.2mB)'.format(dev.uuid, dev.dev, dev.size)); + else if (dev.uuid) + o.value(dev.uuid, '%s (%s)'.format(dev.uuid, dev.dev)); + } + + o = s.option(form.Value, 'label', _('Label'), _('If specified, mount the device by the partition label instead of a fixed device node')); + o.modalonly = true; + o.depends('uuid', ''); + o.value('', _('-- match by label --')); + + for (var i = 0; i < devs.length; i++) { + var dev = devices[devs[i]]; + if (dev.dev.match(/^\/dev\/(mtdblock|ubi|ubiblock)\d/)) + continue; + + if (dev.label && dev.size) + o.value(dev.label, '%s (%s, %1024.2mB)'.format(dev.label, dev.dev, dev.size)); + else if (dev.label) + o.value(dev.label, '%s (%s)'.format(dev.label, dev.dev)); + } + + o = s.option(form.Value, 'device', _('Device'), _('The device file of the memory or partition (<abbr title="for example">e.g.</abbr> <code>/dev/sda1</code>)')); + o.modalonly = true; + o.depends({ uuid: '', label: '' }); + + for (var i = 0; i < devs.length; i++) { + var dev = devices[devs[i]]; + if (dev.dev.match(/^\/dev\/(mtdblock|ubi|ubiblock)\d/)) + continue; + + if (dev.size) + o.value(dev.dev, '%s (%1024.2mB)'.format(dev.dev, dev.size)); + else + o.value(dev.dev); + } + + return m.render(); + } +}); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js index 7a79d7e2da..6c5ffa1b26 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js @@ -1,31 +1,94 @@ -function submitPassword(ev) { - var pw1 = document.body.querySelector('[name="pw1"]'), - pw2 = document.body.querySelector('[name="pw2"]'); - - if (!pw1.value.length || !pw2.value.length) - return; - - if (pw1.value === pw2.value) { - L.showModal(_('Change login password'), - E('p', { class: 'spinning' }, _('Changing password…'))); - - L.post('admin/system/admin/password/json', { password: pw1.value }, - function() { - showModal(_('Change login password'), [ - E('div', _('The system password has been successfully changed.')), - E('div', { 'class': 'right' }, - E('div', { class: 'btn', click: L.hideModal }, _('Dismiss'))) - ]); - - pw1.value = pw2.value = ''; - }); - } - else { - L.showModal(_('Change login password'), [ - E('div', { class: 'alert-message warning' }, - _('Given password confirmation did not match, password not changed!')), - E('div', { 'class': 'right' }, - E('div', { class: 'btn', click: L.hideModal }, _('Dismiss'))) - ]); +'use strict'; +'require form'; +'require rpc'; + +var formData = { + password: { + pw1: null, + pw2: null } -} +}; + +var callSetPassword = rpc.declare({ + object: 'luci', + method: 'setPassword', + params: [ 'username', 'password' ], + expect: { result: false } +}); + +return L.view.extend({ + checkPassword: function(section_id, value) { + var strength = document.querySelector('.cbi-value-description'), + strongRegex = new RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g"), + mediumRegex = new RegExp("^(?=.{7,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))).*$", "g"), + enoughRegex = new RegExp("(?=.{6,}).*", "g"); + + if (strength && value.length) { + if (false == enoughRegex.test(value)) + strength.innerHTML = '%s: <span style="color:red">%s</span>'.format(_('Password strength'), _('More Characters')); + else if (strongRegex.test(value)) + strength.innerHTML = '%s: <span style="color:green">%s</span>'.format(_('Password strength'), _('Strong')); + else if (mediumRegex.test(value)) + strength.innerHTML = '%s: <span style="color:orange">%s</span>'.format(_('Password strength'), _('Medium')); + else + strength.innerHTML = '%s: <span style="color:red">%s</span>'.format(_('Password strength'), _('Weak')); + } + + return true; + }, + + render: function() { + var m, s, o; + + m = new form.JSONMap(formData, _('Router Password'), _('Changes the administrator password for accessing the device')); + s = m.section(form.NamedSection, 'password', 'password'); + + o = s.option(form.Value, 'pw1', _('Password')); + o.password = true; + o.validate = this.checkPassword; + + o = s.option(form.Value, 'pw2', _('Confirmation'), ' '); + o.password = true; + o.renderWidget = function(/* ... */) { + var node = form.Value.prototype.renderWidget.apply(this, arguments); + + node.childNodes[1].addEventListener('keydown', function(ev) { + if (ev.keyCode == 13 && !ev.currentTarget.classList.contains('cbi-input-invalid')) + document.querySelector('.cbi-button-save').click(); + }); + + return node; + }; + + return m.render(); + }, + + handleSave: function() { + var map = document.querySelector('.cbi-map'); + + return L.dom.callClassMethod(map, 'save').then(function() { + if (formData.password.pw1 == null || formData.password.pw1.length == 0) + return; + + if (formData.password.pw1 != formData.password.pw2) { + L.ui.addNotification(null, E('p', _('Given password confirmation did not match, password not changed!')), 'danger'); + return; + } + + return callSetPassword('root', formData.password.pw1).then(function(success) { + if (success) + L.ui.addNotification(null, E('p', _('The system password has been successfully changed.')), 'info'); + else + L.ui.addNotification(null, E('p', _('Failed to change the system password.')), 'danger'); + + formData.password.pw1 = null; + formData.password.pw2 = null; + + L.dom.callClassMethod(map, 'render'); + }); + }); + }, + + handleSaveApply: null, + handleReset: null +}); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js index d298b3be98..4a8e223aed 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js @@ -1,4 +1,7 @@ -SSHPubkeyDecoder.prototype = { +'use strict'; +'require rpc'; + +var SSHPubkeyDecoder = L.Class.singleton({ lengthDecode: function(s, off) { var l = (s.charCodeAt(off++) << 24) | @@ -85,19 +88,29 @@ SSHPubkeyDecoder.prototype = { return null; } } -}; +}); -function SSHPubkeyDecoder() {} +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) { - var list = document.querySelector('.cbi-dynlist[name="sshkeys"]'), - decoder = new SSHPubkeyDecoder(); + var list = document.querySelector('.cbi-dynlist'); while (!matchesElem(list.firstElementChild, '.add-item')) list.removeChild(list.firstElementChild); keys.forEach(function(key) { - var pubkey = decoder.decode(key); + var pubkey = SSHPubkeyDecoder.decode(key); if (pubkey) list.insertBefore(E('div', { class: 'item', @@ -117,19 +130,16 @@ function renderKeys(keys) { } function saveKeys(keys) { - L.showModal(_('Add key'), E('div', { class: 'spinning' }, _('Saving keys…'))); - L.post('admin/system/admin/sshkeys/json', { keys: JSON.stringify(keys) }, function(xhr, keys) { - renderKeys(keys); - L.hideModal(); - }); + return callFileWrite('/etc/dropbear/authorized_keys', keys.join('\n') + '\n') + .then(renderKeys.bind(this, keys)) + .then(L.ui.hideModal); } function addKey(ev) { - var decoder = new SSHPubkeyDecoder(), - list = findParent(ev.target, '.cbi-dynlist'), + var list = findParent(ev.target, '.cbi-dynlist'), input = list.querySelector('input[type="text"]'), key = input.value.trim(), - pubkey = decoder.decode(key), + pubkey = SSHPubkeyDecoder.decode(key), keys = []; if (!key.length) @@ -140,21 +150,26 @@ function addKey(ev) { }); if (keys.indexOf(key) !== -1) { - L.showModal(_('Add key'), [ + L.ui.showModal(_('Add key'), [ E('div', { class: 'alert-message warning' }, _('The given SSH public key has already been added.')), E('div', { class: 'right' }, E('div', { class: 'btn', click: L.hideModal }, _('Close'))) ]); } else if (!pubkey) { - L.showModal(_('Add key'), [ + L.ui.showModal(_('Add key'), [ E('div', { class: 'alert-message warning' }, _('The given SSH public key is invalid. Please supply proper public RSA or ECDSA keys.')), E('div', { class: 'right' }, E('div', { class: 'btn', click: L.hideModal }, _('Close'))) ]); } else { keys.push(key); - saveKeys(keys); input.value = ''; + + return saveKeys(keys).then(function() { + var added = list.querySelector('[data-key="%s"]'.format(key)); + if (added) + added.classList.add('flash'); + }); } } @@ -175,7 +190,7 @@ function removeKey(ev) { E('div', { class: 'right' }, [ E('div', { class: 'btn', click: L.hideModal }, _('Cancel')), ' ', - E('div', { class: 'btn danger', click: function(ev) { saveKeys(keys) } }, _('Delete key')), + E('div', { class: 'btn danger', click: L.ui.createHandlerFn(this, saveKeys, keys) }, _('Delete key')), ]) ]); } @@ -205,11 +220,67 @@ function dropKey(ev) { ev.preventDefault(); } -window.addEventListener('dragover', function(ev) { ev.preventDefault() }); -window.addEventListener('drop', function(ev) { ev.preventDefault() }); +function handleWindowDragDropIgnore(ev) { + ev.preventDefault() +} -requestAnimationFrame(function() { - L.get('admin/system/admin/sshkeys/json', null, function(xhr, keys) { - renderKeys(keys); - }); +return L.view.extend({ + load: function() { + return callFileRead('/etc/dropbear/authorized_keys').then(function(data) { + return (data || '').split(/\n/).map(function(line) { + return line.trim(); + }).filter(function(line) { + return line.match(/^ssh-/) != null; + }); + }); + }, + + render: function(keys) { + var list = E('div', { 'class': 'cbi-dynlist', 'dragover': dragKey, 'drop': dropKey }, [ + E('div', { 'class': 'add-item' }, [ + E('input', { + 'class': 'cbi-input-text', + 'type': 'text', + 'placeholder': _('Paste or drag SSH key file…') , + 'keydown': function(ev) { if (ev.keyCode === 13) addKey(ev) } + }), + E('button', { + 'class': 'cbi-button', + 'click': L.ui.createHandlerFn(this, addKey) + }, _('Add key')) + ]) + ]); + + keys.forEach(L.bind(function(key) { + var pubkey = SSHPubkeyDecoder.decode(key); + if (pubkey) + list.insertBefore(E('div', { + class: 'item', + click: L.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)); + + if (list.firstElementChild === list.lastElementChild) + list.insertBefore(E('p', _('No public keys present yet.')), list.lastElementChild); + + window.addEventListener('dragover', handleWindowDragDropIgnore); + window.addEventListener('drop', handleWindowDragDropIgnore); + + return E('div', {}, [ + E('h2', _('SSH-Keys')), + E('div', { 'class': 'cbi-section-descr' }, _('Public keys allow for the passwordless SSH logins with a higher security compared to the use of plain passwords. In order to upload a new key to the device, paste an OpenSSH compatible public key line or drag a <code>.pub</code> file into the input field.')), + E('div', { 'class': 'cbi-section-node' }, list) + ]); + }, + + handleSaveApply: null, + handleSave: null, + handleReset: null }); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js new file mode 100644 index 0000000000..77f61d607a --- /dev/null +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js @@ -0,0 +1,147 @@ +'use strict'; +'require rpc'; + +return L.view.extend({ + callInitList: rpc.declare({ + object: 'luci', + method: 'getInitList', + expect: { '': {} } + }), + + callInitAction: rpc.declare({ + object: 'luci', + method: 'setInitAction', + params: [ 'name', 'action' ], + expect: { result: false } + }), + + callFileRead: rpc.declare({ + object: 'file', + method: 'read', + params: [ 'path' ], + expect: { data: '' } + }), + + callFileWrite: rpc.declare({ + object: 'file', + method: 'write', + params: [ 'path', 'data' ] + }), + + load: function() { + return Promise.all([ + this.callFileRead('/etc/rc.local'), + this.callInitList() + ]); + }, + + handleAction: function(name, action, ev) { + return this.callInitAction(name, action).then(function(success) { + if (success != true) + throw _('Command failed'); + + return true; + }).catch(function(e) { + L.ui.addNotification(null, E('p', _('Failed to execute "/etc/init.d/%s %s" action: %s').format(name, action, e))); + }); + }, + + handleEnableDisable: function(name, isEnabled, ev) { + return this.handleAction(name, isEnabled ? 'disable' : 'enable', ev).then(L.bind(function(name, isEnabled, cell) { + L.dom.content(cell, this.renderEnableDisable({ + name: name, + enabled: isEnabled + })); + }, this, name, !isEnabled, ev.currentTarget.parentNode)); + }, + + handleRcLocalSave: function(ev) { + var value = (document.querySelector('textarea').value || '').trim().replace(/\r\n/g, '\n') + '\n'; + + return this.callFileWrite('/etc/rc.local', value).then(function(rc) { + if (rc != 0) + throw rpc.getStatusText(rc); + + document.querySelector('textarea').value = value; + L.ui.addNotification(null, E('p', _('Contents have been saved.')), 'info'); + }).catch(function(e) { + L.ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e))); + }); + }, + + renderEnableDisable: function(init) { + return E('button', { + class: 'btn cbi-button-%s'.format(init.enabled ? 'positive' : 'negative'), + click: L.ui.createHandlerFn(this, 'handleEnableDisable', init.name, init.enabled) + }, init.enabled ? _('Enabled') : _('Disabled')); + }, + + render: function(data) { + var rcLocal = data[0], + initList = data[1], + rows = [], list = []; + + var table = E('div', { 'class': 'table' }, [ + E('div', { 'class': 'tr table-titles' }, [ + E('div', { 'class': 'th' }, _('Start priority')), + E('div', { 'class': 'th' }, _('Initscript')), + E('div', { 'class': 'th' }, _('Enable/Disable')), + E('div', { 'class': 'th' }, _('Start')), + E('div', { 'class': 'th' }, _('Restart')), + E('div', { 'class': 'th' }, _('Stop')) + ]) + ]); + + for (var init in initList) + if (initList[init].index < 100) + list.push(Object.assign({ name: init }, initList[init])); + + list.sort(function(a, b) { + if (a.index != b.index) + return a.index - b.index + + return a.name > b.name; + }); + + for (var i = 0; i < list.length; i++) { + rows.push([ + '%02d'.format(list[i].index), + list[i].name, + this.renderEnableDisable(list[i]), + E('button', { 'class': 'btn cbi-button-action', 'click': L.ui.createHandlerFn(this, 'handleAction', list[i].name, 'start') }, _('Start')), + E('button', { 'class': 'btn cbi-button-action', 'click': L.ui.createHandlerFn(this, 'handleAction', list[i].name, 'restart') }, _('Restart')), + E('button', { 'class': 'btn cbi-button-action', 'click': L.ui.createHandlerFn(this, 'handleAction', list[i].name, 'stop') }, _('Stop')) + ]); + } + + cbi_update_table(table, rows); + + var view = E('div', {}, [ + E('h2', _('Startup')), + E('div', {}, [ + E('div', { 'data-tab': 'init', 'data-tab-title': _('Initscripts') }, [ + E('p', {}, _('You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like "network", your device might become inaccessible!</strong>')), + table + ]), + E('div', { 'data-tab': 'rc', 'data-tab-title': _('Local Startup') }, [ + E('p', {}, _('This is the content of /etc/rc.local. Insert your own commands here (in front of \'exit 0\') to execute them at the end of the boot process.')), + E('p', {}, E('textarea', { 'style': 'width:100%', 'rows': 20 }, [ (rcLocal != null ? rcLocal : '') ])), + E('div', { 'class': 'cbi-page-actions' }, [ + E('button', { + 'class': 'btn cbi-button-save', + 'click': L.ui.createHandlerFn(this, 'handleRcLocalSave') + }, _('Save')) + ]) + ]) + ]) + ]); + + L.ui.tabs.initTabGroup(view.lastElementChild.childNodes); + + return view; + }, + + handleSaveApply: null, + handleSave: null, + handleReset: null +}); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js index 1ed8f64d8f..492784cc95 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js @@ -47,33 +47,27 @@ callTimezone = rpc.declare({ CBILocalTime = form.DummyValue.extend({ renderWidget: function(section_id, option_id, cfgvalue) { return E([], [ - E('span', { 'id': 'localtime' }, - new Date(cfgvalue * 1000).toLocaleString()), + E('span', {}, [ + E('input', { + 'id': 'localtime', + 'type': 'text', + 'readonly': true, + 'value': new Date(cfgvalue * 1000).toLocaleString() + }) + ]), ' ', E('button', { 'class': 'cbi-button cbi-button-apply', - 'click': function() { - this.blur(); - this.classList.add('spinning'); - this.disabled = true; - callSetLocaltime(Math.floor(Date.now() / 1000)).then(L.bind(function() { - this.classList.remove('spinning'); - this.disabled = false; - }, this)); - } + 'click': L.ui.createHandlerFn(this, function() { + return callSetLocaltime(Math.floor(Date.now() / 1000)); + }) }, _('Sync with browser')), ' ', this.ntpd_support ? E('button', { 'class': 'cbi-button cbi-button-apply', - 'click': function() { - this.blur(); - this.classList.add('spinning'); - this.disabled = true; - callInitAction('sysntpd', 'restart').then(L.bind(function() { - this.classList.remove('spinning'); - this.disabled = false; - }, this)); - } + 'click': L.ui.createHandlerFn(this, function() { + return callInitAction('sysntpd', 'restart'); + }) }, _('Sync with NTP-Server')) : '' ]); }, @@ -83,7 +77,6 @@ return L.view.extend({ load: function() { return Promise.all([ callInitList('sysntpd'), - callInitList('zram'), callTimezone(), callGetLocaltime(), uci.load('luci'), @@ -92,11 +85,10 @@ return L.view.extend({ }, render: function(rpc_replies) { - var ntpd_support = rpc_replies[0], - zram_support = rpc_replies[1], - timezones = rpc_replies[2], - localtime = rpc_replies[3], - ntp_setup, ntp_enabled, m, s, o; + var ntpd_enabled = rpc_replies[0], + timezones = rpc_replies[1], + localtime = rpc_replies[2], + m, s, o; m = new form.Map('system', _('System'), @@ -119,7 +111,7 @@ return L.view.extend({ o = s.taboption('general', CBILocalTime, '_systime', _('Local Time')); o.cfgvalue = function() { return localtime }; - o.ntpd_support = ntpd_support; + o.ntpd_support = ntpd_enabled; o = s.taboption('general', form.Value, 'hostname', _('Hostname')); o.datatype = 'hostname'; @@ -149,7 +141,7 @@ return L.view.extend({ o = s.taboption('logging', form.Value, 'log_ip', _('External system log server')) o.optional = true o.placeholder = '0.0.0.0' - o.datatype = 'ip4addr' + o.datatype = 'ipaddr' o = s.taboption('logging', form.Value, 'log_port', _('External system log server port')) o.optional = true @@ -184,7 +176,7 @@ return L.view.extend({ * Zram Properties */ - if (zram_support != null) { + if (L.hasSystemFeature('zram')) { s.tab('zram', _('ZRam Settings')); o = s.taboption('zram', form.Value, 'zram_size_mb', _('ZRam Size'), _('Size of the ZRam device in megabytes')); @@ -234,7 +226,7 @@ return L.view.extend({ * NTP */ - if (ntpd_support != null) { + if (L.hasSystemFeature('sysntpd')) { var default_servers = [ '0.openwrt.pool.ntp.org', '1.openwrt.pool.ntp.org', '2.openwrt.pool.ntp.org', '3.openwrt.pool.ntp.org' @@ -245,14 +237,14 @@ return L.view.extend({ o.ucisection = 'ntp'; o.default = o.disabled; o.write = function(section_id, value) { - ntpd_support = +value; + ntpd_enabled = +value; - if (ntpd_support && !uci.get('system', 'ntp')) { + if (ntpd_enabled && !uci.get('system', 'ntp')) { uci.add('system', 'timeserver', 'ntp'); uci.set('system', 'ntp', 'server', default_servers); } - if (!ntpd_support) + if (!ntpd_enabled) uci.set('system', 'ntp', 'enabled', 0); else uci.unset('system', 'ntp', 'enabled'); @@ -260,7 +252,7 @@ return L.view.extend({ return callInitAction('sysntpd', 'enable'); }; o.load = function(section_id) { - return (ntpd_support == 1 && + return (ntpd_enabled == 1 && uci.get('system', 'ntp') != null && uci.get('system', 'ntp', 'enabled') != 0) ? '1' : '0'; }; @@ -269,22 +261,24 @@ return L.view.extend({ o.ucisection = 'ntp'; o.depends('enabled', '1'); + o = s.taboption('timesync', form.Flag, 'use_dhcp', _('Use DHCP advertised servers')); + o.ucisection = 'ntp'; + o.default = o.enabled; + o.depends('enabled', '1'); + o = s.taboption('timesync', form.DynamicList, 'server', _('NTP server candidates')); o.datatype = 'host(0)'; o.ucisection = 'ntp'; o.depends('enabled', '1'); - o.remove = function() {}; // retain server list even if disabled o.load = function(section_id) { - return uci.get('system', 'ntp') - ? uci.get('system', 'ntp', 'server') - : default_servers; + return uci.get('system', 'ntp', 'server'); }; } return m.render().then(function(mapEl) { L.Poll.add(function() { return callGetLocaltime().then(function(t) { - mapEl.querySelector('#localtime').innerHTML = new Date(t * 1000).toLocaleString(); + mapEl.querySelector('#localtime').value = new Date(t * 1000).toLocaleString(); }); }); |