diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 710b9d369f..bd0c2a3af3 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -9,35 +9,58 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=27 +PKG_RELEASE:=28 include $(INCLUDE_DIR)/package.mk -define Package/autocore - TITLE:=x86/x64 auto core loadbalance script. - MAINTAINER:=Lean / [CTCGFW] Project OpenWrt - DEPENDS:=@TARGET_x86 +bc +lm-sensors +ethtool +define Package/autocore-arm + TITLE:=ARM auto core script. + MAINTAINER:=CN_SZTL + DEPENDS:=@(TARGET_bcm27xx||TARGET_ipq806x||TARGET_rockchip) + VARIANT:=arm endef -define Package/autocore/description -A usb autoconfig hotplug script. +define Package/autocore-x86 + TITLE:=x86/x64 auto core loadbalance script. + MAINTAINER:=Lean / CN_SZTL + DEPENDS:=@TARGET_x86 +bc +lm-sensors +ethtool + VARIANT:=x86 +endef + +define Package/autocore-arm/description + Display more details info about the devices in LuCI. +endef + +define Package/autocore-x86/description + A USB autoconfig hotplug script. endef define Build/Compile endef -define Package/autocore/install +define Package/autocore-arm/install $(INSTALL_DIR) $(1)/etc - $(INSTALL_BIN) ./files/rpcd_luci $(1)/etc/rpcd_luci - $(INSTALL_DATA) ./files/rpcd_luci-mod-status.json $(1)/etc/rpcd_luci-mod-status.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_BIN) ./files/arm/rpcd_luci $(1)/etc/rpcd_luci + $(INSTALL_DATA) ./files/arm/rpcd_luci-mod-status.json $(1)/etc/rpcd_luci-mod-status.json + $(INSTALL_DATA) ./files/arm/rpcd_10_system.js $(1)/etc/rpcd_10_system.js + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/arm/090-cover-index_files $(1)/etc/uci-defaults/090-cover-index_files $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) ./files/cpuinfo $(1)/sbin/cpuinfo - $(INSTALL_BIN) ./files/ethinfo $(1)/sbin/ethinfo + $(INSTALL_BIN) ./files/arm/cpuinfo $(1)/sbin/cpuinfo + +define Package/autocore-x86/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_BIN) ./files/x86/rpcd_luci $(1)/etc/rpcd_luci + $(INSTALL_DATA) ./files/x86/rpcd_luci-mod-status.json $(1)/etc/rpcd_luci-mod-status.json + $(INSTALL_DATA) ./files/x86/rpcd_10_system.js $(1)/etc/rpcd_10_system.js + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/x86/autocore $(1)/etc/init.d/autocore + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) ./files/x86/cpuinfo $(1)/sbin/cpuinfo + $(INSTALL_BIN) ./files/x86/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 + $(INSTALL_DATA) ./files/x86/rpcd_21_ethinfo.js $(1)/www/luci-static/resources/view/status/include/21_ethinfo.js endef -$(eval $(call BuildPackage,autocore)) +$(eval $(call BuildPackage,autocore-arm)) +$(eval $(call BuildPackage,autocore-x86)) diff --git a/package/lean/autocore/files/arm/090-cover-index_files b/package/lean/autocore/files/arm/090-cover-index_files new file mode 100755 index 0000000000..f432ce8cc0 --- /dev/null +++ b/package/lean/autocore/files/arm/090-cover-index_files @@ -0,0 +1,5 @@ +#!/bin/sh + +[ -f '/etc/rpcd_luci' ] && mv -f '/etc/rpcd_luci' '/usr/libexec/rpcd/luci' +[ -f '/etc/rpcd_luci-mod-status.json' ] && { mv -f '/etc/rpcd_luci-mod-status.json' '/usr/share/rpcd/acl.d/luci-mod-status.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/arm/cpuinfo b/package/lean/autocore/files/arm/cpuinfo new file mode 100755 index 0000000000..e1762cd5c1 --- /dev/null +++ b/package/lean/autocore/files/arm/cpuinfo @@ -0,0 +1,7 @@ +#!/bin/sh + +cpu_cores="$(cat "/proc/cpuinfo" | grep "processor" | wc -l || echo -n "1")" +cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq) / 1000)MHz" +sys_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" + +echo -n "ARMv8 Processor x ${cpu_cores} (${cpu_freq}, ${sys_temp})" diff --git a/package/lean/autocore/files/arm/rpcd_10_system.js b/package/lean/autocore/files/arm/rpcd_10_system.js new file mode 100644 index 0000000000..ea2ee90d36 --- /dev/null +++ b/package/lean/autocore/files/arm/rpcd_10_system.js @@ -0,0 +1,102 @@ +'use strict'; +'require baseclass'; +'require fs'; +'require rpc'; + +var callSystemBoard = rpc.declare({ + object: 'system', + method: 'board' +}); + +var callSystemInfo = rpc.declare({ + object: 'system', + method: 'info' +}); + +var callCPUBench = rpc.declare({ + object: 'luci', + method: 'getCPUBench' +}); + +var callCPUInfo = rpc.declare({ + object: 'luci', + method: 'getCPUInfo' +}); + +var callCPUUsage = rpc.declare({ + object: 'luci', + method: 'getCPUUsage' +}); + +return baseclass.extend({ + title: _('System'), + + load: function() { + return Promise.all([ + L.resolveDefault(callSystemBoard(), {}), + L.resolveDefault(callSystemInfo(), {}), + L.resolveDefault(callCPUBench(), {}), + L.resolveDefault(callCPUInfo(), {}), + L.resolveDefault(callCPUUsage(), {}), + fs.lines('/usr/lib/lua/luci/version.lua') + ]); + }, + + render: function(data) { + var boardinfo = data[0], + systeminfo = data[1], + cpubench = 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 + cpubench.cpubench, + _('Architecture'), cpuinfo.cpuinfo, + _('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/arm/rpcd_luci b/package/lean/autocore/files/arm/rpcd_luci new file mode 100755 index 0000000000..9719b9634b --- /dev/null +++ b/package/lean/autocore/files/arm/rpcd_luci @@ -0,0 +1,723 @@ +#!/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") + rv.relayd = fs.access("/usr/sbin/relayd") + + local wifi_features = { "eap", "11n", "11ac", "11r", "11w", "acs", "sae", "owe", "suiteb192", "wep" } + + 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 + }, + + getCPUBench = { + call = function() + local sys = require "luci.sys" + local cpubench = {} + + cpubench.cpubench = sys.exec("cat /etc/bench.log 2>/dev/null") + return cpubench + 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.33MHz, +2.33°C)" + end + + return cpuinfo + end + }, + + getCPUUsage = { + call = function() + local sys = require "luci.sys" + local cpuusage = {} + + cpuusage.cpuusage = (sys.exec("expr 100 - $(top -n 1 | grep 'CPU:' | awk -F '%' '{print$4}' | awk -F ' ' '{print$2}')") or "2.33") .. "%" + 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 + } +} + +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/arm/rpcd_luci-mod-status.json b/package/lean/autocore/files/arm/rpcd_luci-mod-status.json new file mode 100644 index 0000000000..982c7a3c67 --- /dev/null +++ b/package/lean/autocore/files/arm/rpcd_luci-mod-status.json @@ -0,0 +1,132 @@ +{ + "luci-mod-status-realtime": { + "description": "Grant access to realtime statistics", + "read": { + "ubus": { + "luci": [ "getConntrackList", "getRealtimeStats", "getCPUBench", "getCPUInfo", "getCPUUsage", "getOnlineUsers" ], + "network.rrdns": [ "lookup" ] + } + } + }, + + "luci-mod-status-processes": { + "description": "Grant access to process status", + "read": { + "ubus": { + "luci": [ "getProcessList" ] + } + }, + "write": { + "file": { + "/bin/kill": [ "exec" ] + }, + "ubus": { + "file": [ "exec" ] + } + } + }, + + "luci-mod-status-logs": { + "description": "Grant access to system logs", + "read": { + "cgi-io": [ "exec" ], + "file": { + "/bin/dmesg -r": [ "exec" ], + "/sbin/logread": [ "stat" ], + "/sbin/logread -e ^": [ "exec" ], + "/usr/sbin/logread": [ "stat" ], + "/usr/sbin/logread -e ^": [ "exec" ] + }, + "ubus": { + "file": [ "stat" ] + } + } + }, + + "luci-mod-status-routes": { + "description": "Grant access to the system route status", + "read": { + "file": { + "/sbin/ip -[46] neigh show": [ "exec" ], + "/sbin/ip -[46] route show table all": [ "exec" ] + }, + "ubus": { + "file": [ "exec" ] + } + } + }, + + "luci-mod-status-firewall": { + "description": "Grant access to firewall status", + "read": { + "cgi-io": [ "exec" ], + "file": { + "/usr/sbin/iptables --line-numbers -w -nvxL -t *": [ "exec" ], + "/usr/sbin/ip6tables --line-numbers -w -nvxL -t *": [ "exec" ], + "/usr/sbin/ip6tables": [ "list" ] + }, + "ubus": { + "file": [ "stat" ] + } + }, + "write": { + "cgi-io": [ "exec" ], + "file": { + "/etc/init.d/firewall restart": [ "exec" ], + "/usr/sbin/iptables -Z": [ "exec" ], + "/usr/sbin/ip6tables -Z": [ "exec" ] + }, + "ubus": { + "file": [ "exec" ] + } + } + }, + + "luci-mod-status-index": { + "description": "Grant access to main status display", + "read": { + "file": { + "/proc/sys/net/netfilter/nf_conntrack_count": [ "read" ], + "/proc/sys/net/netfilter/nf_conntrack_max": [ "read" ], + "/usr/lib/lua/luci/version.lua": [ "read" ], + "/www/luci-static/resources/view/status/include": [ "list" ] + }, + "ubus": { + "file": [ "list", "read" ], + "system": [ "board", "info" ] + } + } + }, + + "luci-mod-status-index-dhcp": { + "description": "Grant access to DHCP status display", + "read": { + "ubus": { + "luci-rpc": [ "getDHCPLeases" ] + } + } + }, + + "luci-mod-status-index-dsl": { + "description": "Grant access to DSL status display", + "read": { + "ubus": { + "luci-rpc": [ "getDSLStatus" ] + } + } + }, + + "luci-mod-status-index-wifi": { + "description": "Grant access to wireless status display", + "read": { + "ubus": { + "iwinfo": [ "assoclist" ] + } + }, + "write": { + "ubus": { + "hostapd.*": [ "del_client" ] + } + } + } +} diff --git a/package/lean/autocore/files/autocore b/package/lean/autocore/files/x86/autocore similarity index 100% rename from package/lean/autocore/files/autocore rename to package/lean/autocore/files/x86/autocore diff --git a/package/lean/autocore/files/cpuinfo b/package/lean/autocore/files/x86/cpuinfo similarity index 100% rename from package/lean/autocore/files/cpuinfo rename to package/lean/autocore/files/x86/cpuinfo diff --git a/package/lean/autocore/files/ethinfo b/package/lean/autocore/files/x86/ethinfo similarity index 100% rename from package/lean/autocore/files/ethinfo rename to package/lean/autocore/files/x86/ethinfo diff --git a/package/lean/autocore/files/rpcd_10_system.js b/package/lean/autocore/files/x86/rpcd_10_system.js similarity index 100% rename from package/lean/autocore/files/rpcd_10_system.js rename to package/lean/autocore/files/x86/rpcd_10_system.js diff --git a/package/lean/autocore/files/rpcd_21_ethinfo.js b/package/lean/autocore/files/x86/rpcd_21_ethinfo.js similarity index 100% rename from package/lean/autocore/files/rpcd_21_ethinfo.js rename to package/lean/autocore/files/x86/rpcd_21_ethinfo.js diff --git a/package/lean/autocore/files/rpcd_luci b/package/lean/autocore/files/x86/rpcd_luci similarity index 100% rename from package/lean/autocore/files/rpcd_luci rename to package/lean/autocore/files/x86/rpcd_luci diff --git a/package/lean/autocore/files/rpcd_luci-mod-status.json b/package/lean/autocore/files/x86/rpcd_luci-mod-status.json similarity index 100% rename from package/lean/autocore/files/rpcd_luci-mod-status.json rename to package/lean/autocore/files/x86/rpcd_luci-mod-status.json