Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-mwan3: unify map, section and option variable handling in ruleconfig

Browse source 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2020-08-04 15:41:27 +02:00
parent d8c1366d97
commit c4af30db46
1 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua
View file

@ -5,8 +5,7 @@
local dsp = require "luci.dispatcher" local dsp = require "luci.dispatcher"
local util = require("luci.util") local util = require("luci.util")
local m, mwan_rule, src_ip, src_port, dest_ip, dest_port, proto, sticky local m, s, o
local timeout, ipset, logging, policy
arg[1] = arg[1] or "" arg[1] = arg[1] or ""
@ -15,62 +14,62 @@ local ipsets = util.split(util.trim(util.exec("ipset -n -L 2>/dev/null | grep -v
m = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1])) m = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1]))
m.redirect = dsp.build_url("admin", "network", "mwan", "rule") m.redirect = dsp.build_url("admin", "network", "mwan", "rule")
mwan_rule = m:section(NamedSection, arg[1], "rule", "") s = m:section(NamedSection, arg[1], "rule", "")
mwan_rule.addremove = false s.addremove = false
mwan_rule.dynamic = false s.dynamic = false
src_ip = mwan_rule:option(Value, "src_ip", translate("Source address"), o = s:option(Value, "src_ip", translate("Source address"),
translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes")) translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes"))
src_ip.datatype = ipaddr o.datatype = ipaddr
src_port = mwan_rule:option(Value, "src_port", translate("Source port"), o = s:option(Value, "src_port", translate("Source port"),
translate("May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or as a portrange (eg \"1024:2048\") without quotes")) translate("May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or as a portrange (eg \"1024:2048\") without quotes"))
dest_ip = mwan_rule:option(Value, "dest_ip", translate("Destination address"), o = s:option(Value, "dest_ip", translate("Destination address"),
translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes")) translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes"))
dest_ip.datatype = ipaddr o.datatype = ipaddr
dest_port = mwan_rule:option(Value, "dest_port", translate("Destination port"), o = s:option(Value, "dest_port", translate("Destination port"),
translate("May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or as a portrange (eg \"1024:2048\") without quotes")) translate("May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or as a portrange (eg \"1024:2048\") without quotes"))
proto = mwan_rule:option(Value, "proto", translate("Protocol"), o = s:option(Value, "proto", translate("Protocol"),
translate("View the content of /etc/protocols for protocol description")) translate("View the content of /etc/protocols for protocol description"))
proto.default = "all" o.default = "all"
proto.rmempty = false o.rmempty = false
proto:value("all") o:value("all")
proto:value("tcp") o:value("tcp")
proto:value("udp") o:value("udp")
proto:value("icmp") o:value("icmp")
proto:value("esp") o:value("esp")
sticky = mwan_rule:option(ListValue, "sticky", translate("Sticky"), o = s:option(ListValue, "sticky", translate("Sticky"),
translate("Traffic from the same source IP address that previously matched this rule within the sticky timeout period will use the same WAN interface")) translate("Traffic from the same source IP address that previously matched this rule within the sticky timeout period will use the same WAN interface"))
sticky.default = "0" o.default = "0"
sticky:value("1", translate("Yes")) o:value("1", translate("Yes"))
sticky:value("0", translate("No")) o:value("0", translate("No"))
timeout = mwan_rule:option(Value, "timeout", translate("Sticky timeout"), o = s:option(Value, "timeout", translate("Sticky timeout"),
translate("Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set")) translate("Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set"))
timeout.datatype = "range(1, 1000000)" o.datatype = "range(1, 1000000)"
ipset = mwan_rule:option(Value, "ipset", translate("IPset"), o = s:option(Value, "ipset", translate("IPset"),
translate("Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/youtube.com/youtube\")")) translate("Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/youtube.com/youtube\")"))
ipset:value("", translate("-- Please choose --")) o:value("", translate("-- Please choose --"))
for _, z in ipairs(ipsets) do for _, z in ipairs(ipsets) do
ipset:value(z) o:value(z)
end end
logging = mwan_rule:option(Flag, "logging", translate("Logging"), o = s:option(Flag, "logging", translate("Logging"),
translate("Enables firewall rule logging (global mwan3 logging must also be enabled)")) translate("Enables firewall rule logging (global mwan3 logging must also be enabled)"))
policy = mwan_rule:option(Value, "use_policy", translate("Policy assigned")) o = s:option(Value, "use_policy", translate("Policy assigned"))
m.uci:foreach("mwan3", "policy", m.uci:foreach("mwan3", "policy",
function(s) function(s)
policy:value(s['.name'], s['.name']) o:value(s['.name'], s['.name'])
end end
) )
policy:value("unreachable", translate("unreachable (reject)")) o:value("unreachable", translate("unreachable (reject)"))
policy:value("blackhole", translate("blackhole (drop)")) o:value("blackhole", translate("blackhole (drop)"))
policy:value("default", translate("default (use main routing table)")) o:value("default", translate("default (use main routing table)"))
return m return m