From: Jo-Philipp Wich Date: Fri, 17 Apr 2020 10:14:50 +0000 (+0200) Subject: treewide: add ACL annotations to menu entries X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8f34e105c0;p=oweals%2Fluci.git treewide: add ACL annotations to menu entries Signed-off-by: Jo-Philipp Wich --- diff --git a/applications/luci-app-adblock/root/usr/share/luci/menu.d/luci-app-adblock.json b/applications/luci-app-adblock/root/usr/share/luci/menu.d/luci-app-adblock.json index 6faede5b1..9f2659c1d 100644 --- a/applications/luci-app-adblock/root/usr/share/luci/menu.d/luci-app-adblock.json +++ b/applications/luci-app-adblock/root/usr/share/luci/menu.d/luci-app-adblock.json @@ -7,6 +7,7 @@ "path": "admin/services/adblock/overview" }, "depends": { + "acl": [ "luci-app-adblock" ], "fs": { "/usr/bin/adblock.sh": "executable", "/etc/init.d/adblock": "executable" diff --git a/applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json b/applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json index 2cb7cb965..79d82a828 100644 --- a/applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json +++ b/applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json @@ -5,6 +5,9 @@ "action": { "type": "template", "path": "attendedsysupgrade" + }, + "depends": { + "acl": [ "attendedsysupgrade" ] } } } diff --git a/applications/luci-app-bcp38/root/usr/share/luci/menu.d/luci-app-bcp38.json b/applications/luci-app-bcp38/root/usr/share/luci/menu.d/luci-app-bcp38.json index f85d69d48..e83ad69b3 100644 --- a/applications/luci-app-bcp38/root/usr/share/luci/menu.d/luci-app-bcp38.json +++ b/applications/luci-app-bcp38/root/usr/share/luci/menu.d/luci-app-bcp38.json @@ -6,6 +6,9 @@ "type": "cbi", "path": "bcp38", "post": { "cbi.submit": true } + }, + "depends": { + "acl": [ "luci-app-bcp38" ] } } } diff --git a/applications/luci-app-clamav/root/usr/share/luci/menu.d/luci-app-clamav.json b/applications/luci-app-clamav/root/usr/share/luci/menu.d/luci-app-clamav.json index 351701a7f..e0426b615 100644 --- a/applications/luci-app-clamav/root/usr/share/luci/menu.d/luci-app-clamav.json +++ b/applications/luci-app-clamav/root/usr/share/luci/menu.d/luci-app-clamav.json @@ -5,6 +5,9 @@ "type": "cbi", "path": "clamav", "post": { "cbi.submit": true } + }, + "depends": { + "acl": [ "luci-app-clamav" ] } } } diff --git a/applications/luci-app-coovachilli/root/usr/share/luci/menu.d/luci-app-coovachilli.json b/applications/luci-app-coovachilli/root/usr/share/luci/menu.d/luci-app-coovachilli.json index d7da7cad1..5178a5989 100644 --- a/applications/luci-app-coovachilli/root/usr/share/luci/menu.d/luci-app-coovachilli.json +++ b/applications/luci-app-coovachilli/root/usr/share/luci/menu.d/luci-app-coovachilli.json @@ -6,6 +6,9 @@ "type": "cbi", "path": "coovachilli", "post": { "cbi.submit": true } + }, + "depends": { + "acl": [ "luci-app-coovachilli" ] } }, diff --git a/applications/luci-app-dcwapd/root/usr/share/luci/menu.d/luci-app-dcwapd.json b/applications/luci-app-dcwapd/root/usr/share/luci/menu.d/luci-app-dcwapd.json index 30ed4c5d9..40946b513 100644 --- a/applications/luci-app-dcwapd/root/usr/share/luci/menu.d/luci-app-dcwapd.json +++ b/applications/luci-app-dcwapd/root/usr/share/luci/menu.d/luci-app-dcwapd.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-dcwapd" ], "uci": { "dcwapd": true } } } diff --git a/applications/luci-app-ddns/root/usr/share/luci/menu.d/luci-app-ddns.json b/applications/luci-app-ddns/root/usr/share/luci/menu.d/luci-app-ddns.json index ec6d46f8b..6a7ee9a09 100644 --- a/applications/luci-app-ddns/root/usr/share/luci/menu.d/luci-app-ddns.json +++ b/applications/luci-app-ddns/root/usr/share/luci/menu.d/luci-app-ddns.json @@ -5,6 +5,9 @@ "action": { "type": "view", "path": "ddns/overview" + }, + "depends": { + "acl": [ "luci-app-ddns" ] } } } diff --git a/applications/luci-app-dump1090/root/usr/share/luci/menu.d/luci-app-dump1090.json b/applications/luci-app-dump1090/root/usr/share/luci/menu.d/luci-app-dump1090.json index 4e68dde1c..027a81774 100644 --- a/applications/luci-app-dump1090/root/usr/share/luci/menu.d/luci-app-dump1090.json +++ b/applications/luci-app-dump1090/root/usr/share/luci/menu.d/luci-app-dump1090.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-dump1090" ], "uci": { "dump1090": true } } } diff --git a/applications/luci-app-dynapoint/root/usr/share/luci/menu.d/luci-app-dynapoint.json b/applications/luci-app-dynapoint/root/usr/share/luci/menu.d/luci-app-dynapoint.json index ed19ba682..4b01af734 100644 --- a/applications/luci-app-dynapoint/root/usr/share/luci/menu.d/luci-app-dynapoint.json +++ b/applications/luci-app-dynapoint/root/usr/share/luci/menu.d/luci-app-dynapoint.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-dynapoint" ], "uci": { "dynapoint": true } } } diff --git a/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json b/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json index 35c7c62c4..f8a3553a7 100644 --- a/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json +++ b/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json @@ -7,6 +7,7 @@ "path": "admin/network/firewall/zones" }, "depends": { + "acl": [ "luci-app-firewall" ], "fs": { "/sbin/fw3": "executable" }, "uci": { "firewall": true } } diff --git a/applications/luci-app-frpc/root/usr/share/luci/menu.d/luci-app-frpc.json b/applications/luci-app-frpc/root/usr/share/luci/menu.d/luci-app-frpc.json index 26a0f2b1c..f6eaf4a9b 100644 --- a/applications/luci-app-frpc/root/usr/share/luci/menu.d/luci-app-frpc.json +++ b/applications/luci-app-frpc/root/usr/share/luci/menu.d/luci-app-frpc.json @@ -4,6 +4,9 @@ "action": { "type": "view", "path": "frpc" + }, + "depends": { + "acl": [ "luci-app-frpc" ] } } } diff --git a/applications/luci-app-frps/root/usr/share/luci/menu.d/luci-app-frps.json b/applications/luci-app-frps/root/usr/share/luci/menu.d/luci-app-frps.json index 3b8711451..448cb7a4e 100644 --- a/applications/luci-app-frps/root/usr/share/luci/menu.d/luci-app-frps.json +++ b/applications/luci-app-frps/root/usr/share/luci/menu.d/luci-app-frps.json @@ -4,6 +4,9 @@ "action": { "type": "view", "path": "frps" + }, + "depends": { + "acl": [ "luci-app-frps" ] } } } diff --git a/applications/luci-app-fwknopd/root/usr/share/luci/menu.d/luci-app-fwknopd.json b/applications/luci-app-fwknopd/root/usr/share/luci/menu.d/luci-app-fwknopd.json index 6dd26b9ac..85486b997 100644 --- a/applications/luci-app-fwknopd/root/usr/share/luci/menu.d/luci-app-fwknopd.json +++ b/applications/luci-app-fwknopd/root/usr/share/luci/menu.d/luci-app-fwknopd.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-fwknopd" ], "uci": { "fwknopd": true } } } diff --git a/applications/luci-app-hd-idle/root/usr/share/luci/menu.d/luci-app-hd-idle.json b/applications/luci-app-hd-idle/root/usr/share/luci/menu.d/luci-app-hd-idle.json index 84a6445ba..3d84d19ee 100644 --- a/applications/luci-app-hd-idle/root/usr/share/luci/menu.d/luci-app-hd-idle.json +++ b/applications/luci-app-hd-idle/root/usr/share/luci/menu.d/luci-app-hd-idle.json @@ -8,6 +8,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-hd-idle" ], "uci": { "hd-idle": true } } } diff --git a/applications/luci-app-ksmbd/root/usr/share/luci/menu.d/luci-app-ksmbd.json b/applications/luci-app-ksmbd/root/usr/share/luci/menu.d/luci-app-ksmbd.json index 46202c22e..17677a5de 100644 --- a/applications/luci-app-ksmbd/root/usr/share/luci/menu.d/luci-app-ksmbd.json +++ b/applications/luci-app-ksmbd/root/usr/share/luci/menu.d/luci-app-ksmbd.json @@ -6,6 +6,7 @@ "path": "ksmbd" }, "depends": { + "acl": [ "luci-app-ksmbd" ], "uci": { "ksmbd": true } } } diff --git a/applications/luci-app-minidlna/root/usr/share/luci/menu.d/luci-app-minidlna.json b/applications/luci-app-minidlna/root/usr/share/luci/menu.d/luci-app-minidlna.json index ddb4129b4..7422e4e20 100644 --- a/applications/luci-app-minidlna/root/usr/share/luci/menu.d/luci-app-minidlna.json +++ b/applications/luci-app-minidlna/root/usr/share/luci/menu.d/luci-app-minidlna.json @@ -6,6 +6,7 @@ "path": "minidlna" }, "depends": { + "acl": [ "luci-app-minidlna" ], "uci": { "minidlna": true } } } diff --git a/applications/luci-app-mjpg-streamer/root/usr/share/luci/menu.d/luci-app-mjpg-streamer.json b/applications/luci-app-mjpg-streamer/root/usr/share/luci/menu.d/luci-app-mjpg-streamer.json index 1e7c5e80d..6f79358e4 100644 --- a/applications/luci-app-mjpg-streamer/root/usr/share/luci/menu.d/luci-app-mjpg-streamer.json +++ b/applications/luci-app-mjpg-streamer/root/usr/share/luci/menu.d/luci-app-mjpg-streamer.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-mjpg-streamer" ], "uci": { "mjpg-streamer": true } } } diff --git a/applications/luci-app-mosquitto/root/usr/share/luci/menu.d/luci-app-mosquitto.json b/applications/luci-app-mosquitto/root/usr/share/luci/menu.d/luci-app-mosquitto.json index 37870b379..66f82b882 100644 --- a/applications/luci-app-mosquitto/root/usr/share/luci/menu.d/luci-app-mosquitto.json +++ b/applications/luci-app-mosquitto/root/usr/share/luci/menu.d/luci-app-mosquitto.json @@ -5,6 +5,9 @@ "type": "cbi", "path": "mosquitto", "post": { "cbi.submit": true } + }, + "depends": { + "acl": [ "luci-app-mosquitto" ] } } } diff --git a/applications/luci-app-nextdns/root/usr/share/luci/menu.d/luci-app-nextdns.json b/applications/luci-app-nextdns/root/usr/share/luci/menu.d/luci-app-nextdns.json index 18255ced9..fb9cb7e3f 100644 --- a/applications/luci-app-nextdns/root/usr/share/luci/menu.d/luci-app-nextdns.json +++ b/applications/luci-app-nextdns/root/usr/share/luci/menu.d/luci-app-nextdns.json @@ -6,6 +6,7 @@ "type": "firstchild" }, "depends": { + "acl": [ "luci-app-nextdns" ], "uci": { "nextdns": true } } }, diff --git a/applications/luci-app-noddos/root/usr/share/luci/menu.d/luci-app-noddos.json b/applications/luci-app-noddos/root/usr/share/luci/menu.d/luci-app-noddos.json index 05052f5e0..a2d209e37 100644 --- a/applications/luci-app-noddos/root/usr/share/luci/menu.d/luci-app-noddos.json +++ b/applications/luci-app-noddos/root/usr/share/luci/menu.d/luci-app-noddos.json @@ -5,6 +5,9 @@ "action": { "type": "template", "path": "noddos/clients" + }, + "depends": { + "acl": [ "luci-app-noddos" ] } }, diff --git a/applications/luci-app-ntpc/root/usr/share/luci/menu.d/luci-app-ntpc.json b/applications/luci-app-ntpc/root/usr/share/luci/menu.d/luci-app-ntpc.json index 360d72159..bec35c88c 100644 --- a/applications/luci-app-ntpc/root/usr/share/luci/menu.d/luci-app-ntpc.json +++ b/applications/luci-app-ntpc/root/usr/share/luci/menu.d/luci-app-ntpc.json @@ -8,6 +8,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-ntpc" ], "uci": { "ntpclient": true } } } diff --git a/applications/luci-app-nut/root/usr/share/luci/menu.d/luci-app-nut.json b/applications/luci-app-nut/root/usr/share/luci/menu.d/luci-app-nut.json index f2cd6e785..e19143eb1 100644 --- a/applications/luci-app-nut/root/usr/share/luci/menu.d/luci-app-nut.json +++ b/applications/luci-app-nut/root/usr/share/luci/menu.d/luci-app-nut.json @@ -5,6 +5,7 @@ "type": "firstchild" }, "depends": { + "acl": [ "luci-app-nut" ], "uci": [ { "nut_server": true }, { "nut_monitor": true }, diff --git a/applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json b/applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json index 8632a41b3..3d06a257c 100644 --- a/applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json +++ b/applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json @@ -5,6 +5,9 @@ "action": { "type": "view", "path": "opkg" + }, + "depends": { + "acl": [ "luci-app-opkg" ] } } } diff --git a/applications/luci-app-p910nd/root/usr/share/luci/menu.d/luci-app-p910nd.json b/applications/luci-app-p910nd/root/usr/share/luci/menu.d/luci-app-p910nd.json index 33fcda6e4..4f3cb810c 100644 --- a/applications/luci-app-p910nd/root/usr/share/luci/menu.d/luci-app-p910nd.json +++ b/applications/luci-app-p910nd/root/usr/share/luci/menu.d/luci-app-p910nd.json @@ -8,6 +8,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-p910nd" ], "uci": { "p910nd": true } } } diff --git a/applications/luci-app-polipo/root/usr/share/luci/menu.d/luci-app-polipo.json b/applications/luci-app-polipo/root/usr/share/luci/menu.d/luci-app-polipo.json index 6fea92d28..9779bc0e6 100644 --- a/applications/luci-app-polipo/root/usr/share/luci/menu.d/luci-app-polipo.json +++ b/applications/luci-app-polipo/root/usr/share/luci/menu.d/luci-app-polipo.json @@ -6,6 +6,7 @@ "path": "admin/services/polipo/config" }, "depends": { + "acl": [ "luci-app-polipo" ], "uci": { "polipo": true } } }, diff --git a/applications/luci-app-qos/root/usr/share/luci/menu.d/luci-app-qos.json b/applications/luci-app-qos/root/usr/share/luci/menu.d/luci-app-qos.json index 90ce20de0..07226024c 100644 --- a/applications/luci-app-qos/root/usr/share/luci/menu.d/luci-app-qos.json +++ b/applications/luci-app-qos/root/usr/share/luci/menu.d/luci-app-qos.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-qos" ], "uci": { "qos": true } } } diff --git a/applications/luci-app-rosy-file-server/root/usr/share/luci/menu.d/luci-app-rosy-file-server.json b/applications/luci-app-rosy-file-server/root/usr/share/luci/menu.d/luci-app-rosy-file-server.json index 03e7fd0f4..c0a466576 100644 --- a/applications/luci-app-rosy-file-server/root/usr/share/luci/menu.d/luci-app-rosy-file-server.json +++ b/applications/luci-app-rosy-file-server/root/usr/share/luci/menu.d/luci-app-rosy-file-server.json @@ -8,6 +8,7 @@ "type": "firstchild" }, "depends": { + "acl": [ "luci-app-rosy-file-server" ], "uci": { "rosyfs": true } } }, diff --git a/applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json b/applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json index 2d964285a..b58ab6394 100644 --- a/applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json +++ b/applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-rp-pppoe-server" ], "uci": { "pppoe": true } } } diff --git a/applications/luci-app-samba/root/usr/share/luci/menu.d/luci-app-samba.json b/applications/luci-app-samba/root/usr/share/luci/menu.d/luci-app-samba.json index 27affd4f0..1c38f510b 100644 --- a/applications/luci-app-samba/root/usr/share/luci/menu.d/luci-app-samba.json +++ b/applications/luci-app-samba/root/usr/share/luci/menu.d/luci-app-samba.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-samba" ], "uci": { "samba": true } } } diff --git a/applications/luci-app-samba4/root/usr/share/luci/menu.d/luci-app-samba4.json b/applications/luci-app-samba4/root/usr/share/luci/menu.d/luci-app-samba4.json index 74be4ed11..81897f188 100644 --- a/applications/luci-app-samba4/root/usr/share/luci/menu.d/luci-app-samba4.json +++ b/applications/luci-app-samba4/root/usr/share/luci/menu.d/luci-app-samba4.json @@ -6,6 +6,7 @@ "path": "samba4" }, "depends": { + "acl": [ "luci-app-samba4" ], "uci": { "samba4": true } } } diff --git a/applications/luci-app-ser2net/root/usr/share/luci/menu.d/luci-app-ser2net.json b/applications/luci-app-ser2net/root/usr/share/luci/menu.d/luci-app-ser2net.json index e05a30b93..cb4da0270 100644 --- a/applications/luci-app-ser2net/root/usr/share/luci/menu.d/luci-app-ser2net.json +++ b/applications/luci-app-ser2net/root/usr/share/luci/menu.d/luci-app-ser2net.json @@ -5,6 +5,7 @@ "type": "firstchild" }, "depends": { + "acl": [ "luci-app-ser2net" ], "uci": { "ser2net": true } } }, diff --git a/applications/luci-app-shadowsocks-libev/root/usr/share/luci/menu.d/luci-app-shadowsocks-libev.json b/applications/luci-app-shadowsocks-libev/root/usr/share/luci/menu.d/luci-app-shadowsocks-libev.json index afa8f44e3..aa29113fe 100644 --- a/applications/luci-app-shadowsocks-libev/root/usr/share/luci/menu.d/luci-app-shadowsocks-libev.json +++ b/applications/luci-app-shadowsocks-libev/root/usr/share/luci/menu.d/luci-app-shadowsocks-libev.json @@ -4,6 +4,9 @@ "order": 59, "action": { "type": "firstchild" + }, + "depends": { + "acl": [ "luci-app-shadowsocks-libev" ] } }, diff --git a/applications/luci-app-shairplay/root/usr/share/luci/menu.d/luci-app-shairplay.json b/applications/luci-app-shairplay/root/usr/share/luci/menu.d/luci-app-shairplay.json index fae731945..46cf40d60 100644 --- a/applications/luci-app-shairplay/root/usr/share/luci/menu.d/luci-app-shairplay.json +++ b/applications/luci-app-shairplay/root/usr/share/luci/menu.d/luci-app-shairplay.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-shairplay" ], "uci": { "shairplay": true } } } diff --git a/applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json b/applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json index 09f4a3c0f..e640dbb87 100644 --- a/applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json +++ b/applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-simple-adblock" ], "uci": { "simple-adblock": true } } } diff --git a/applications/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json b/applications/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json index 22d29c9f6..c30f35fa4 100644 --- a/applications/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json +++ b/applications/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json @@ -5,6 +5,9 @@ "type": "cbi", "path": "snmpd", "post": { "cbi.submit": true } + }, + "depends": { + "acl": [ "luci-app-snmpd" ] } } } diff --git a/applications/luci-app-squid/root/usr/share/luci/menu.d/luci-app-squid.json b/applications/luci-app-squid/root/usr/share/luci/menu.d/luci-app-squid.json index b71648b69..15a0d3c4d 100644 --- a/applications/luci-app-squid/root/usr/share/luci/menu.d/luci-app-squid.json +++ b/applications/luci-app-squid/root/usr/share/luci/menu.d/luci-app-squid.json @@ -5,6 +5,9 @@ "type": "cbi", "path": "squid", "post": { "cbi.submit": true } + }, + "depends": { + "acl": [ "luci-app-squid" ] } } } diff --git a/applications/luci-app-statistics/root/usr/share/luci/menu.d/luci-app-statistics.json b/applications/luci-app-statistics/root/usr/share/luci/menu.d/luci-app-statistics.json index 4a14b6954..881021a59 100644 --- a/applications/luci-app-statistics/root/usr/share/luci/menu.d/luci-app-statistics.json +++ b/applications/luci-app-statistics/root/usr/share/luci/menu.d/luci-app-statistics.json @@ -6,6 +6,7 @@ "type": "firstchild" }, "depends": { + "acl": [ "luci-app-openvpn" ], "uci": { "luci_statistics": true } } }, diff --git a/applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json b/applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json index e89c140e3..1d7ea3dc5 100644 --- a/applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json +++ b/applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json @@ -5,6 +5,7 @@ "type": "firstchild" }, "depends": { + "acl": [ "luci-app-tinyproxy" ], "uci": { "tinyproxy": true } } }, diff --git a/applications/luci-app-ttyd/root/usr/share/luci/menu.d/luci-app-ttyd.json b/applications/luci-app-ttyd/root/usr/share/luci/menu.d/luci-app-ttyd.json index cc8b3f146..f76f9cfaa 100644 --- a/applications/luci-app-ttyd/root/usr/share/luci/menu.d/luci-app-ttyd.json +++ b/applications/luci-app-ttyd/root/usr/share/luci/menu.d/luci-app-ttyd.json @@ -5,6 +5,7 @@ "type": "firstchild" }, "depends": { + "acl": [ "luci-app-ttyd" ], "uci": { "ttyd": true } } }, diff --git a/applications/luci-app-udpxy/root/usr/share/luci/menu.d/luci-app-udpxy.json b/applications/luci-app-udpxy/root/usr/share/luci/menu.d/luci-app-udpxy.json index 5f6a5583a..c0171a13f 100644 --- a/applications/luci-app-udpxy/root/usr/share/luci/menu.d/luci-app-udpxy.json +++ b/applications/luci-app-udpxy/root/usr/share/luci/menu.d/luci-app-udpxy.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-udpxy" ], "uci": { "udpxy": true } } } diff --git a/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json b/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json index 44619ad06..db3be6508 100644 --- a/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json +++ b/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json @@ -7,6 +7,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-uhttpd" ], "uci": { "uhttpd": true } } } diff --git a/applications/luci-app-upnp/root/usr/share/luci/menu.d/luci-app-upnp.json b/applications/luci-app-upnp/root/usr/share/luci/menu.d/luci-app-upnp.json index 7fdf67dcc..63a5c592f 100644 --- a/applications/luci-app-upnp/root/usr/share/luci/menu.d/luci-app-upnp.json +++ b/applications/luci-app-upnp/root/usr/share/luci/menu.d/luci-app-upnp.json @@ -6,6 +6,7 @@ "path": "upnp/upnp" }, "depends": { + "acl": [ "luci-app-ddns" ], "uci": { "upnpd": true } } } diff --git a/applications/luci-app-vnstat/root/usr/share/luci/menu.d/luci-app-vnstat.json b/applications/luci-app-vnstat/root/usr/share/luci/menu.d/luci-app-vnstat.json index 5b92e239c..6433bff74 100644 --- a/applications/luci-app-vnstat/root/usr/share/luci/menu.d/luci-app-vnstat.json +++ b/applications/luci-app-vnstat/root/usr/share/luci/menu.d/luci-app-vnstat.json @@ -4,6 +4,9 @@ "order": 90, "action": { "type": "firstchild" + }, + "depends": { + "acl": [ "luci-app-vnstat" ] } }, diff --git a/applications/luci-app-vnstat2/root/usr/share/luci/menu.d/luci-app-vnstat2.json b/applications/luci-app-vnstat2/root/usr/share/luci/menu.d/luci-app-vnstat2.json index 0b3303c36..4aa9dd2aa 100644 --- a/applications/luci-app-vnstat2/root/usr/share/luci/menu.d/luci-app-vnstat2.json +++ b/applications/luci-app-vnstat2/root/usr/share/luci/menu.d/luci-app-vnstat2.json @@ -6,6 +6,7 @@ "type": "firstchild" }, "depends": { + "acl": [ "luci-app-vnstat2" ], "fs": { "/usr/bin/vnstat": "executable", "/usr/bin/vnstati": "executable" diff --git a/applications/luci-app-watchcat/root/usr/share/luci/menu.d/luci-app-watchcat.json b/applications/luci-app-watchcat/root/usr/share/luci/menu.d/luci-app-watchcat.json index d1eba7b43..80f141acd 100644 --- a/applications/luci-app-watchcat/root/usr/share/luci/menu.d/luci-app-watchcat.json +++ b/applications/luci-app-watchcat/root/usr/share/luci/menu.d/luci-app-watchcat.json @@ -8,6 +8,7 @@ "post": { "cbi.submit": true } }, "depends": { + "acl": [ "luci-app-watchcat" ], "uci": { "system": true } } } diff --git a/applications/luci-app-wol/root/usr/share/luci/menu.d/luci-app-wol.json b/applications/luci-app-wol/root/usr/share/luci/menu.d/luci-app-wol.json index ece51325f..1fb8cd7ae 100644 --- a/applications/luci-app-wol/root/usr/share/luci/menu.d/luci-app-wol.json +++ b/applications/luci-app-wol/root/usr/share/luci/menu.d/luci-app-wol.json @@ -5,6 +5,9 @@ "action": { "type": "view", "path": "wol" + }, + "depends": { + "acl": [ "luci-app-wol" ] } } } diff --git a/applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json b/applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json index dbe9331b2..2947461e5 100644 --- a/applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json +++ b/applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json @@ -5,6 +5,7 @@ "type": "firstchild" }, "depends": { + "acl": [ "luci-app-yggdrasil" ], "uci": { "yggdrasil": true } } }, diff --git a/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json b/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json index 670f2c1a4..188c695f3 100644 --- a/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json +++ b/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json @@ -7,6 +7,7 @@ "path": "network/switch" }, "depends": { + "acl": [ "luci-mod-network-config" ], "fs": { "/sbin/swconfig": "executable" }, "uci": { "network": { "@switch": true } } } @@ -20,6 +21,7 @@ "path": "network/wireless" }, "depends": { + "acl": [ "luci-mod-network-config" ], "uci": { "wireless": { "@wifi-device": true } } } }, @@ -38,6 +40,9 @@ "action": { "type": "view", "path": "network/interfaces" + }, + "depends": { + "acl": [ "luci-mod-network-config" ] } }, @@ -49,6 +54,7 @@ "path": "network/dhcp" }, "depends": { + "acl": [ "luci-mod-network-dhcp" ], "uci": { "dhcp": true } } }, @@ -61,6 +67,7 @@ "path": "network/hosts" }, "depends": { + "acl": [ "luci-mod-network-dhcp" ], "uci": { "dhcp": true } } }, @@ -71,6 +78,9 @@ "action": { "type": "view", "path": "network/routes" + }, + "depends": { + "acl": [ "luci-mod-network-config" ] } }, @@ -80,6 +90,9 @@ "action": { "type": "view", "path": "network/diagnostics" + }, + "depends": { + "acl": [ "luci-mod-network-diagnostics" ] } } } diff --git a/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json b/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json index 0dcf6e843..e8eee643d 100644 --- a/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json +++ b/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json @@ -5,6 +5,9 @@ "action": { "type": "template", "path": "admin_status/index" + }, + "depends": { + "acl": [ "luci-mod-status-index" ] } }, @@ -14,6 +17,9 @@ "action": { "type": "view", "path": "status/iptables" + }, + "depends": { + "acl": [ "luci-mod-status-firewall" ] } }, @@ -23,6 +29,9 @@ "action": { "type": "view", "path": "status/routes" + }, + "depends": { + "acl": [ "luci-mod-status-routes" ] } }, @@ -32,6 +41,9 @@ "action": { "type": "view", "path": "status/syslog" + }, + "depends": { + "acl": [ "luci-mod-status-logs" ] } }, @@ -41,6 +53,9 @@ "action": { "type": "view", "path": "status/dmesg" + }, + "depends": { + "acl": [ "luci-mod-status-logs" ] } }, @@ -50,6 +65,9 @@ "action": { "type": "view", "path": "status/processes" + }, + "depends": { + "acl": [ "luci-mod-status-processes" ] } }, @@ -59,6 +77,9 @@ "action": { "type": "alias", "path": "admin/status/realtime/load" + }, + "depends": { + "acl": [ "luci-mod-status-realtime" ] } }, diff --git a/modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json b/modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json index 4a65dec17..90a7001b7 100644 --- a/modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json +++ b/modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json @@ -5,6 +5,9 @@ "action": { "type": "view", "path": "system/system" + }, + "depends": { + "acl": [ "luci-mod-system-config" ] } }, @@ -13,6 +16,9 @@ "order": 2, "action": { "type": "firstchild" + }, + "depends": { + "acl": [ "luci-mod-system-config", "luci-mod-system-ssh" ] } }, @@ -22,6 +28,9 @@ "action": { "type": "view", "path": "system/password" + }, + "depends": { + "acl": [ "luci-mod-system-config" ] } }, @@ -33,6 +42,7 @@ "path": "system/dropbear" }, "depends": { + "acl": [ "luci-mod-system-ssh" ], "uci": { "dropbear": true } } }, @@ -45,6 +55,7 @@ "path": "system/sshkeys" }, "depends": { + "acl": [ "luci-mod-system-ssh" ], "uci": { "dropbear": true } } }, @@ -55,6 +66,9 @@ "action": { "type": "view", "path": "system/startup" + }, + "depends": { + "acl": [ "luci-mod-system-init" ] } }, @@ -64,6 +78,9 @@ "action": { "type": "view", "path": "system/crontab" + }, + "depends": { + "acl": [ "luci-mod-system-cron" ] } }, @@ -75,6 +92,7 @@ "path": "system/mounts" }, "depends": { + "acl": [ "luci-mod-system-mounts" ], "fs": { "/sbin/block": "executable" } } }, @@ -87,6 +105,7 @@ "path": "system/leds" }, "depends": { + "acl": [ "luci-mod-system-config" ], "fs": { "/sys/class/leds": "directory" } } }, @@ -97,6 +116,9 @@ "action": { "type": "view", "path": "system/flash" + }, + "depends": { + "acl": [ "luci-mod-system-flash" ] } }, @@ -106,6 +128,9 @@ "action": { "type": "view", "path": "system/reboot" + }, + "depends": { + "acl": [ "luci-mod-system-reboot" ] } } }