Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / modules / luci-base / root / usr / share / rpcd / acl.d / luci-base.json

diff --git a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
index 6cbaa3d56d04f99b81b2caa292ce38ea44d139e5..af06d840d06f464f5a59e7f50ee050612d52a390 100644 (file)
--- a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
+++ b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
@@ -1,4 +1,13 @@
 {
+       "unauthenticated": {
+               "description": "Allow system feature probing",
+               "read": {
+                       "ubus": {
+                               "luci": [ "getFeatures" ]
+                       }
+               }
+       },
+
        "uci-access": {
                "description": "Grant uci write access to all configurations",
                "read": {
@@ -11,22 +20,55 @@
        "luci-access": {
                "description": "Grant access to basic LuCI procedures",
                "read": {
+                       "file": {
+                               "/": [ "list" ],
+                               "/*": [ "list" ],
+                               "/etc/crontabs/root": [ "read" ],
+                               "/etc/dropbear/authorized_keys": [ "read" ],
+                               "/etc/filesystems": [ "read" ],
+                               "/etc/rc.local": [ "read" ],
+                               "/proc/filesystems": [ "read" ],
+                               "/proc/sys/kernel/hostname": [ "read" ]
+                       },
                        "ubus": {
-                               "iwinfo": [ "info" ],
-                               "luci": [ "boardjson", "duid_hints", "host_hints", "ifaddrs", "initList", "leases", "leds", "netdevs", "offload_support", "usb" ],
+                               "file": [ "list", "read", "stat" ],
+                               "iwinfo": [ "assoclist", "freqlist", "txpowerlist", "countrylist" ],
+                               "luci": [ "getBoardJSON", "getDUIDHints", "getHostHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getDHCPLeases", "getLEDs", "getNetworkDevices", "getUSBDevices", "getWirelessDevices", "getSwconfigFeatures", "getSwconfigPortState", "getBlockDevices", "getMountPoints" ],
                                "network.device": [ "status" ],
                                "network.interface": [ "dump" ],
-                               "network.wireless": [ "status" ],
+                               "network": [ "get_proto_handlers" ],
                                "uci": [ "changes", "get" ]
                        },
                        "uci": [ "*" ]
                },
                "write": {
+                       "cgi-io": [ "upload", "/etc/luci-uploads/*" ],
+                       "file": {
+                               "/etc/crontabs/root": [ "write" ],
+                               "/etc/dropbear/authorized_keys": [ "write" ],
+                               "/etc/luci-uploads/*": [ "write" ],
+                               "/etc/rc.local": [ "write" ],
+                               "/sbin/block": [ "exec" ]
+                       },
                        "ubus": {
-                               "luci": [ "initCall", "localtime", "timezone" ],
-                               "uci": [ "add", "apply", "confirm", "delete", "order", "set" ]
+                               "file": [ "write", "remove", "exec" ],
+                               "iwinfo": [ "scan" ],
+                               "luci": [ "setInitAction", "setLocaltime", "setPassword", "setBlockDetect", "setUmount" ],
+                               "uci": [ "add", "apply", "confirm", "delete", "order", "set", "rename" ]
                        },
                        "uci": [ "*" ]
                }
+       },
+       "luci-app-firewall": {
+               "description": "Grant access to firewall procedures",
+               "read": {
+                       "ubus": {
+                               "luci": [ "getConntrackHelpers" ]
+                       },
+                       "uci": [ "firewall" ]
+               },
+               "write": {
+                       "uci": [ "firewall" ]
+               }
        }
 }