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

luci-base: replace luci/getHostname with generic file/read rpc operation

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-09-09 11:09:18 +02:00
parent 9cae3b9e67
commit 5dc61be746
3 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js
View file

@ -3,10 +3,12 @@
'require form'; 'require form';
'require network'; 'require network';
var callHostname = rpc.declare({ var callFileRead = rpc.declare({
object: 'luci', object: 'file',
method: 'getHostname', method: 'read',
expect: { result: '' } params: [ 'path' ],
expect: { data: '' },
filter: function(value) { return value.trim() }
}); });
return network.registerProtocol('dhcp', { return network.registerProtocol('dhcp', {
@ -20,7 +22,7 @@ return network.registerProtocol('dhcp', {
o = s.taboption('general', form.Value, 'hostname', _('Hostname to send when requesting DHCP')); o = s.taboption('general', form.Value, 'hostname', _('Hostname to send when requesting DHCP'));
o.datatype = 'hostname'; o.datatype = 'hostname';
o.load = function(section_id) { o.load = function(section_id) {
return callHostname().then(L.bind(function(hostname) { return callFileRead('/proc/sys/kernel/hostname').then(L.bind(function(hostname) {
this.placeholder = hostname; this.placeholder = hostname;
return form.Value.prototype.load.apply(this, [section_id]); return form.Value.prototype.load.apply(this, [section_id]);
}, this)); }, this));

11
modules/luci-base/root/usr/libexec/rpcd/luci
View file

@ -468,17 +468,6 @@ local methods = {
return rv return rv
end end
},
getHostname = {
call = function()
local fs = require "nixio.fs"
local hostname, code, err = fs.readfile("/proc/sys/kernel/hostname")
if err then
return { error = err }, 1
end
return { result = hostname:gsub("\n$", "") }
end
} }
} }

7
modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
View file

@ -22,12 +22,13 @@
"read": { "read": {
"file": { "file": {
"/": [ "list" ], "/": [ "list" ],
"/*": [ "list" ] "/*": [ "list" ],
"/proc/sys/kernel/hostname": [ "read" ]
}, },
"ubus": { "ubus": {
"file": [ "list", "stat" ], "file": [ "list", "read", "stat" ],
"iwinfo": [ "assoclist", "freqlist", "txpowerlist", "countrylist" ], "iwinfo": [ "assoclist", "freqlist", "txpowerlist", "countrylist" ],
"luci": [ "getBoardJSON", "getDUIDHints", "getHostHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getDHCPLeases", "getLEDs", "getNetworkDevices", "getUSBDevices", "getHostname", "getWirelessDevices" ], "luci": [ "getBoardJSON", "getDUIDHints", "getHostHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getDHCPLeases", "getLEDs", "getNetworkDevices", "getUSBDevices", "getWirelessDevices" ],
"network.device": [ "status" ], "network.device": [ "status" ],
"network.interface": [ "dump" ], "network.interface": [ "dump" ],
"network": [ "get_proto_handlers" ], "network": [ "get_proto_handlers" ],