From 90200f421fb25fbccd60c6369f3dae443bbc5b41 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 26 Sep 2026 23:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=95=20Sync=202026-09-26=2023:39:10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-mod-status/Makefile | 2 +- .../luci-static/resources/view/status/include/40_dhcp.js | 2 +- luci-mod-status/root/usr/libexec/luci-arp | 3 +++ .../root/usr/share/rpcd/acl.d/luci-mod-status-index.json | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100755 luci-mod-status/root/usr/libexec/luci-arp diff --git a/luci-mod-status/Makefile b/luci-mod-status/Makefile index e36d3972f..cadeb9543 100644 --- a/luci-mod-status/Makefile +++ b/luci-mod-status/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Status Pages LUCI_DEPENDS:=+luci-base +luci-app-oui +luci-mod-dashboard +libiwinfo +rpcd-mod-iwinfo +rpcd-mod-rrdns +ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-socket -PKG_RELEASE:=15 +PKG_RELEASE:=16 PKG_BUILD_DEPENDS:=iwinfo PKG_LICENSE:=Apache-2.0 diff --git a/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js index 1c648dba1..7c9c983ee 100644 --- a/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js +++ b/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js @@ -219,7 +219,7 @@ return baseclass.extend({ L.hasSystemFeature('ufpd') ? callUfpList() : null, L.resolveDefault(uci.load('dhcp')), L.resolveDefault(callClientWeb(), {}), - L.resolveDefault(fs.read('/proc/net/arp'), ''), + L.resolveDefault(fs.exec_direct('/usr/libexec/luci-arp'), ''), L.resolveDefault(fs.read('/tmp/luci-client-history.json').then(JSON.parse), {}) ]); }, diff --git a/luci-mod-status/root/usr/libexec/luci-arp b/luci-mod-status/root/usr/libexec/luci-arp new file mode 100755 index 000000000..08c3841c6 --- /dev/null +++ b/luci-mod-status/root/usr/libexec/luci-arp @@ -0,0 +1,3 @@ +#!/bin/sh + +cat /proc/net/arp diff --git a/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status-index.json b/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status-index.json index d4eaf44f8..ee2a9c8aa 100644 --- a/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status-index.json +++ b/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status-index.json @@ -2,9 +2,10 @@ "luci-mod-status-index": { "description": "Grant access to main status display", "read": { + "cgi-io": [ "exec" ], "file": { "/etc/board.json": [ "read" ], - "/proc/net/arp": [ "read" ], + "/usr/libexec/luci-arp": [ "exec" ], "/tmp/luci-client-history.json": [ "read" ], "/proc/sys/net/netfilter/nf_conntrack_count": [ "read" ], "/proc/sys/net/netfilter/nf_conntrack_max": [ "read" ],