diff options
Diffstat (limited to 'applications/luci-splash/root')
| -rwxr-xr-x | applications/luci-splash/root/etc/init.d/luci_splash | 35 | ||||
| -rwxr-xr-x | applications/luci-splash/root/usr/sbin/luci-splash | 118 |
2 files changed, 89 insertions, 64 deletions
diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-splash/root/etc/init.d/luci_splash index 31ffb783a..ffcd6f883 100755 --- a/applications/luci-splash/root/etc/init.d/luci_splash +++ b/applications/luci-splash/root/etc/init.d/luci_splash @@ -35,14 +35,24 @@ blacklist_add() { local cfg="$1" config_get mac "$cfg" mac - [ -n "$mac" ] && iptables -t nat -I luci_splash_leases -m mac --mac-source "$mac" -j DROP + [ -n "$mac" ] && { + iptables -I luci_splash_counter -m mac --mac-source "$mac" -j RETURN + iptables -t nat -I luci_splash_leases -m mac --mac-source "$mac" -j DROP + } } whitelist_add() { local cfg="$1" config_get mac "$cfg" mac - [ -n "$mac" ] && iptables -t nat -I luci_splash_leases -m mac --mac-source "$mac" -j RETURN + config_get ban "$cfg" kicked + + ban=${ban:+DROP} + + [ -n "$mac" ] && { + iptables -I luci_splash_counter -m mac --mac-source "$mac" -j RETURN + iptables -t nat -I luci_splash_leases -m mac --mac-source "$mac" -j "${ban:-RETURN}" + } } boot() { @@ -72,28 +82,31 @@ start() { include /lib/network scan_interfaces config_load luci_splash - + ### Create subchains + iptables -N luci_splash_counter iptables -t nat -N luci_splash_portal iptables -t nat -N luci_splash_leases iptables -t nat -N luci_splash_prerouting - + ### Build the main and portal rule config_foreach blacklist_add blacklist config_foreach whitelist_add whitelist config_foreach whitelist_add lease config_foreach iface_add iface - + ### Build the portal rule + iptables -I INPUT -j luci_splash_counter + iptables -I FORWARD -j luci_splash_counter iptables -t nat -A luci_splash_portal -p udp --dport 33434:33523 -j RETURN iptables -t nat -A luci_splash_portal -p icmp -j RETURN iptables -t nat -A luci_splash_portal -p udp --dport 53 -j RETURN iptables -t nat -A luci_splash_portal -j luci_splash_leases - + ### Build the leases rule iptables -t nat -A luci_splash_leases -p tcp --dport 80 -j REDIRECT --to-ports 8082 iptables -t nat -A luci_splash_leases -j DROP - + ### Add crontab entry test -f /etc/crontabs/root || touch /etc/crontabs/root grep -q luci-splash /etc/crontabs/root || { @@ -105,16 +118,20 @@ stop() { ### Clear interface rules config_load luci_splash config_foreach iface_del iface - + iptables -D INPUT -j luci_splash_counter + iptables -D FORWARD -j luci_splash_counter + ### Clear subchains iptables -t nat -F luci_splash_leases iptables -t nat -F luci_splash_portal iptables -t nat -F luci_splash_prerouting - + iptables -F luci_splash_counter + ### Delete subchains iptables -t nat -X luci_splash_leases iptables -t nat -X luci_splash_portal iptables -t nat -X luci_splash_prerouting + iptables -X luci_splash_counter sed -ie '/\/usr\/sbin\/luci-splash sync/d' /var/spool/cron/crontabs/root } diff --git a/applications/luci-splash/root/usr/sbin/luci-splash b/applications/luci-splash/root/usr/sbin/luci-splash index 82662c871..d12b9f3a3 100755 --- a/applications/luci-splash/root/usr/sbin/luci-splash +++ b/applications/luci-splash/root/usr/sbin/luci-splash @@ -1,39 +1,35 @@ #!/usr/bin/lua -require("luci.http") require("luci.util") require("luci.model.uci") +require("luci.sys.iptparser") -- Init state session local uci = luci.model.uci.cursor_state() +local ipt = luci.sys.iptparser.IptParser() function main(argv) local cmd = argv[1] local arg = argv[2] - if cmd == "status" then - if not arg then - os.exit(1) - end - - if iswhitelisted(arg) then + if cmd == "status" and arg then + if islisted("whitelist", arg) then print("whitelisted") - os.exit(0) + elseif islisted("blacklist", arg) then + print("blacklisted") + else + local lease = haslease(arg) + if lease and lease.kicked then + print("kicked") + elseif lease then + print("lease") + else + print("unknown") + end end - - if haslease(arg) then - print("lease") - os.exit(0) - end - - print("unknown") os.exit(0) - elseif cmd == "add" then - if not arg then - os.exit(1) - end - + elseif cmd == "add" and arg then if not haslease(arg) then add_lease(arg) else @@ -41,11 +37,7 @@ function main(argv) os.exit(2) end os.exit(0) - elseif cmd == "remove" then - if not arg then - os.exit(1) - end - + elseif cmd == "remove" and arg then remove_lease(arg) os.exit(0) elseif cmd == "sync" then @@ -72,19 +64,10 @@ end -- Remove a lease from state and invoke remove_rule function remove_lease(mac) mac = mac:lower() - local del = {} + remove_rule(mac) - uci:foreach("luci_splash", "lease", - function (section) - if section.mac:lower() == mac then - table.insert(del, section[".name"]) - end - end) - - for i,j in ipairs(del) do - remove_rule(j) - uci:delete("luci_splash", j) - end + uci:delete_all("luci_splash", "lease", + function(s) return ( s.mac:lower() == mac ) end) uci:save("luci_splash") end @@ -92,54 +75,76 @@ end -- Add an iptables rule function add_rule(mac) + os.execute("iptables -I luci_splash_counter -m mac --mac-source '"..mac.."'") return os.execute("iptables -t nat -I luci_splash_leases -m mac --mac-source '"..mac.."' -j RETURN") end -- Remove an iptables rule function remove_rule(mac) - return os.execute("iptables -t nat -D luci_splash_leases -m mac --mac-source '"..mac.."' -j RETURN") + for _, r in ipairs(ipt:find({table="filter", chain="luci_splash_counter"})) do + if r.options and #r.options >= 2 and r.options[1] == "MAC" and + r.options[2]:lower() == mac:lower() + then + os.execute("iptables -D luci_splash_counter -m mac --mac-source %q -j %s" + %{ mac, r.target }) + end + end + + for _, r in ipairs(ipt:find({table="nat", chain="luci_splash_leases"})) do + if r.options and #r.options >= 2 and r.options[1] == "MAC" and + r.options[2]:lower() == mac:lower() + then + os.execute("iptables -t nat -D luci_splash_leases -m mac --mac-source %q -j %s" + %{ mac, r.target }) + end + end + + ipt:resync() end -- Check whether a MAC-Address is listed in the lease state list function haslease(mac) mac = mac:lower() - local stat = false - + local lease = nil + uci:foreach("luci_splash", "lease", function (section) if section.mac:lower() == mac then - stat = true - return + lease = section end end) - - return stat + + return lease end --- Check whether a MAC-Address is whitelisted -function iswhitelisted(mac) +-- Check whether a MAC-Address is in given list +function islisted(what, mac) mac = mac:lower() - - uci:foreach("luci_splash", "whitelist", + + uci:foreach("luci_splash", what, function (section) if section.mac:lower() == mac then stat = true return end end) - + return false end -- Returns a list of MAC-Addresses for which a rule is existing function listrules() - local cmd = "iptables -t nat -L luci_splash_leases | grep RETURN |" - cmd = cmd .. "egrep -io [0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+" - return luci.util.split(luci.util.exec(cmd)) + local macs = { } + for i, r in ipairs(ipt:find({table="nat", chain="luci_splash_leases"})) do + if r.options and #r.options >= 2 and r.options[1] == "MAC" then + macs[r.options[2]:lower()] = true + end + end + return luci.util.keys(macs) end @@ -168,11 +173,14 @@ function sync() else -- Rewrite state uci:section("luci_splash", "lease", nil, { - mac = v.mac, - start = v.start + mac = v.mac, + start = v.start, + kicked = v.kicked }) written[v.mac:lower()] = 1 end + elseif v[".type"] == "whitelist" or v[".type"] == "blacklist" then + written[v.mac:lower()] = 1 end end @@ -187,4 +195,4 @@ function sync() uci:save("luci_splash") end -main(arg)
\ No newline at end of file +main(arg) |