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

applications/luci-firewall: fix datatype validation for masq src/dest; allow list of negated ucinames, hostnames, ip-ranges or -addresses

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-01-07 21:55:52 +00:00
parent c043db6518
commit e4dc649e82
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
View file

@ -2,6 +2,7 @@
LuCI - Lua Configuration Interface LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -136,7 +137,7 @@ msrc = s:taboption("advanced", DynamicList, "masq_src",
translate("Restrict Masquerading to given source subnets")) translate("Restrict Masquerading to given source subnets"))
msrc.optional = true msrc.optional = true
msrc.datatype = "neg_network_ip4addr" msrc.datatype = "list(neg,network)"
msrc.placeholder = "0.0.0.0/0" msrc.placeholder = "0.0.0.0/0"
msrc:depends("family", "") msrc:depends("family", "")
msrc:depends("family", "ipv4") msrc:depends("family", "ipv4")
@ -145,7 +146,7 @@ mdest = s:taboption("advanced", DynamicList, "masq_dest",
translate("Restrict Masquerading to given destination subnets")) translate("Restrict Masquerading to given destination subnets"))
mdest.optional = true mdest.optional = true
mdest.datatype = "neg_network_ip4addr" mdest.datatype = "list(neg,network)"
mdest.placeholder = "0.0.0.0/0" mdest.placeholder = "0.0.0.0/0"
mdest:depends("family", "") mdest:depends("family", "")
mdest:depends("family", "ipv4") mdest:depends("family", "ipv4")