openwrt-mirror/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2025-12-22 01:44:35 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-mod-status,-network: remove checkUfpInstalled

Browse Source 
Right now, the checkUfpInstalled RPC call is performed first, and only after
that can the other Promises be called. Simplify this by adding a single check
for /usr/sbin/ufpd in the rpcd ucode, and replace calls to checkUfpInstalled()
with simple L.hasSystemFeature('ufpd') check (which is only done once, and
cached).

This also allows the 'stat' permission to be removed from a couple of acls.

Signed-off-by: David Härdeman <david@hardeman.nu>
This commit is contained in:
David Härdeman
2025-10-15 15:07:32 +02:00
committed by Paul Donald
parent 3ed815fe4a
commit 50abd15e88
8 changed files with 36 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/luci-base/root/usr/share/rpcd/ucode/luci
View File

@@ -237,6 +237,7 @@ const methods = {
relayd: access('/usr/sbin/relayd') == true,
apk: access('/usr/bin/apk') == true,
wifi: access('/sbin/wifi') == true,
ufpd: access('/usr/sbin/ufpd') == true,
vrf: access('/sys/module/vrf/refcnt') == true, // vrf.ko is loaded
netifd_vrf: false,
};

18
modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View File

@@ -11,7 +11,7 @@
'require tools.dnsrecordhandlers as drh';
var callHostHints, callDUIDHints, callDHCPLeases, CBILeaseStatus, CBILease6Status;
var checkUfpInstalled, callUfpList;
var callUfpList;
callHostHints = rpc.declare({
object: 'luci-rpc',
@@ -31,12 +31,6 @@ callDHCPLeases = rpc.declare({
expect: { '': {} }
});
checkUfpInstalled = rpc.declare({
object: 'file',
method: 'stat',
params: [ 'path' ]
});
callUfpList = rpc.declare({
object: 'fingerprint',
method: 'fingerprint',
@@ -289,19 +283,13 @@ function validateMACAddr(pools, sid, s) {
return view.extend({
load: function() {
return Promise.all([
checkUfpInstalled('/usr/sbin/ufpd')
]).then(data => {
var promises = [
callHostHints(),
callDUIDHints(),
getDHCPPools(),
network.getNetworks(),
data[0].type === 'file' ? callUfpList() : null,
L.hasSystemFeature('ufpd') ? callUfpList() : null,
uci.load('firewall')
]
return Promise.all(promises);
});
]);
},
render: function([hosts, duids, pools, networks, macdata]) {

3
modules/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json
View File

@@ -39,8 +39,7 @@
"read": {
"ubus": {
"luci-rpc": [ "getDHCPLeases", "getDUIDHints", "getHostHints" ],
"fingerprint": [ "fingerprint" ],
"file": [ "stat" ]
"fingerprint": [ "fingerprint" ]
},
"uci": [ "dhcp" ]
},

16
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
View File

@@ -16,12 +16,6 @@ var callUfpList = rpc.declare({
method: 'fingerprint',
});
var checkUfpInstalled = rpc.declare({
object: 'file',
method: 'stat',
params: [ 'path' ]
});
return baseclass.extend({
title: '',
@@ -30,17 +24,11 @@ return baseclass.extend({
load: function() {
return Promise.all([
checkUfpInstalled('/usr/sbin/ufpd')
]).then(data => {
var promises = [
callLuciDHCPLeases(),
network.getHostHints(),
data[0].type === 'file' ? callUfpList() : null,
L.hasSystemFeature('ufpd') ? callUfpList() : null,
L.resolveDefault(uci.load('dhcp'))
];
return Promise.all(promises);
});
]);
},
handleCreateStaticLease: function(lease, ev) {

12
modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
View File

@@ -11,12 +11,6 @@ const callNetworkInterfaceDump = rpc.declare({
expect: { interface: [] }
});
const checkUfpInstalled = rpc.declare({
object: 'file',
method: 'stat',
params: [ 'path' ]
});
const callUfpList = rpc.declare({
object: 'fingerprint',
method: 'fingerprint',
@@ -43,9 +37,6 @@ function applyMask(addr, mask, v6) {
return view.extend({
load() {
return Promise.all([
checkUfpInstalled('/usr/sbin/ufpd')
]).then(([ufpcheck]) => {
return Promise.all([
callNetworkInterfaceDump(),
L.resolveDefault(fs.exec('/sbin/ip', [ '-4', 'neigh', 'show' ]), {}),
@@ -54,9 +45,8 @@ return view.extend({
L.resolveDefault(fs.exec('/sbin/ip', [ '-6', 'neigh', 'show' ]), {}),
L.resolveDefault(fs.exec('/sbin/ip', [ '-6', 'route', 'show', 'table', 'all' ]), {}),
L.resolveDefault(fs.exec('/sbin/ip', [ '-6', 'rule', 'show' ]), {}),
ufpcheck?.type === 'file' ? callUfpList() : null
L.hasSystemFeature('ufpd') ? callUfpList() : null
]);
});
},
getNetworkByDevice(networks, dev, addr, mask, v6) {

12
modules/luci-mod-status/htdocs/luci-static/resources/view/status/routesj.js
View File

@@ -12,12 +12,6 @@ const callNetworkInterfaceDump = rpc.declare({
expect: { interface: [] }
});
const checkUfpInstalled = rpc.declare({
object: 'file',
method: 'stat',
params: [ 'path' ]
});
const callUfpList = rpc.declare({
object: 'fingerprint',
method: 'fingerprint',
@@ -44,9 +38,6 @@ function applyMask(addr, mask, v6) {
return view.extend({
load() {
return Promise.all([
checkUfpInstalled('/usr/sbin/ufpd')
]).then(([ufpcheck]) => {
return Promise.all([
callNetworkInterfaceDump(),
L.resolveDefault(fs.exec('/sbin/ip', [ '-4', '-j', 'neigh', 'show' ]), {}),
@@ -55,9 +46,8 @@ return view.extend({
L.resolveDefault(fs.exec('/sbin/ip', [ '-6', '-j', 'neigh', 'show' ]), {}),
L.resolveDefault(fs.exec('/sbin/ip', [ '-6', '-j', 'route', 'show', 'table', 'all' ]), {}),
L.resolveDefault(fs.exec('/sbin/ip', [ '-6', '-j', 'rule', 'show' ]), {}),
ufpcheck?.type === 'file' ? callUfpList() : null,
L.hasSystemFeature('ufpd') ? callUfpList() : null,
]);
});
},
getNetworkByDevice(networks, dev, addr, mask, v6) {

3
modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status-index.json
View File

@@ -34,8 +34,7 @@
"read": {
"ubus": {
"luci-rpc": [ "getDHCPLeases" ],
"fingerprint": [ "fingerprint" ],
"file": [ "stat" ]
"fingerprint": [ "fingerprint" ]
}
}
},

4
modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
View File

@@ -49,7 +49,7 @@
"/sbin/ip -[46] rule show": [ "exec" ]
},
"ubus": {
"file": [ "exec", "stat" ],
"file": [ "exec" ],
"fingerprint": [ "fingerprint" ]
}
}
@@ -64,7 +64,7 @@
"/sbin/ip -[46] -j rule show": [ "exec" ]
},
"ubus": {
"file": [ "exec", "stat" ],
"file": [ "exec" ],
"fingerprint": [ "fingerprint" ]
}
}