summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-banip/root
diff options
context:
space:
mode:
Diffstat (limited to 'applications/luci-app-banip/root')
-rw-r--r--applications/luci-app-banip/root/usr/share/luci/menu.d/luci-app-banip.json46
-rw-r--r--applications/luci-app-banip/root/usr/share/rpcd/acl.d/luci-app-banip.json91
2 files changed, 93 insertions, 44 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 554f6baf8f..6402b04160 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
@@ -7,12 +7,20 @@
"path": "admin/services/banip/overview"
},
"depends": {
- "acl": [ "luci-app-banip" ],
+ "acl": [
+ "luci-app-banip"
+ ],
"fs": {
- "/usr/bin/banip.sh": "executable",
- "/etc/init.d/banip": "executable"
+ "/usr/bin/banip-service.sh": "executable",
+ "/etc/init.d/banip": "executable",
+ "/etc/banip/banip.feeds": "file",
+ "/etc/banip/banip.allowlist": "file",
+ "/etc/banip/banip.blocklist": "file",
+ "/etc/banip/banip.countries": "file"
},
- "uci": { "banip": true }
+ "uci": {
+ "banip": true
+ }
}
},
"admin/services/banip/overview": {
@@ -23,44 +31,44 @@
"path": "banip/overview"
}
},
- "admin/services/banip/ipsetreport": {
- "title": "IPSet Report",
+ "admin/services/banip/allowlist": {
+ "title": "Edit Allowlist",
"order": 20,
"action": {
"type": "view",
- "path": "banip/ipsetreport"
+ "path": "banip/allowlist"
}
},
- "admin/services/banip/blacklist": {
- "title": "Edit Blacklist",
+ "admin/services/banip/blocklist": {
+ "title": "Edit Blocklist",
"order": 30,
"action": {
"type": "view",
- "path": "banip/blacklist"
+ "path": "banip/blocklist"
}
},
- "admin/services/banip/whitelist": {
- "title": "Edit Whitelist",
+ "admin/services/banip/setreport": {
+ "title": "Set Reporting",
"order": 40,
"action": {
"type": "view",
- "path": "banip/whitelist"
+ "path": "banip/setreport"
}
},
- "admin/services/banip/maclist": {
- "title": "Edit Maclist",
+ "admin/services/banip/firewall_log": {
+ "title": "Firewall Log",
"order": 50,
"action": {
"type": "view",
- "path": "banip/maclist"
+ "path": "banip/firewall_log"
}
},
- "admin/services/banip/logread": {
- "title": "Log View",
+ "admin/services/banip/processing_log": {
+ "title": "Processing Log",
"order": 60,
"action": {
"type": "view",
- "path": "banip/logread"
+ "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 d0a616be6e..2a471c9dfc 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,37 +2,78 @@
"luci-app-banip": {
"description": "Grant access to LuCI app banIP",
"write": {
- "uci": [ "banip" ],
+ "uci": [
+ "banip"
+ ],
"file": {
- "/etc/banip/*": [ "read" ],
- "/etc/banip/banip.blacklist": [ "write" ],
- "/etc/banip/banip.whitelist": [ "write" ],
- "/etc/banip/banip.maclist": [ "write" ]
+ "/etc/banip/*": [
+ "read"
+ ],
+ "/etc/banip/banip.allowlist": [
+ "write"
+ ],
+ "/etc/banip/banip.blocklist": [
+ "write"
+ ]
}
},
"read": {
- "cgi-io": [ "exec" ],
+ "cgi-io": [
+ "exec"
+ ],
"file": {
- "/var/run/banip.pid": [ "read" ],
- "/tmp/ban_runtime.json": [ "read" ],
- "/sbin/logread -e banIP-": [ "exec" ],
- "/usr/sbin/logread -e banIP-": [ "exec" ],
- "/usr/sbin/iptables -L": [ "exec" ],
- "/usr/sbin/ip6tables -L": [ "exec" ],
- "/etc/init.d/banip list" : [ "exec" ],
- "/etc/init.d/banip refresh" : [ "exec" ],
- "/etc/init.d/banip reload" : [ "exec" ],
- "/etc/init.d/banip restart" : [ "exec" ],
- "/etc/init.d/banip suspend" : [ "exec" ],
- "/etc/init.d/banip resume" : [ "exec" ],
- "/etc/init.d/banip report gen" : [ "exec" ],
- "/etc/init.d/banip report json" : [ "exec" ],
- "/etc/init.d/banip timer list" : [ "exec" ],
- "/etc/init.d/banip timer remove [0-9]*" : [ "exec" ],
- "/etc/init.d/banip timer add * [0-9]* [0-9*]* [1-7,-*]*" : [ "exec" ],
- "/etc/init.d/banip query *" : [ "exec" ]
+ "/etc/banip/banip.feeds": [
+ "read"
+ ],
+ "/etc/banip/banip.countries": [
+ "read"
+ ],
+ "/var/run/banip.pid": [
+ "read"
+ ],
+ "/var/run/banip_runtime.json": [
+ "read"
+ ],
+ "/sbin/logread -e banIP-": [
+ "exec"
+ ],
+ "/usr/sbin/logread -e banIP-": [
+ "exec"
+ ],
+ "/sbin/logread -e banIP/": [
+ "exec"
+ ],
+ "/usr/sbin/logread -e banIP/": [
+ "exec"
+ ],
+ "/usr/sbin/nft -tj list table inet banIP": [
+ "exec"
+ ],
+ "/etc/init.d/banip stop": [
+ "exec"
+ ],
+ "/etc/init.d/banip reload": [
+ "exec"
+ ],
+ "/etc/init.d/banip restart": [
+ "exec"
+ ],
+ "/etc/init.d/banip report json": [
+ "exec"
+ ],
+ "/etc/init.d/banip search *": [
+ "exec"
+ ],
+ "/etc/init.d/banip survey *": [
+ "exec"
+ ],
+ "/etc/init.d/banip status *": [
+ "exec"
+ ]
},
- "uci": [ "banip" ]
+ "uci": [
+ "banip"
+ ]
}
}
}