Merge pull request #49 from supertcy/master

luci access fix

Makefile

@@ -102,6 +102,8 @@ define Package/openwrt-dist-luci/install
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(2).*.lmo $(1)/usr/lib/lua/luci/i18n/
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi
 	$(INSTALL_DATA) ./files/luci/model/cbi/$(2).lua $(1)/usr/lib/lua/luci/model/cbi/
+	$(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d
+	$(INSTALL_DATA) ./files/usr/share/rpcd/acl.d/luci-$(2).json $(1)/usr/share/rpcd/acl.d/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/luci-$(2) $(1)/etc/uci-defaults/luci-$(2)
 endef

files/luci/controller/chinadns.lua

@@ -9,5 +9,9 @@ function index()
 		return
 	end
 
-	entry({"admin", "services", "chinadns"}, cbi("chinadns"), _("ChinaDNS"), 70).dependent = true
+	page = entry({"admin", "services", "chinadns"},
+		cbi("chinadns"),
+		_("ChinaDNS"), 70)
+	page.dependent = true
+	page.acl_depends = { "luci-app-chinadns" }
 end

files/usr/share/rpcd/acl.d/luci-chinadns.json

@@ -0,0 +1,11 @@
+{
+	"luci-app-chinadns": {
+		"description": "Grant access to LuCI ChinaDNS",
+		"read": {
+			"uci": [ "chinadns" ]
+		},
+		"write": {
+			"uci": [ "chinadns" ]
+		}
+	}
+}

files/usr/share/rpcd/acl.d/luci-dns-forwarder.json

@@ -0,0 +1,11 @@
+{
+	"luci-app-dns-forwarder": {
+		"description": "Grant access to LuCI DNS-Forwarder",
+		"read": {
+			"uci": [ "dns-forwarder" ]
+		},
+		"write": {
+			"uci": [ "dns-forwarder" ]
+		}
+	}
+}

files/usr/share/rpcd/acl.d/luci-redsocks2.json

@@ -0,0 +1,11 @@
+{
+	"luci-app-redsocks2": {
+		"description": "Grant access to LuCI RedSocks2",
+		"read": {
+			"uci": [ "redsocks2" ]
+		},
+		"write": {
+			"uci": [ "redsocks2" ]
+		}
+	}
+}

files/usr/share/rpcd/acl.d/luci-shadowvpn.json

@@ -0,0 +1,11 @@
+{
+	"luci-app-shadowvpn": {
+		"description": "Grant access to LuCI ShadowVPN",
+		"read": {
+			"uci": [ "shadowvpn" ]
+		},
+		"write": {
+			"uci": [ "shadowvpn" ]
+		}
+	}
+}