diff --git a/package/lean/luci-app-accesscontrol/luasrc/controller/mia.lua b/package/lean/luci-app-accesscontrol/luasrc/controller/mia.lua index 38dc02a264..f57bd83036 100644 --- a/package/lean/luci-app-accesscontrol/luasrc/controller/mia.lua +++ b/package/lean/luci-app-accesscontrol/luasrc/controller/mia.lua @@ -5,7 +5,9 @@ function index() return end - entry({"admin","services","mia"},cbi("mia"),_("Internet Access Schedule Control"),30).dependent=true + local page = entry({"admin","services","mia"},cbi("mia"),_("Internet Access Schedule Control"),30) + page.dependent = true + page.acl_depends = { "luci-app-accesscontrol" } entry({"admin","services","mia","status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua b/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua index bdf7b408d1..35456ad4f6 100644 --- a/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua +++ b/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua @@ -6,8 +6,9 @@ function index() return end - entry({"admin", "services", "adbyby"}, alias("admin", "services", "adbyby", "base"),_("ADBYBY Plus +"), 9).dependent = true - + local page = entry({"admin", "services", "adbyby"}, alias("admin", "services", "adbyby", "base"),_("ADBYBY Plus +"), 9) + page.dependent = true + page.acl_depends = { "luci-app-adbyby" } entry({"admin", "services", "adbyby", "base"}, cbi("adbyby/base"), _("Base Setting"), 10).leaf=true entry({"admin", "services", "adbyby", "advanced"}, cbi("adbyby/advanced"), _("Advance Setting"), 20).leaf=true entry({"admin", "services", "adbyby", "help"}, form("adbyby/help"), _("Plus+ Domain List"), 30).leaf=true diff --git a/package/lean/luci-app-airplay2/luasrc/controller/shairport-sync.lua b/package/lean/luci-app-airplay2/luasrc/controller/shairport-sync.lua index 22d0ffa0eb..281044ba2b 100644 --- a/package/lean/luci-app-airplay2/luasrc/controller/shairport-sync.lua +++ b/package/lean/luci-app-airplay2/luasrc/controller/shairport-sync.lua @@ -8,8 +8,9 @@ function index() return end - entry({"admin", "services", "shairport-sync"}, cbi("shairport-sync"), _("AirPlay 2 Receiver")).dependent = true - + entry({"admin", "services", "shairport-sync"}, cbi("shairport-sync"), _("AirPlay 2 Receiver")) + page.dependent = true + page.acl_depends = { "luci-app-airplay2" } entry({"admin","services","shairport-sync","run"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-amule/luasrc/controller/amule.lua b/package/lean/luci-app-amule/luasrc/controller/amule.lua index 1728c4eaaf..25a90f6049 100644 --- a/package/lean/luci-app-amule/luasrc/controller/amule.lua +++ b/package/lean/luci-app-amule/luasrc/controller/amule.lua @@ -23,6 +23,7 @@ function index() local page = entry({"admin", "nas", "amule"}, cbi("amule"), _("aMule Settings")) page.dependent = true + page.acl_depends = { "luci-app-amule" } entry( {"admin", "nas", "amule", "logview"}, call("logread") ).leaf = true entry( {"admin", "nas", "amule", "status"}, call("get_pid") ).leaf = true entry( {"admin", "nas", "amule", "amulecmd"}, call("amulecmd") ).leaf = true diff --git a/package/lean/luci-app-arpbind/luasrc/controller/arpbind.lua b/package/lean/luci-app-arpbind/luasrc/controller/arpbind.lua index 2358fa50a2..a565ac70cc 100644 --- a/package/lean/luci-app-arpbind/luasrc/controller/arpbind.lua +++ b/package/lean/luci-app-arpbind/luasrc/controller/arpbind.lua @@ -9,5 +9,7 @@ function index() if not nixio.fs.access("/etc/config/arpbind") then return end - entry({"admin", "network", "arpbind"}, cbi("arpbind"), _("IP/MAC Binding"), 45).dependent = true + local page = entry({"admin", "network", "arpbind"}, cbi("arpbind"), _("IP/MAC Binding"), 45) + page.dependent = true + page.acl_depends = { "luci-app-arpbind" } end diff --git a/package/lean/luci-app-autoreboot/luasrc/controller/autoreboot.lua b/package/lean/luci-app-autoreboot/luasrc/controller/autoreboot.lua index e0429f34f6..61d3853c62 100644 --- a/package/lean/luci-app-autoreboot/luasrc/controller/autoreboot.lua +++ b/package/lean/luci-app-autoreboot/luasrc/controller/autoreboot.lua @@ -1,4 +1,4 @@ module("luci.controller.autoreboot",package.seeall) function index() -entry({"admin","system","autoreboot"},cbi("autoreboot"),_("Scheduled Reboot"),88) +entry({"admin","system","autoreboot"},cbi("autoreboot"),_("Scheduled Reboot"),88).acl_depends = { "luci-app-autoreboot" } end diff --git a/package/lean/luci-app-cifs-mount/luasrc/controller/cifs.lua b/package/lean/luci-app-cifs-mount/luasrc/controller/cifs.lua index 5164e1f516..9cd79777b8 100644 --- a/package/lean/luci-app-cifs-mount/luasrc/controller/cifs.lua +++ b/package/lean/luci-app-cifs-mount/luasrc/controller/cifs.lua @@ -10,4 +10,5 @@ function index() page = entry({"admin", "nas", "cifs"}, cbi("cifs"), _("Mount SMB NetShare")) page.dependent = true + page.acl_depends = { "luci-app-cifs-mount" } end diff --git a/package/lean/luci-app-dnsforwarder/luasrc/controller/dnsforwarder.lua b/package/lean/luci-app-dnsforwarder/luasrc/controller/dnsforwarder.lua index a04c8b1f31..427e694301 100644 --- a/package/lean/luci-app-dnsforwarder/luasrc/controller/dnsforwarder.lua +++ b/package/lean/luci-app-dnsforwarder/luasrc/controller/dnsforwarder.lua @@ -3,7 +3,9 @@ function index() if not nixio.fs.access("/etc/config/dnsforwarder") then return end - entry({"admin", "services", "dnsforwarder"},alias("admin", "services", "dnsforwarder","general"),_("Dnsforwarder")).dependent = true + local page = entry({"admin", "services", "dnsforwarder"},alias("admin", "services", "dnsforwarder","general"),_("Dnsforwarder")) + page.dependent = true + page.acl_depends = { "luci-app-dnsforwarder" } entry({"admin", "services", "dnsforwarder","general"}, cbi("dnsforwarder/general"),_("General"),10).leaf = true entry({"admin", "services", "dnsforwarder","log"}, cbi("dnsforwarder/log"),_("LOG"),30).leaf = true diff --git a/package/lean/luci-app-docker/luasrc/controller/docker.lua b/package/lean/luci-app-docker/luasrc/controller/docker.lua index 93b8f6618d..0a50741a57 100644 --- a/package/lean/luci-app-docker/luasrc/controller/docker.lua +++ b/package/lean/luci-app-docker/luasrc/controller/docker.lua @@ -5,7 +5,9 @@ function index() return end - entry({"admin", "services", "docker"}, cbi("docker"), _("Docker CE Container"), 199).dependent = true + local page = entry({"admin", "services", "docker"}, cbi("docker"), _("Docker CE Container"), 199) + page.dependent = true + page.acl_depends = { "luci-app-docker" } entry({"admin","services","docker","status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua b/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua index 92cf489c49..db928e8d87 100644 --- a/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua +++ b/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua @@ -6,8 +6,9 @@ function index() return end - entry({"admin", "services", "familycloud"},firstchild(), _("天翼家庭云/云盘提速"), 80).dependent = false - + local page = entry({"admin", "services", "familycloud"},firstchild(), _("天翼家庭云/云盘提速"), 80) + page.dependent = false + page.acl_depends = { "luci-app-familycloud" } entry({"admin", "services", "familycloud", "general"},cbi("familycloud"), _("Base Setting"), 1) entry({"admin", "services", "familycloud", "log"},form("familycloudlog"), _("Log"), 2) diff --git a/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua b/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua index 986af58085..fea2a03b3f 100644 --- a/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua +++ b/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua @@ -8,5 +8,5 @@ Modify: ayongwifi@126.com www.openwrtdl.com module("luci.controller.filetransfer", package.seeall) function index() - entry({"admin", "system", "filetransfer"}, form("updownload"), _("FileTransfer"),89) + entry({"admin", "system", "filetransfer"}, form("updownload"), _("FileTransfer"),89).acl_depends = { "luci-app-filetransfer" } end diff --git a/package/lean/luci-app-filetransfer/root/usr/share/rpcd/acl.d/luci-app-filetransfer.json b/package/lean/luci-app-filetransfer/root/usr/share/rpcd/acl.d/luci-app-filetransfer.json new file mode 100644 index 0000000000..a8a6bdcd82 --- /dev/null +++ b/package/lean/luci-app-filetransfer/root/usr/share/rpcd/acl.d/luci-app-filetransfer.json @@ -0,0 +1,11 @@ +{ + "luci-app-filetransfer": { + "description": "Grant UCI access for luci-app-filetransfer", + "read": { + "uci": [ "filetransfer" ] + }, + "write": { + "uci": [ "filetransfer" ] + } + } +} diff --git a/package/lean/luci-app-guest-wifi/luasrc/controller/guest-wifi.lua b/package/lean/luci-app-guest-wifi/luasrc/controller/guest-wifi.lua index 41534b0dff..9174143285 100644 --- a/package/lean/luci-app-guest-wifi/luasrc/controller/guest-wifi.lua +++ b/package/lean/luci-app-guest-wifi/luasrc/controller/guest-wifi.lua @@ -4,9 +4,10 @@ function index() if not nixio.fs.access("/etc/config/guest-wifi") then return end - + local page = entry({"admin", "network", "guest-wifi"}, cbi("guest-wifi"), translate("Guest-wifi"), 19) page.i18n = "guest-wifi" page.dependent = true - + page.acl_depends = { "luci-app-guest-wifi" } + end diff --git a/package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua b/package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua index 5549e754b9..b1f5c438b2 100644 --- a/package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua +++ b/package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua @@ -3,5 +3,7 @@ function index() if not nixio.fs.access("/etc/config/haproxy") then return end - entry({"admin", "services", "haproxy"}, cbi("haproxy"), _("HAProxy")).dependent = true + local page = entry({"admin", "services", "haproxy"}, cbi("haproxy"), _("HAProxy")) + page.dependent = true + page.acl_depends = { "luci-app-haproxy-tcp" } end \ No newline at end of file diff --git a/package/lean/luci-app-ipsec-vpnd/luasrc/controller/ipsec-server.lua b/package/lean/luci-app-ipsec-vpnd/luasrc/controller/ipsec-server.lua index 2925194c62..1e7bfb942e 100644 --- a/package/lean/luci-app-ipsec-vpnd/luasrc/controller/ipsec-server.lua +++ b/package/lean/luci-app-ipsec-vpnd/luasrc/controller/ipsec-server.lua @@ -7,7 +7,9 @@ function index() end entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false - entry({"admin", "vpn", "ipsec-server"}, cbi("ipsec-server/ipsec-server"), _("IPSec VPN Server"), 80).dependent=false + entry({"admin", "vpn", "ipsec-server"}, cbi("ipsec-server/ipsec-server"), _("IPSec VPN Server"), 80) + page.dependent = false + page.acl_depends = { "luci-app-ipsec-vpnd" } entry({"admin", "vpn", "ipsec-server","status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua index b8b2347c8f..7522e29fc4 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua @@ -8,7 +8,9 @@ function index() if not nixio.fs.access("/etc/config/kodexplorer") then return end entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false - entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), _("KodExplorer"), 3).dependent = true + local page = entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), _("KodExplorer"), 3) + page.dependent = true + page.acl_depends = { "luci-app-kodexplorer" } entry({"admin", "nas", "kodexplorer", "check"}, call("action_check")).leaf = true entry({"admin", "nas", "kodexplorer", "download"}, call("action_download")).leaf = true diff --git a/package/lean/luci-app-mtwifi/luasrc/controller/mtkwifi.lua b/package/lean/luci-app-mtwifi/luasrc/controller/mtkwifi.lua index 4f66f9b914..ea430b0622 100644 --- a/package/lean/luci-app-mtwifi/luasrc/controller/mtkwifi.lua +++ b/package/lean/luci-app-mtwifi/luasrc/controller/mtkwifi.lua @@ -33,7 +33,7 @@ end function index() - entry({"admin", "network", "wifi"}, template("admin_mtk/mtk_wifi_overview"), _("Wireless"), 25) + entry({"admin", "network", "wifi"}, template("admin_mtk/mtk_wifi_overview"), _("Wireless"), 25).acl_depends = { "luci-app-mtwifi" } entry({"admin", "network", "wifi", "dev_cfg_view"}, template("admin_mtk/mtk_wifi_dev_cfg")).leaf = true entry({"admin", "network", "wifi", "dev_cfg"}, call("dev_cfg")).leaf = true entry({"admin", "network", "wifi", "dev_cfg_reset"}, call("dev_cfg_reset")).leaf = true diff --git a/package/lean/luci-app-mtwifi/root/usr/share/rpcd/acl.d/luci-app-mtwifi.json b/package/lean/luci-app-mtwifi/root/usr/share/rpcd/acl.d/luci-app-mtwifi.json new file mode 100644 index 0000000000..d2a93e7a43 --- /dev/null +++ b/package/lean/luci-app-mtwifi/root/usr/share/rpcd/acl.d/luci-app-mtwifi.json @@ -0,0 +1,11 @@ +{ + "luci-app-mtwifi": { + "description": "Grant UCI access for luci-app-mtwifi", + "read": { + "uci": [ "wifi" ] + }, + "write": { + "uci": [ "wifi" ] + } + } +} diff --git a/package/lean/luci-app-music-remote-center/luasrc/controller/forked-daapd.lua b/package/lean/luci-app-music-remote-center/luasrc/controller/forked-daapd.lua index 744c54e8fd..ba803c5a2e 100644 --- a/package/lean/luci-app-music-remote-center/luasrc/controller/forked-daapd.lua +++ b/package/lean/luci-app-music-remote-center/luasrc/controller/forked-daapd.lua @@ -7,8 +7,9 @@ function index() return end - entry({"admin", "nas", "forked-daapd"}, cbi("forked-daapd"), _("Music Remote Center")).dependent = true - + local page = entry({"admin", "nas", "forked-daapd"}, cbi("forked-daapd"), _("Music Remote Center")) + page.dependent = true + page.acl_depends = { "luci-app-music-remote-center" } entry({"admin","nas","forked-daapd","run"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-mwan3helper/luasrc/controller/mwan3helper.lua b/package/lean/luci-app-mwan3helper/luasrc/controller/mwan3helper.lua index f2068d2284..56cb5e7c3f 100644 --- a/package/lean/luci-app-mwan3helper/luasrc/controller/mwan3helper.lua +++ b/package/lean/luci-app-mwan3helper/luasrc/controller/mwan3helper.lua @@ -9,8 +9,9 @@ function index() end - entry({"admin", "services", "mwan3helper"},alias("admin", "services", "mwan3helper", "client"),_("MWAN3 Helper"), 300).dependent = true - + local page = entry({"admin", "services", "mwan3helper"},alias("admin", "services", "mwan3helper", "client"),_("MWAN3 Helper"), 300) + page.dependent = true + page.acl_depends = { "luci-app-mwan3helper" } entry({"admin", "services", "mwan3helper", "client"},cbi("mwan3helper/client"),_("Settings"), 10).leaf = true entry({"admin", "services", "mwan3helper", "lists"},cbi("mwan3helper/list"),_("IPSet Lists"), 20).leaf = true diff --git a/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua b/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua index b761feec5d..ac69365450 100644 --- a/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua +++ b/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua @@ -16,6 +16,7 @@ function index() local page page = entry({"admin", "vpn", "n2n_v2"}, cbi("n2n_v2"), _("N2N v2 VPN"), 45) page.dependent = true + page..acl_depends = { "luci-app-n2n_v2" } end function n2n_status() diff --git a/package/lean/luci-app-nfs/luasrc/controller/nfs.lua b/package/lean/luci-app-nfs/luasrc/controller/nfs.lua index 9807fb2130..a76db5f701 100644 --- a/package/lean/luci-app-nfs/luasrc/controller/nfs.lua +++ b/package/lean/luci-app-nfs/luasrc/controller/nfs.lua @@ -4,5 +4,7 @@ function index() if not nixio.fs.access("/etc/config/nfs") then return end - entry({"admin", "nas", "nfs"}, cbi("nfs"), _("NFS Manage"), 5).dependent = true + local page = entry({"admin", "nas", "nfs"}, cbi("nfs"), _("NFS Manage"), 5) + page.dependent = true + page.acl_depends = { "luci-app-nfs" } end diff --git a/package/lean/luci-app-nps/luasrc/controller/nps.lua b/package/lean/luci-app-nps/luasrc/controller/nps.lua index 04fb7ced23..1159f3529f 100755 --- a/package/lean/luci-app-nps/luasrc/controller/nps.lua +++ b/package/lean/luci-app-nps/luasrc/controller/nps.lua @@ -7,6 +7,7 @@ local e e=entry({"admin","services","nps"},cbi("nps"),_("Nps Setting"),100) e.i18n="nps" e.dependent=true +e.acl_depends = { "luci-app-nps" } entry({"admin","services","nps","status"},call("status")).leaf=true end function status() diff --git a/package/lean/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua b/package/lean/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua index 3d05765f3f..767a111240 100644 --- a/package/lean/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua +++ b/package/lean/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua @@ -10,7 +10,9 @@ function index() local page - entry({"admin", "vpn", "openvpn-server"}, cbi("openvpn-server/openvpn-server"), _("OpenVPN Server"), 80).dependent=false + page = entry({"admin", "vpn", "openvpn-server"}, cbi("openvpn-server/openvpn-server"), _("OpenVPN Server"), 80) + page.dependent = false + page.acl_depends = { "luci-app-openvpn-server" } entry({"admin", "vpn", "openvpn-server","status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-pppoe-relay/luasrc/controller/pppoe-relay.lua b/package/lean/luci-app-pppoe-relay/luasrc/controller/pppoe-relay.lua index f3a2760e72..15a6482e91 100644 --- a/package/lean/luci-app-pppoe-relay/luasrc/controller/pppoe-relay.lua +++ b/package/lean/luci-app-pppoe-relay/luasrc/controller/pppoe-relay.lua @@ -5,6 +5,8 @@ function index() return end -entry({"admin","services","pppoe-relay"},cbi("pppoe-relay"),_("PPPoE Relay"),90).dependent=true +local page = entry({"admin","services","pppoe-relay"},cbi("pppoe-relay"),_("PPPoE Relay"),90) +page.dependent = true +page.acl_depends = { "luci-app-pppoe-relay" } end \ No newline at end of file diff --git a/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua index 66dc6307a8..43392b8e4f 100644 --- a/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua +++ b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua @@ -9,7 +9,9 @@ entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false local page -entry({"admin", "nas","ps3netsrv"},cbi("ps3netsrv"),_("PS3 NET Server"),40).dependent=true +page = entry({"admin", "nas","ps3netsrv"},cbi("ps3netsrv"),_("PS3 NET Server"),40) +page.dependent=true +page.acl_depends = { "luci-app-ps3netsrv" } entry({"admin", "nas","ps3netsrv","status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua b/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua index 11d169c6c6..ba8377a996 100644 --- a/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua +++ b/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua @@ -4,7 +4,7 @@ function index() if not nixio.fs.access("/etc/config/qbittorrent")then return end - entry({"admin","nas","qBittorrent"},cbi("qbittorrent"),_("qBittorrent")) + entry({"admin","nas","qBittorrent"},cbi("qbittorrent"),_("qBittorrent")).acl_depends = { "luci-app-qBittorrent" } entry({"admin","nas","qBittorrent","status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-ramfree/luasrc/controller/release_ram.lua b/package/lean/luci-app-ramfree/luasrc/controller/release_ram.lua index 17e95ce407..7872351812 100644 --- a/package/lean/luci-app-ramfree/luasrc/controller/release_ram.lua +++ b/package/lean/luci-app-ramfree/luasrc/controller/release_ram.lua @@ -1,7 +1,7 @@ module("luci.controller.release_ram",package.seeall) function index() - entry({"admin","status","release_ram"}, call("release_ram"), _("Release Ram"), 9999) + entry({"admin","status","release_ram"}, call("release_ram"), _("Release Ram"), 9999).acl_depends = { "luci-app-ramfree" } end function release_ram() luci.sys.call("sync && echo 3 > /proc/sys/vm/drop_caches") diff --git a/package/lean/luci-app-ramfree/root/usr/share/rpcd/acl.d/luci-app-ramfree.json b/package/lean/luci-app-ramfree/root/usr/share/rpcd/acl.d/luci-app-ramfree.json new file mode 100644 index 0000000000..f326496e8e --- /dev/null +++ b/package/lean/luci-app-ramfree/root/usr/share/rpcd/acl.d/luci-app-ramfree.json @@ -0,0 +1,11 @@ +{ + "luci-app-ramfree": { + "description": "Free Your Boom", + "read": { + "uci": ["release_ram"] + }, + "write": { + "uci": ["release_ram"] + } + } +} \ No newline at end of file diff --git a/package/lean/luci-app-softethervpn/luasrc/controller/softethervpn.lua b/package/lean/luci-app-softethervpn/luasrc/controller/softethervpn.lua index d4ec9bc88c..73e1ff6a52 100644 --- a/package/lean/luci-app-softethervpn/luasrc/controller/softethervpn.lua +++ b/package/lean/luci-app-softethervpn/luasrc/controller/softethervpn.lua @@ -6,7 +6,9 @@ function index() end entry({"admin","vpn"}, firstchild(), "VPN", 45).dependent = false - entry({"admin","vpn","softethervpn"},cbi("softethervpn"),_("SoftEther VPN"),50).dependent=true + local page = entry({"admin","vpn","softethervpn"},cbi("softethervpn"),_("SoftEther VPN"),50) + page.dependent = true + page.acl_depends = { "luci-app-softethervpn" } entry({"admin","vpn","softethervpn","status"},call("status")).leaf=true end diff --git a/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua b/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua index 281b85de9c..38f3e456a2 100644 --- a/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua +++ b/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua @@ -9,7 +9,9 @@ entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false local page -entry({"admin","vpn","ssrs"},cbi("ssrs"),_("SSR Python Server"),4).dependent=true +page = entry({"admin","vpn","ssrs"},cbi("ssrs"),_("SSR Python Server"),4) +page.dependent=true +page.acl_depends = { "luci-app-ssrserver-python" } entry({"admin","vpn","ssrs","status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-syncdial/luasrc/controller/syncdial.lua b/package/lean/luci-app-syncdial/luasrc/controller/syncdial.lua index 9e6c707688..54e88ea203 100644 --- a/package/lean/luci-app-syncdial/luasrc/controller/syncdial.lua +++ b/package/lean/luci-app-syncdial/luasrc/controller/syncdial.lua @@ -6,6 +6,7 @@ end local e e=entry({"admin","network","syncdial"},cbi("syncdial"),_("多线多拨"),103) e.dependent=true +e.acl_depends = { "luci-app-syncdial" } e=entry({"admin","network","macvlan_redial"},call("redial"),nil) e.leaf=true end diff --git a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua index 3a4c773032..2cadc34249 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua @@ -6,7 +6,9 @@ function index() return end - entry({"admin", "services", "unblockmusic"},firstchild(), _("Unblock Netease Music"), 50).dependent = false + local page = entry({"admin", "services", "unblockmusic"},firstchild(), _("Unblock Netease Music"), 50) + page.dependent = false + page.acl_depends = { "luci-app-unblockmusic" } entry({"admin", "services", "unblockmusic", "general"},cbi("unblockmusic"), _("Base Setting"), 1) entry({"admin", "services", "unblockmusic", "log"},form("unblockmusiclog"), _("Log"), 2) diff --git a/package/lean/luci-app-unblockneteasemusic-go/luasrc/controller/unblockneteasemusic.lua b/package/lean/luci-app-unblockneteasemusic-go/luasrc/controller/unblockneteasemusic.lua index 023e60dca1..b14b8fcd78 100644 --- a/package/lean/luci-app-unblockneteasemusic-go/luasrc/controller/unblockneteasemusic.lua +++ b/package/lean/luci-app-unblockneteasemusic-go/luasrc/controller/unblockneteasemusic.lua @@ -9,7 +9,9 @@ function index() return end - entry({"admin", "services", "unblockneteasemusic"},firstchild(), _("解除云音乐播放限制"), 50).dependent = false + local page = entry({"admin", "services", "unblockneteasemusic"},firstchild(), _("解除云音乐播放限制"), 50) + page.dependent = false + page.acl_depends = { "luci-app-unblockneteasemusic-go" } entry({"admin", "services", "unblockneteasemusic", "general"},cbi("unblockneteasemusic"), _("基本设定"), 1) entry({"admin", "services", "unblockneteasemusic", "senior"},cbi("unblockneteasemusic_senior"), _("高级设定"), 2) diff --git a/package/lean/luci-app-usb-printer/luasrc/controller/usb_printer.lua b/package/lean/luci-app-usb-printer/luasrc/controller/usb_printer.lua index ebcee4f79a..9afc1091ee 100644 --- a/package/lean/luci-app-usb-printer/luasrc/controller/usb_printer.lua +++ b/package/lean/luci-app-usb-printer/luasrc/controller/usb_printer.lua @@ -26,4 +26,5 @@ function index() local page page = entry({"admin", "nas", "usb_printer"}, cbi("usb_printer"), _("USB Printer Server"), 50) + page.acl_depends = { "luci-app-usb-printer" } end diff --git a/package/lean/luci-app-v2ray-server/luasrc/controller/v2ray_server.lua b/package/lean/luci-app-v2ray-server/luasrc/controller/v2ray_server.lua index d2a29ac1c0..b8c9887b1b 100644 --- a/package/lean/luci-app-v2ray-server/luasrc/controller/v2ray_server.lua +++ b/package/lean/luci-app-v2ray-server/luasrc/controller/v2ray_server.lua @@ -5,8 +5,10 @@ local v2ray = require "luci.model.cbi.v2ray_server.api.v2ray" function index() if not nixio.fs.access("/etc/config/v2ray_server") then return end entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false - entry({"admin", "vpn", "v2ray_server"}, cbi("v2ray_server/index"), - _("V2ray Server"), 3).dependent = true + local page = entry({"admin", "vpn", "v2ray_server"}, cbi("v2ray_server/index"), + _("V2ray Server"), 3) + page.dependent = true + page.acl_depends = { "luci-app-v2ray-server" } entry({"admin", "vpn", "v2ray_server", "config"}, cbi("v2ray_server/config")).leaf = true diff --git a/package/lean/luci-app-vlmcsd/luasrc/controller/vlmcsd.lua b/package/lean/luci-app-vlmcsd/luasrc/controller/vlmcsd.lua index f540847cbc..1c78d9b742 100644 --- a/package/lean/luci-app-vlmcsd/luasrc/controller/vlmcsd.lua +++ b/package/lean/luci-app-vlmcsd/luasrc/controller/vlmcsd.lua @@ -8,6 +8,7 @@ function index() page = entry({"admin", "services", "vlmcsd"}, cbi("vlmcsd"), _("KMS Server"), 100) page.i18n = "vlmcsd" page.dependent = true + page.acl_depends = { "luci-app-vlmcsd" } entry({"admin","services","vlmcsd","status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-vsftpd/luasrc/controller/vsftpd.lua b/package/lean/luci-app-vsftpd/luasrc/controller/vsftpd.lua index de44711dc5..b6df3f1bd6 100644 --- a/package/lean/luci-app-vsftpd/luasrc/controller/vsftpd.lua +++ b/package/lean/luci-app-vsftpd/luasrc/controller/vsftpd.lua @@ -24,7 +24,7 @@ function index() entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false entry({"admin", "nas", "vsftpd"}, alias("admin", "nas", "vsftpd", "general"), - _("FTP Server")) + _("FTP Server")).acl_depends = { "luci-app-vsftpd" } entry({"admin", "nas", "vsftpd", "general"}, cbi("vsftpd/general"), diff --git a/package/lean/luci-app-webadmin/luasrc/controller/webadmin.lua b/package/lean/luci-app-webadmin/luasrc/controller/webadmin.lua index 5e3d17d4d3..3ed295f9d8 100644 --- a/package/lean/luci-app-webadmin/luasrc/controller/webadmin.lua +++ b/package/lean/luci-app-webadmin/luasrc/controller/webadmin.lua @@ -12,6 +12,6 @@ function index() page = entry({"admin", "system", "webadmin"}, cbi("webadmin"), _("Web Admin"), 1) page.leaf = true - + page.acl_depends = { "luci-app-webadmin" } end diff --git a/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua b/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua index 25909c846d..d4a957220b 100644 --- a/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua +++ b/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua @@ -1,7 +1,7 @@ module("luci.controller.wrtbwmon", package.seeall) function index() - entry({"admin", "nlbw", "usage"}, alias("admin", "nlbw", "usage", "details"), _("Usage"), 60) + entry({"admin", "nlbw", "usage"}, alias("admin", "nlbw", "usage", "details"), _("Usage"), 60).acl_depends = { "luci-app-wrtbwmon" } entry({"admin", "nlbw", "usage", "details"}, template("wrtbwmon"), _("Details"), 10).leaf=true entry({"admin", "nlbw", "usage", "config"}, cbi("wrtbwmon/config"), _("Configuration"), 20).leaf=true entry({"admin", "nlbw", "usage", "custom"}, form("wrtbwmon/custom"), _("User file"), 30).leaf=true diff --git a/package/lean/luci-app-xlnetacc/luasrc/controller/xlnetacc.lua b/package/lean/luci-app-xlnetacc/luasrc/controller/xlnetacc.lua index ab9d929473..532e07a15f 100644 --- a/package/lean/luci-app-xlnetacc/luasrc/controller/xlnetacc.lua +++ b/package/lean/luci-app-xlnetacc/luasrc/controller/xlnetacc.lua @@ -5,8 +5,10 @@ function index() return end - entry({"admin", "services", "xlnetacc"}, - firstchild(), _("XLNetAcc")).dependent = false + local page = entry({"admin", "services", "xlnetacc"}, + firstchild(), _("XLNetAcc")) + page.dependent = false + page.acl_depends = { "luci-app-xlnetacc" } entry({"admin", "services", "xlnetacc", "general"}, cbi("xlnetacc"), _("Settings"), 1) diff --git a/package/lean/luci-app-zerotier/luasrc/controller/zerotier.lua b/package/lean/luci-app-zerotier/luasrc/controller/zerotier.lua index e02a4f793e..25e7f84402 100644 --- a/package/lean/luci-app-zerotier/luasrc/controller/zerotier.lua +++ b/package/lean/luci-app-zerotier/luasrc/controller/zerotier.lua @@ -7,7 +7,9 @@ end entry({"admin","vpn"}, firstchild(), "VPN", 45).dependent = false -entry({"admin", "vpn", "zerotier"},firstchild(), _("ZeroTier")).dependent = false +local page = entry({"admin", "vpn", "zerotier"},firstchild(), _("ZeroTier")) +page.dependent = false +page.acl_depends = { "luci-app-zerotier" } entry({"admin", "vpn", "zerotier", "general"},cbi("zerotier/settings"), _("Base Setting"), 1) entry({"admin", "vpn", "zerotier", "log"},form("zerotier/info"), _("Interface Info"), 2)