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

luci-app-shadowsocks-libev: validate elements of src, dst ip/net list

Browse source 
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou 2017-08-21 21:54:14 +08:00
parent 3809bd6ffb
commit 54c1772ad9
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua
View file

@ -22,6 +22,11 @@ if not sdata then
m:set('ss_rules', 'disabled', true) m:set('ss_rules', 'disabled', true)
end end
function src_dst_option(s, ...)
local o = s:taboption(...)
o.datatype = "or(ip4addr,cidr4)"
end
s = m:section(NamedSection, "ss_rules", "ss_rules") s = m:section(NamedSection, "ss_rules", "ss_rules")
s:tab("general", translate("General Settings")) s:tab("general", translate("General Settings"))
s:tab("srcip", translate("Source Settings")) s:tab("srcip", translate("Source Settings"))
@ -49,13 +54,13 @@ s:taboption('general', Value, "ipt_args",
translate("Extra arguments"), translate("Extra arguments"),
translate("Passes additional arguments to iptables. Use with care!")) translate("Passes additional arguments to iptables. Use with care!"))
s:taboption('srcip', DynamicList, "src_ips_bypass", src_dst_option(s, 'srcip', DynamicList, "src_ips_bypass",
translate("Src ip bypass"), translate("Src ip bypass"),
translate("Bypass redir action for packets with source addresses in this list")) translate("Bypass redir action for packets with source addresses in this list"))
s:taboption('srcip', DynamicList, "src_ips_forward", src_dst_option(s, 'srcip', DynamicList, "src_ips_forward",
translate("Src ip forward"), translate("Src ip forward"),
translate("Go through redir action for packets with source addresses in this list")) translate("Go through redir action for packets with source addresses in this list"))
s:taboption('srcip', DynamicList, "src_ips_checkdst", src_dst_option(s, 'srcip', DynamicList, "src_ips_checkdst",
translate("Src ip checkdst"), translate("Src ip checkdst"),
translate("Continue to have dst address checked for packets with source addresses in this list")) translate("Continue to have dst address checked for packets with source addresses in this list"))
o = s:taboption('srcip', ListValue, "src_default", o = s:taboption('srcip', ListValue, "src_default",
@ -63,10 +68,10 @@ o = s:taboption('srcip', ListValue, "src_default",
translate("Default action for packets whose source addresses do not match any of the source ip list")) translate("Default action for packets whose source addresses do not match any of the source ip list"))
ss.values_actions(o) ss.values_actions(o)
s:taboption('dstip', DynamicList, "dst_ips_bypass", src_dst_option(s, 'dstip', DynamicList, "dst_ips_bypass",
translate("Dst ip bypass"), translate("Dst ip bypass"),
translate("Bypass redir action for packets with destination addresses in this list")) translate("Bypass redir action for packets with destination addresses in this list"))
s:taboption('dstip', DynamicList, "dst_ips_forward", src_dst_option(s, 'dstip', DynamicList, "dst_ips_forward",
translate("Dst ip forward"), translate("Dst ip forward"),
translate("Go through redir action for packets with destination addresses in this list")) translate("Go through redir action for packets with destination addresses in this list"))