2 files changed, 29 insertions, 21 deletions
diff --git a/applications/luci-app-banip/root/usr/share/luci/menu.d/luci-app-banip.json b/applications/luci-app-banip/root/usr/share/luci/menu.d/luci-app-banip.json
index 6402b04160..fbc998df6d 100644
--- a/applications/luci-app-banip/root/usr/share/luci/menu.d/luci-app-banip.json
+++ b/applications/luci-app-banip/root/usr/share/luci/menu.d/luci-app-banip.json
@@ -14,6 +14,7 @@
 				"/usr/bin/banip-service.sh": "executable",
 				"/etc/init.d/banip": "executable",
 				"/etc/banip/banip.feeds": "file",
+				"/etc/banip/banip.custom.feeds": "file",
 				"/etc/banip/banip.allowlist": "file",
 				"/etc/banip/banip.blocklist": "file",
 				"/etc/banip/banip.countries": "file"
@@ -47,9 +48,17 @@
 			"path": "banip/blocklist"
 		}
 	},
+	"admin/services/banip/feeds": {
+		"title": "Edit Custom Feeds",
+		"order": 40,
+		"action": {
+			"type": "view",
+			"path": "banip/feeds"
+		}
+	},
 	"admin/services/banip/setreport": {
 		"title": "Set Reporting",
-		"order": 40,
+		"order": 50,
 		"action": {
 			"type": "view",
 			"path": "banip/setreport"
@@ -57,7 +66,7 @@
 	},
 	"admin/services/banip/firewall_log": {
 		"title": "Firewall Log",
-		"order": 50,
+		"order": 60,
 		"action": {
 			"type": "view",
 			"path": "banip/firewall_log"
@@ -65,7 +74,7 @@
 	},
 	"admin/services/banip/processing_log": {
 		"title": "Processing Log",
-		"order": 60,
+		"order": 70,
 		"action": {
 			"type": "view",
 			"path": "banip/processing_log"
diff --git a/applications/luci-app-banip/root/usr/share/rpcd/acl.d/luci-app-banip.json b/applications/luci-app-banip/root/usr/share/rpcd/acl.d/luci-app-banip.json
index 41f4f42372..41b4b6650b 100644
--- a/applications/luci-app-banip/root/usr/share/rpcd/acl.d/luci-app-banip.json
+++ b/applications/luci-app-banip/root/usr/share/rpcd/acl.d/luci-app-banip.json
@@ -2,36 +2,32 @@
 	"luci-app-banip": {
 		"description": "Grant access to LuCI app banIP",
 		"write": {
-			"uci": [
-				"banip"
-			],
 			"file": {
 				"/etc/banip/*": [
-					"read"
+					"read",
+					"write"
 				],
 				"/etc/banip/banip.allowlist": [
 					"write"
 				],
 				"/etc/banip/banip.blocklist": [
 					"write"
+				],
+				"/etc/banip/banip.custom.feeds": [
+					"read",
+					"write"
 				]
-			}
+			},
+			"uci": [
+				"banip"
+			]
 		},
 		"read": {
 			"cgi-io": [
 				"exec"
 			],
 			"file": {
-				"/etc/banip/banip.feeds": [
-					"read"
-				],
-				"/etc/banip/banip.countries": [
-					"read"
-				],
-				"/var/run/banip.pid": [
-					"read"
-				],
-				"/var/run/banip_runtime.json": [
+				"/var/run/banip.lock": [
 					"read"
 				],
 				"/sbin/logread -e banIP-": [
@@ -61,13 +57,16 @@
 				"/etc/init.d/banip report json": [
 					"exec"
 				],
-				"/etc/init.d/banip search *": [
+				"/etc/init.d/banip search [A-Za-z0-9:.]*": [
+					"exec"
+				],
+				"/etc/init.d/banip survey [A-Za-z0-9]*": [
 					"exec"
 				],
-				"/etc/init.d/banip survey *": [
+				"/etc/init.d/banip status": [
 					"exec"
 				],
-				"/etc/init.d/banip status *": [
+				"/etc/init.d/banip lookup": [
 					"exec"
 				]
 			},