diff --git a/luci-base/root/usr/share/rpcd/acl.d/luci-base.json b/luci-base/root/usr/share/rpcd/acl.d/luci-base.json index de145ce78..5ffcbdc2e 100644 --- a/luci-base/root/usr/share/rpcd/acl.d/luci-base.json +++ b/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": { @@ -13,17 +22,18 @@ "read": { "ubus": { "iwinfo": [ "info" ], - "luci": [ "boardjson", "duid_hints", "host_hints", "ifaddrs", "initList", "getLocaltime", "leases", "leds", "netdevs", "usb" ], + "luci": [ "getBoardJSON", "getDUIDHints", "getHostHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getDHCPLeases", "getLEDs", "getNetworkDevices", "getUSBDevices" ], "network.device": [ "status" ], "network.interface": [ "dump" ], "network.wireless": [ "status" ], + "network": [ "get_proto_handlers" ], "uci": [ "changes", "get" ] }, "uci": [ "*" ] }, "write": { "ubus": { - "luci": [ "initCall", "setLocaltime", "timezone" ], + "luci": [ "setInitAction", "setLocaltime" ], "uci": [ "add", "apply", "confirm", "delete", "order", "set" ] }, "uci": [ "*" ] @@ -33,7 +43,7 @@ "description": "Grant access to firewall procedures", "read": { "ubus": { - "luci": [ "conntrack_helpers", "offload_support" ] + "luci": [ "getConntrackHelpers" ] }, "uci": [ "firewall" ] }, diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index 24ae09f64..e8ad28208 100644 --- a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -7,17 +7,19 @@ var callHostHints, callDUIDHints, callDHCPLeases, CBILeaseStatus; callHostHints = rpc.declare({ object: 'luci', - method: 'host_hints' + method: 'getHostHints', + expect: { '': {} } }); callDUIDHints = rpc.declare({ object: 'luci', - method: 'duid_hints' + method: 'getDUIDHints', + expect: { '': {} } }); callDHCPLeases = rpc.declare({ object: 'luci', - method: 'leases', + method: 'getDHCPLeases', params: [ 'family' ], expect: { dhcp_leases: [] } }); @@ -57,7 +59,6 @@ return L.view.extend({ m, s, o, ss, so; m = new form.Map('dhcp', _('DHCP and DNS'), _('Dnsmasq is a combined DHCP-Server and DNS-Forwarder for NAT firewalls')); - m.tabbed = true; s = m.section(form.TypedSection, 'dnsmasq', _('Server Settings')); s.anonymous = true; diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js b/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js index 2a49b0481..3cdea8adb 100644 --- a/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js +++ b/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js @@ -5,7 +5,8 @@ return L.view.extend({ callHostHints: rpc.declare({ object: 'luci', - method: 'host_hints' + method: 'getHostHints', + expect: { '': {} } }), load: function() {