diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index e63c874a9c..efdba91edb 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -28,11 +28,17 @@ define Build/Compile endef define Package/autocore/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_BIN) ./files/rpcd_luci $(1)/etc/rpcd_luci + $(INSTALL_DATA) ./files/rpcd_luci-base.json $(1)/etc/rpcd_luci-base.json + $(INSTALL_DATA) ./files/rpcd_10_system.js $(1)/etc/rpcd_10_system.js $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/autocore $(1)/etc/init.d/autocore - $(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/sbin - $(CP) ./files/sbin/* $(1)/sbin + $(INSTALL_BIN) ./files/cpuinfo $(1)/sbin/cpuinfo + $(INSTALL_BIN) ./files/ethinfo $(1)/sbin/ethinfo + $(INSTALL_DIR) $(1)/www/luci-static/resources/view/status/include + $(INSTALL_DATA) ./files/rpcd_21_ethinfo.js $(1)/www/luci-static/resources/view/status/include/21_ethinfo.js endef $(eval $(call BuildPackage,autocore)) diff --git a/package/lean/autocore/files/autocore b/package/lean/autocore/files/autocore index b67cb69561..436e92940a 100755 --- a/package/lean/autocore/files/autocore +++ b/package/lean/autocore/files/autocore @@ -49,4 +49,8 @@ start() ethtool -K $c tso on >/dev/null 2>&1 ethtool -K $c ufo on >/dev/null 2>&1 done + + [ -f '/etc/rpcd_luci' ] && mv -f '/etc/rpcd_luci' '/usr/libexec/rpcd/luci' + [ -f '/etc/rpcd_luci-base.json' ] && { mv -f '/etc/rpcd_luci-base.json' '/usr/share/rpcd/acl.d/luci-base.json'; /etc/init.d/rpcd restart; } + [ -f '/etc/rpcd_10_system.js' ] && mv -f '/etc/rpcd_10_system.js' '/www/luci-static/resources/view/status/include/10_system.js' } diff --git a/package/lean/autocore/files/sbin/cpuinfo b/package/lean/autocore/files/cpuinfo similarity index 100% rename from package/lean/autocore/files/sbin/cpuinfo rename to package/lean/autocore/files/cpuinfo diff --git a/package/lean/autocore/files/sbin/ethinfo b/package/lean/autocore/files/ethinfo similarity index 57% rename from package/lean/autocore/files/sbin/ethinfo rename to package/lean/autocore/files/ethinfo index ee27a655c0..9f7040354b 100755 --- a/package/lean/autocore/files/sbin/ethinfo +++ b/package/lean/autocore/files/ethinfo @@ -4,36 +4,14 @@ a=$(ip address | grep ^[0-9] | awk -F: '{print $2}' | sed "s/ //g" | grep '^[e]' b=$(echo "$a" | wc -l) rm -f /tmp/state/ethinfo -echo -n "[" > /tmp/state/ethinfo - for i in $(seq 1 $b) do - h=$(echo '{"name":' ) c=$(echo "$a" | sed -n ${i}p) d=$(ethtool $c) - e=$(echo "$d" | grep "Link detected" | awk -F: '{printf $2}' | sed 's/^[ \t]*//g') - if [ $e = yes ]; then - l=1 - else - l=0 - fi - f=$(echo "$d" | grep "Speed" | awk -F: '{printf $2}' | sed 's/^[ \t]*//g' | tr -d "Unknown!") - [ -z "$f" ] && f=" - " - + [ -z "$f" ] && f="-" g=$(echo "$d" | grep "Duplex" | awk -F: '{printf $2}' | sed 's/^[ \t]*//g') - if [ "$g" == "Full" ]; then - x=1 - else - x=0 - fi - - echo -n "$h \"$c\", \"status\": $l, \"speed\": \"$f\", \"duplex\": $x}," >> /tmp/state/ethinfo + [ "$g" != "Full" -a "$g" != "Half" ] && g="-" + echo "$c $e $f $g" >> /tmp/state/ethinfo done - -sed -i 's/.$//' /tmp/state/ethinfo - -echo -n "]" >> /tmp/state/ethinfo - -cat /tmp/state/ethinfo diff --git a/package/lean/autocore/files/rpcd_10_system.js b/package/lean/autocore/files/rpcd_10_system.js new file mode 100644 index 0000000000..2c46afdf6f --- /dev/null +++ b/package/lean/autocore/files/rpcd_10_system.js @@ -0,0 +1,94 @@ +'use strict'; +'require fs'; +'require rpc'; + +var callSystemBoard = rpc.declare({ + object: 'system', + method: 'board' +}); + +var callSystemInfo = rpc.declare({ + object: 'system', + method: 'info' +}); + +var callCPUInfo = rpc.declare({ + object: 'luci', + method: 'getCPUInfo' +}); + +var callCPUUsage = rpc.declare({ + object: 'luci', + method: 'getCPUUsage' +}); + +return L.Class.extend({ + title: _('System'), + + load: function() { + return Promise.all([ + L.resolveDefault(callSystemBoard(), {}), + L.resolveDefault(callSystemInfo(), {}), + L.resolveDefault(callCPUInfo(), {}), + L.resolveDefault(callCPUUsage(), {}), + fs.lines('/usr/lib/lua/luci/version.lua') + ]); + }, + + render: function(data) { + var boardinfo = data[0], + systeminfo = data[1], + cpuinfo = data[2], + cpuusage = data[3], + luciversion = data[4]; + + luciversion = luciversion.filter(function(l) { + return l.match(/^\s*(luciname|luciversion)\s*=/); + }).map(function(l) { + return l.replace(/^\s*\w+\s*=\s*['"]([^'"]+)['"].*$/, '$1'); + }).join(' '); + + var datestr = null; + + if (systeminfo.localtime) { + var date = new Date(systeminfo.localtime * 1000); + + datestr = '%04d-%02d-%02d %02d:%02d:%02d'.format( + date.getUTCFullYear(), + date.getUTCMonth() + 1, + date.getUTCDate(), + date.getUTCHours(), + date.getUTCMinutes(), + date.getUTCSeconds() + ); + } + + var fields = [ + _('Hostname'), boardinfo.hostname, + _('Model'), boardinfo.model, + _('CPU Info'), cpuinfo.cpuinfo, + _('Architecture'), boardinfo.system, + _('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description + ' / ' : '') + (luciversion || ''), + _('Kernel Version'), boardinfo.kernel, + _('Local Time'), datestr, + _('Uptime'), systeminfo.uptime ? '%t'.format(systeminfo.uptime) : null, + _('Load Average'), Array.isArray(systeminfo.load) ? '%.2f, %.2f, %.2f'.format( + systeminfo.load[0] / 65535.0, + systeminfo.load[1] / 65535.0, + systeminfo.load[2] / 65535.0 + ) : null, + _('CPU usage (%)'), cpuusage.cpuusage + ]; + + var table = E('div', { 'class': 'table' }); + + for (var i = 0; i < fields.length; i += 2) { + table.appendChild(E('div', { 'class': 'tr' }, [ + E('div', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]), + E('div', { 'class': 'td left' }, [ (fields[i + 1] != null) ? fields[i + 1] : '?' ]) + ])); + } + + return table; + } +}); diff --git a/package/lean/autocore/files/rpcd_21_ethinfo.js b/package/lean/autocore/files/rpcd_21_ethinfo.js new file mode 100644 index 0000000000..1e83c446d9 --- /dev/null +++ b/package/lean/autocore/files/rpcd_21_ethinfo.js @@ -0,0 +1,59 @@ +'use strict'; +'require rpc'; + +var callLuciETHInfo = rpc.declare({ + object: 'luci', + method: 'getETHInfo', + expect: { '': {} } +}); + +return L.Class.extend({ + title: _('Ethernet Information'), + + load: function() { + return Promise.all([ + L.resolveDefault(callLuciETHInfo(), {}) + ]); + }, + + render: function(data) { + var ethinfo = Array.isArray(data[0].ethinfo) ? data[0].ethinfo : []; + + var table = E('div', { 'class': 'table' }, [ + E('div', { 'class': 'tr table-titles' }, [ + E('div', { 'class': 'th' }, _('Ethernet Name')), + E('div', { 'class': 'th' }, _('Link Status')), + E('div', { 'class': 'th' }, _('Speed')), + E('div', { 'class': 'th' }, _('Duplex')) + ]) + ]); + + cbi_update_table(table, ethinfo.map(function(info) { + var exp1; + var exp2; + + if (info.status == "yes") + exp1 = _('Link Up'); + else if (info.status == "no") + exp1 = _('Link Down'); + + if (info.duplex == "Full") + exp2 = _('Full Duplex'); + else if (info.duplex == "Half") + exp2 = _('Half Duplex'); + else + exp2 = _('-'); + + return [ + info.name, + exp1, + info.speed, + exp2 + ]; + })); + + return E([ + table + ]); + } +}); diff --git a/package/lean/autocore/files/rpcd_luci b/package/lean/autocore/files/rpcd_luci new file mode 100755 index 0000000000..ba62f4506a --- /dev/null +++ b/package/lean/autocore/files/rpcd_luci @@ -0,0 +1,740 @@ +#!/usr/bin/env lua + +local json = require "luci.jsonc" +local fs = require "nixio.fs" + +local function readfile(path) + local s = fs.readfile(path) + return s and (s:gsub("^%s+", ""):gsub("%s+$", "")) +end + +local methods = { + getInitList = { + args = { name = "name" }, + call = function(args) + local sys = require "luci.sys" + local _, name, scripts = nil, nil, {} + for _, name in ipairs(args.name and { args.name } or sys.init.names()) do + local index = sys.init.index(name) + if index then + scripts[name] = { index = index, enabled = sys.init.enabled(name) } + else + return { error = "No such init script" } + end + end + return scripts + end + }, + + setInitAction = { + args = { name = "name", action = "action" }, + call = function(args) + local sys = require "luci.sys" + if type(sys.init[args.action]) ~= "function" then + return { error = "Invalid action" } + end + return { result = sys.init[args.action](args.name) } + end + }, + + getLocaltime = { + call = function(args) + return { result = os.time() } + end + }, + + setLocaltime = { + args = { localtime = 0 }, + call = function(args) + local sys = require "luci.sys" + local date = os.date("*t", args.localtime) + if date then + sys.call("date -s '%04d-%02d-%02d %02d:%02d:%02d' >/dev/null" %{ date.year, date.month, date.day, date.hour, date.min, date.sec }) + sys.call("/etc/init.d/sysfixtime restart >/dev/null") + end + return { result = args.localtime } + end + }, + + getTimezones = { + call = function(args) + local util = require "luci.util" + local zones = require "luci.sys.zoneinfo" + + local tz = readfile("/etc/TZ") + local res = util.ubus("uci", "get", { + config = "system", + section = "@system[0]", + option = "zonename" + }) + + local result = {} + local _, zone + for _, zone in ipairs(zones.TZ) do + result[zone[1]] = { + tzstring = zone[2], + active = (res and res.value == zone[1]) and true or nil + } + end + return result + end + }, + + getLEDs = { + call = function() + local iter = fs.dir("/sys/class/leds") + local result = { } + + if iter then + local led + for led in iter do + local m, s + + result[led] = { triggers = {} } + + s = readfile("/sys/class/leds/"..led.."/trigger") + for s in (s or ""):gmatch("%S+") do + m = s:match("^%[(.+)%]$") + result[led].triggers[#result[led].triggers+1] = m or s + result[led].active_trigger = m or result[led].active_trigger + end + + s = readfile("/sys/class/leds/"..led.."/brightness") + if s then + result[led].brightness = tonumber(s) + end + + s = readfile("/sys/class/leds/"..led.."/max_brightness") + if s then + result[led].max_brightness = tonumber(s) + end + end + end + + return result + end + }, + + getUSBDevices = { + call = function() + local fs = require "nixio.fs" + local iter = fs.glob("/sys/bus/usb/devices/[0-9]*/manufacturer") + local result = { } + + if iter then + result.devices = {} + + local p + for p in iter do + local id = p:match("/([^/]+)/manufacturer$") + + result.devices[#result.devices+1] = { + id = id, + vid = readfile("/sys/bus/usb/devices/"..id.."/idVendor"), + pid = readfile("/sys/bus/usb/devices/"..id.."/idProduct"), + vendor = readfile("/sys/bus/usb/devices/"..id.."/manufacturer"), + product = readfile("/sys/bus/usb/devices/"..id.."/product"), + speed = tonumber((readfile("/sys/bus/usb/devices/"..id.."/product"))) + } + end + end + + iter = fs.glob("/sys/bus/usb/devices/*/*-port[0-9]*") + + if iter then + result.ports = {} + + local p + for p in iter do + local port = p:match("([^/]+)$") + local link = fs.readlink(p.."/device") + + result.ports[#result.ports+1] = { + port = port, + device = link and fs.basename(link) + } + end + end + + return result + end + }, + + getConntrackHelpers = { + call = function() + local ok, fd = pcall(io.open, "/usr/share/fw3/helpers.conf", "r") + local rv = {} + + if ok then + local entry + + while true do + local line = fd:read("*l") + if not line then + break + end + + if line:match("^%s*config%s") then + if entry then + rv[#rv+1] = entry + end + entry = {} + else + local opt, val = line:match("^%s*option%s+(%S+)%s+(%S.*)$") + if opt and val then + opt = opt:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1") + val = val:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1") + entry[opt] = val + end + end + end + + if entry then + rv[#rv+1] = entry + end + + fd:close() + end + + return { result = rv } + end + }, + + getFeatures = { + call = function() + local fs = require "nixio.fs" + local rv = {} + local ok, fd + + rv.firewall = fs.access("/sbin/fw3") + rv.opkg = fs.access("/bin/opkg") + rv.offloading = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt") + rv.br2684ctl = fs.access("/usr/sbin/br2684ctl") + rv.swconfig = fs.access("/sbin/swconfig") + rv.odhcpd = fs.access("/usr/sbin/odhcpd") + rv.zram = fs.access("/sys/class/zram-control") + rv.sysntpd = fs.readlink("/usr/sbin/ntpd") and true + rv.ipv6 = fs.access("/proc/net/ipv6_route") + rv.dropbear = fs.access("/usr/sbin/dropbear") + rv.cabundle = fs.access("/etc/ssl/certs/ca-certificates.crt") + + local wifi_features = { "eap", "11n", "11ac", "11r", "11w", "acs", "sae", "owe", "suiteb192" } + + if fs.access("/usr/sbin/hostapd") then + rv.hostapd = { cli = fs.access("/usr/sbin/hostapd_cli") } + + local _, feature + for _, feature in ipairs(wifi_features) do + rv.hostapd[feature] = + (os.execute(string.format("/usr/sbin/hostapd -v%s >/dev/null 2>/dev/null", feature)) == 0) + end + end + + if fs.access("/usr/sbin/wpa_supplicant") then + rv.wpasupplicant = { cli = fs.access("/usr/sbin/wpa_cli") } + + local _, feature + for _, feature in ipairs(wifi_features) do + rv.wpasupplicant[feature] = + (os.execute(string.format("/usr/sbin/wpa_supplicant -v%s >/dev/null 2>/dev/null", feature)) == 0) + end + end + + ok, fd = pcall(io.popen, "dnsmasq --version 2>/dev/null") + if ok then + rv.dnsmasq = {} + + while true do + local line = fd:read("*l") + if not line then + break + end + + local opts = line:match("^Compile time options: (.+)$") + if opts then + local opt + for opt in opts:gmatch("%S+") do + local no = opt:match("^no%-(%S+)$") + rv.dnsmasq[string.lower(no or opt)] = not no + end + break + end + end + + fd:close() + end + + ok, fd = pcall(io.popen, "ipset --help 2>/dev/null") + if ok then + rv.ipset = {} + + local sets = false + + while true do + local line = fd:read("*l") + if not line then + break + elseif line:match("^Supported set types:") then + sets = true + elseif sets then + local set, ver = line:match("^%s+(%S+)%s+(%d+)") + if set and not rv.ipset[set] then + rv.ipset[set] = tonumber(ver) + end + end + end + + fd:close() + end + + return rv + end + }, + + getSwconfigFeatures = { + args = { switch = "switch0" }, + call = function(args) + local util = require "luci.util" + + -- Parse some common switch properties from swconfig help output. + local swc, err = io.popen("swconfig dev %s help 2>/dev/null" % util.shellquote(args.switch)) + if swc then + local is_port_attr = false + local is_vlan_attr = false + local rv = {} + + while true do + local line = swc:read("*l") + if not line then break end + + if line:match("^%s+%-%-vlan") then + is_vlan_attr = true + + elseif line:match("^%s+%-%-port") then + is_vlan_attr = false + is_port_attr = true + + elseif line:match("cpu @") then + rv.switch_title = line:match("^switch%d: %w+%((.-)%)") + rv.num_vlans = tonumber(line:match("vlans: (%d+)")) or 16 + rv.min_vid = 1 + + elseif line:match(": pvid") or line:match(": tag") or line:match(": vid") then + if is_vlan_attr then rv.vid_option = line:match(": (%w+)") end + + elseif line:match(": enable_vlan4k") then + rv.vlan4k_option = "enable_vlan4k" + + elseif line:match(": enable_vlan") then + rv.vlan_option = "enable_vlan" + + elseif line:match(": enable_learning") then + rv.learning_option = "enable_learning" + + elseif line:match(": enable_mirror_rx") then + rv.mirror_option = "enable_mirror_rx" + + elseif line:match(": max_length") then + rv.jumbo_option = "max_length" + end + end + + swc:close() + + if not next(rv) then + return { error = "No such switch" } + end + + return rv + else + return { error = err } + end + end + }, + + getSwconfigPortState = { + args = { switch = "switch0" }, + call = function(args) + local util = require "luci.util" + + local swc, err = io.popen("swconfig dev %s show 2>/dev/null" % util.shellquote(args.switch)) + if swc then + local ports = { } + + while true do + local line = swc:read("*l") + if not line or (line:match("^VLAN %d+:") and #ports > 0) then + break + end + + local pnum = line:match("^Port (%d+):") + if pnum then + port = { + port = tonumber(pnum), + duplex = false, + speed = 0, + link = false, + auto = false, + rxflow = false, + txflow = false + } + + ports[#ports+1] = port + end + + if port then + local m + + if line:match("full[%- ]duplex") then + port.duplex = true + end + + m = line:match(" speed:(%d+)") + if m then + port.speed = tonumber(m) + end + + m = line:match("(%d+) Mbps") + if m and port.speed == 0 then + port.speed = tonumber(m) + end + + m = line:match("link: (%d+)") + if m and port.speed == 0 then + port.speed = tonumber(m) + end + + if line:match("link: ?up") or line:match("status: ?up") then + port.link = true + end + + if line:match("auto%-negotiate") or line:match("link:.-auto") then + port.auto = true + end + + if line:match("link:.-rxflow") then + port.rxflow = true + end + + if line:match("link:.-txflow") then + port.txflow = true + end + end + end + + swc:close() + + if not next(ports) then + return { error = "No such switch" } + end + + return { result = ports } + else + return { error = err } + end + end + }, + + setPassword = { + args = { username = "root", password = "password" }, + call = function(args) + local util = require "luci.util" + return { + result = (os.execute("(echo %s; sleep 1; echo %s) | passwd %s >/dev/null 2>&1" %{ + luci.util.shellquote(args.password), + luci.util.shellquote(args.password), + luci.util.shellquote(args.username) + }) == 0) + } + end + }, + + getBlockDevices = { + call = function() + local fs = require "nixio.fs" + + local block = io.popen("/sbin/block info", "r") + if block then + local rv = {} + + while true do + local ln = block:read("*l") + if not ln then + break + end + + local dev = ln:match("^/dev/(.-):") + if dev then + local s = tonumber((fs.readfile("/sys/class/block/" .. dev .."/size"))) + local e = { + dev = "/dev/" .. dev, + size = s and s * 512 + } + + local key, val = { } + for key, val in ln:gmatch([[(%w+)="(.-)"]]) do + e[key:lower()] = val + end + + rv[dev] = e + end + end + + block:close() + + return rv + else + return { error = "Unable to execute block utility" } + end + end + }, + + setBlockDetect = { + call = function() + return { result = (os.execute("/sbin/block detect > /etc/config/fstab") == 0) } + end + }, + + getMountPoints = { + call = function() + local fs = require "nixio.fs" + + local fd, err = io.open("/proc/mounts", "r") + if fd then + local rv = {} + + while true do + local ln = fd:read("*l") + if not ln then + break + end + + local device, mount, fstype, options, freq, pass = ln:match("^(%S*) (%S*) (%S*) (%S*) (%d+) (%d+)$") + if device and mount then + device = device:gsub("\\(%d+)", function(n) return string.char(tonumber(n, 8)) end) + mount = mount:gsub("\\(%d+)", function(n) return string.char(tonumber(n, 8)) end) + + local stat = fs.statvfs(mount) + if stat and stat.blocks > 0 then + rv[#rv+1] = { + device = device, + mount = mount, + size = stat.bsize * stat.blocks, + avail = stat.bsize * stat.bavail, + free = stat.bsize * stat.bfree + } + end + end + end + + fd:close() + + return { result = rv } + else + return { error = err } + end + end + }, + + getRealtimeStats = { + args = { mode = "interface", device = "eth0" }, + call = function(args) + local util = require "luci.util" + + local flags + if args.mode == "interface" then + flags = "-i %s" % util.shellquote(args.device) + elseif args.mode == "wireless" then + flags = "-r %s" % util.shellquote(args.device) + elseif args.mode == "conntrack" then + flags = "-c" + elseif args.mode == "load" then + flags = "-l" + else + return { error = "Invalid mode" } + end + + local fd, err = io.popen("luci-bwc %s" % flags, "r") + if fd then + local parse = json.new() + local done + + parse:parse("[") + + while true do + local ln = fd:read("*l") + if not ln then + break + end + + done, err = parse:parse((ln:gsub("%d+", "%1.0"))) + + if done then + err = "Unexpected JSON data" + end + + if err then + break + end + end + + fd:close() + + done, err = parse:parse("]") + + if err then + return { error = err } + elseif not done then + return { error = "Incomplete JSON data" } + else + return { result = parse:get() } + end + else + return { error = err } + end + end + }, + + getConntrackList = { + call = function() + local sys = require "luci.sys" + return { result = sys.net.conntrack() } + end + }, + + getProcessList = { + call = function() + local sys = require "luci.sys" + local res = {} + for _, v in pairs(sys.process.list()) do + res[#res + 1] = v + end + return { result = res } + end + }, + + getCPUUsage = { + call = function() + local sys = require "luci.sys" + local cpuusage = {} + + sys.call("/bin/getcpu &") + cpuusage.cpuusage = sys.exec("cat /tmp/cpuusage 2>/dev/null") + + if (cpuusage.cpuusage == nil) or (cpuusage.cpuusage == "") then + cpuusage.cpuusage = "2.33%" + end + + return cpuusage + end + }, + + getOnlineUsers = { + call = function() + local sys = require "luci.sys" + local onlineusers = {} + + onlineusers.onlineusers = sys.exec("cat /proc/net/arp | grep 'br-lan' | grep '0x2' | wc -l") + return onlineusers + + end + }, + + getCPUInfo = { + call = function() + local sys = require "luci.sys" + local cpuinfo = {} + + cpuinfo.cpuinfo = sys.exec("/sbin/cpuinfo") + + if (cpuinfo.cpuinfo == nil) or (cpuinfo.cpuinfo == "") then + cpuinfo.cpuinfo = "2.33 MHz +2.33 C" + end + + return cpuinfo + end + }, + + getETHInfo = { + call = function() + local sys = require "luci.sys" + local rv = {} + + sys.call("/sbin/ethinfo") + local ok, fd = pcall(io.open, "/tmp/state/ethinfo", "r") + local line + for line in fd:lines() do + local line1 + line1 = string.split(line , " ") + rv[#rv+1] = { + name = line1[1], + status = line1[2], + speed = line1[3], + duplex = line1[4] + } + end + fd:close() + return { ethinfo = rv } + end +} + +local function parseInput() + local parse = json.new() + local done, err + + while true do + local chunk = io.read(4096) + if not chunk then + break + elseif not done and not err then + done, err = parse:parse(chunk) + end + end + + if not done then + print(json.stringify({ error = err or "Incomplete input" })) + os.exit(1) + end + + return parse:get() +end + +local function validateArgs(func, uargs) + local method = methods[func] + if not method then + print(json.stringify({ error = "Method not found" })) + os.exit(1) + end + + if type(uargs) ~= "table" then + print(json.stringify({ error = "Invalid arguments" })) + os.exit(1) + end + + uargs.ubus_rpc_session = nil + + local k, v + local margs = method.args or {} + for k, v in pairs(uargs) do + if margs[k] == nil or + (v ~= nil and type(v) ~= type(margs[k])) + then + print(json.stringify({ error = "Invalid arguments" })) + os.exit(1) + end + end + + return method +end + +if arg[1] == "list" then + local _, method, rv = nil, nil, {} + for _, method in pairs(methods) do rv[_] = method.args or {} end + print((json.stringify(rv):gsub(":%[%]", ":{}"))) +elseif arg[1] == "call" then + local args = parseInput() + local method = validateArgs(arg[2], args) + local result, code = method.call(args) + print((json.stringify(result):gsub("^%[%]$", "{}"))) + os.exit(code or 0) +end diff --git a/package/lean/autocore/files/rpcd_luci-base.json b/package/lean/autocore/files/rpcd_luci-base.json new file mode 100644 index 0000000000..2f4a3cb55b --- /dev/null +++ b/package/lean/autocore/files/rpcd_luci-base.json @@ -0,0 +1,128 @@ +{ + "unauthenticated": { + "description": "Allow system feature probing", + "read": { + "ubus": { + "luci": [ "getFeatures" ] + } + } + }, + + "uci-access": { + "description": "Grant uci write access to all configurations", + "read": { + "uci": [ "*" ] + }, + "write": { + "uci": [ "*" ] + } + }, + "luci-access": { + "description": "Grant access to basic LuCI procedures", + "read": { + "cgi-io": [ "backup", "download", "exec" ], + "file": { + "/": [ "list" ], + "/*": [ "list" ], + "/dev/mtdblock*": [ "read" ], + "/etc/crontabs/root": [ "read" ], + "/etc/dropbear/authorized_keys": [ "read" ], + "/etc/filesystems": [ "read" ], + "/etc/rc.local": [ "read" ], + "/etc/sysupgrade.conf": [ "read" ], + "/etc/passwd": [ "read" ], + "/etc/group": [ "read" ], + "/proc/filesystems": [ "read" ], + "/proc/mtd": [ "read" ], + "/proc/partitions": [ "read" ], + "/proc/sys/kernel/hostname": [ "read" ], + "/proc/sys/net/netfilter/nf_conntrack_*": [ "read" ], + "/proc/mounts": [ "read" ], + "/usr/lib/lua/luci/version.lua": [ "read" ], + "/bin/dmesg -r": [ "exec" ], + "/bin/ping *": [ "exec" ], + "/bin/ping6 *": [ "exec" ], + "/bin/traceroute *": [ "exec" ], + "/bin/traceroute6 *": [ "exec" ], + "/sbin/ip -4 neigh show": [ "exec" ], + "/sbin/ip -4 route show table all": [ "exec" ], + "/sbin/ip -6 neigh show": [ "exec" ], + "/sbin/ip -6 route show table all": [ "exec" ], + "/sbin/logread -e ^": [ "exec" ], + "/usr/bin/ping *": [ "exec" ], + "/usr/bin/ping6 *": [ "exec" ], + "/usr/bin/traceroute *": [ "exec" ], + "/usr/bin/traceroute6 *": [ "exec" ], + "/usr/bin/nslookup *": [ "exec" ], + "/usr/libexec/luci-peeraddr": [ "exec" ], + "/usr/sbin/iptables --line-numbers -w -nvxL -t *": [ "exec" ], + "/usr/sbin/ip6tables --line-numbers -w -nvxL -t *": [ "exec" ] + }, + "ubus": { + "file": [ "list", "read", "stat" ], + "iwinfo": [ "assoclist", "freqlist", "txpowerlist", "countrylist" ], + "luci": [ "getConntrackList", "getInitList", "getLocaltime", "getProcessList", "getRealtimeStats", "getTimezones", "getLEDs", "getUSBDevices", "getSwconfigFeatures", "getSwconfigPortState", "getBlockDevices", "getMountPoints", "getCPUUsage", "getOnlineUsers", "getETHInfo" ], + "luci-rpc": [ "getBoardJSON", "getDHCPLeases", "getDSLStatus", "getDUIDHints", "getHostHints", "getNetworkDevices", "getWirelessDevices" ], + "network.interface": [ "dump" ], + "network.rrdns": [ "lookup" ], + "network": [ "get_proto_handlers" ], + "system": [ "board", "info", "validate_firmware_image" ], + "uci": [ "changes", "get" ] + }, + "uci": [ "*" ] + }, + "write": { + "cgi-io": [ "upload" ], + "file": { + "/etc/crontabs/root": [ "write" ], + "/etc/dropbear/authorized_keys": [ "write" ], + "/etc/init.d/firewall restart": [ "exec" ], + "/etc/luci-uploads/*": [ "write" ], + "/etc/rc.local": [ "write" ], + "/etc/sysupgrade.conf": [ "write" ], + "/sbin/block": [ "exec" ], + "/sbin/firstboot": [ "exec" ], + "/sbin/ifdown": [ "exec" ], + "/sbin/ifup": [ "exec" ], + "/sbin/reboot": [ "exec" ], + "/sbin/sysupgrade": [ "exec" ], + "/sbin/wifi": [ "exec" ], + "/bin/kill": [ "exec" ], + "/bin/tar": [ "exec" ], + "/bin/umount": [ "exec" ], + "/tmp/backup.tar.gz": [ "write" ], + "/tmp/firmware.bin": [ "write" ], + "/tmp/upload.ipk": [ "write" ], + "/usr/sbin/iptables -Z": [ "exec" ], + "/usr/sbin/ip6tables -Z": [ "exec" ] + }, + "ubus": { + "file": [ "write", "remove", "exec" ], + "hostapd.*": [ "del_client" ], + "iwinfo": [ "scan" ], + "luci": [ "setInitAction", "setLocaltime", "setPassword", "setBlockDetect" ], + "uci": [ "add", "apply", "confirm", "delete", "order", "set", "rename" ] + }, + "uci": [ "*" ] + } + }, + "luci-app-firewall": { + "description": "Grant access to firewall procedures", + "read": { + "file": { + "/etc/firewall.user": [ "read" ] + }, + "ubus": { + "luci": [ "getConntrackHelpers" ] + }, + "uci": [ "firewall" ] + }, + "write": { + "file": { + "/etc/firewall.user": [ "write" ], + "/etc/init.d/firewall": [ "exec" ] + }, + "uci": [ "firewall" ] + } + } +}