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

applications/luci-firewall: explicitely convert all translation values to strings, otherwhise table.concat() might choke on userdata (#372)

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-02-19 20:22:17 +00:00
parent 08d302727f
commit 62df088b9b
1 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
applications/luci-firewall/luasrc/tools/firewall.lua
View file

@ -20,11 +20,15 @@ local nx = require "nixio"
local translate, translatef = luci.i18n.translate, luci.i18n.translatef local translate, translatef = luci.i18n.translate, luci.i18n.translatef
local function tr(...)
return tostring(translate(...))
end
function fmt_neg(x) function fmt_neg(x)
if type(x) == "string" then if type(x) == "string" then
local v, neg = x:gsub("^ *! *", "") local v, neg = x:gsub("^ *! *", "")
if neg > 0 then if neg > 0 then
return v, "%s " % translate("not") return v, "%s " % tr("not")
else else
return x, "" return x, ""
end end
@ -35,7 +39,7 @@ end
function fmt_mac(x) function fmt_mac(x)
if x and #x > 0 then if x and #x > 0 then
local m, n local m, n
local l = { translate("MAC"), " " } local l = { tr("MAC"), " " }
for m in ut.imatch(x) do for m in ut.imatch(x) do
m, n = fmt_neg(m) m, n = fmt_neg(m)
l[#l+1] = "<var>%s%s</var>" %{ n, m } l[#l+1] = "<var>%s%s</var>" %{ n, m }
@ -44,7 +48,7 @@ function fmt_mac(x)
if #l > 1 then if #l > 1 then
l[#l] = nil l[#l] = nil
if #l > 3 then if #l > 3 then
l[1] = translate("MACs") l[1] = tr("MACs")
end end
return table.concat(l, "") return table.concat(l, "")
end end
@ -54,12 +58,12 @@ end
function fmt_port(x, d) function fmt_port(x, d)
if x and #x > 0 then if x and #x > 0 then
local p, n local p, n
local l = { translate("port"), " " } local l = { tr("port"), " " }
for p in ut.imatch(x) do for p in ut.imatch(x) do
p, n = fmt_neg(p) p, n = fmt_neg(p)
local a, b = p:match("(%d+)%D+(%d+)") local a, b = p:match("(%d+)%D+(%d+)")
if a and b then if a and b then
l[1] = translate("ports") l[1] = tr("ports")
l[#l+1] = "<var>%s%d-%d</var>" %{ n, a, b } l[#l+1] = "<var>%s%d-%d</var>" %{ n, a, b }
else else
l[#l+1] = "<var>%s%d</var>" %{ n, p } l[#l+1] = "<var>%s%d</var>" %{ n, p }
@ -69,7 +73,7 @@ function fmt_port(x, d)
if #l > 1 then if #l > 1 then
l[#l] = nil l[#l] = nil
if #l > 3 then if #l > 3 then
l[1] = translate("ports") l[1] = tr("ports")
end end
return table.concat(l, "") return table.concat(l, "")
end end
@ -79,7 +83,7 @@ end
function fmt_ip(x, d) function fmt_ip(x, d)
if x and #x > 0 then if x and #x > 0 then
local l = { translate("IP"), " " } local l = { tr("IP"), " " }
local v, a, n local v, a, n
for v in ut.imatch(x) do for v in ut.imatch(x) do
v, n = fmt_neg(v) v, n = fmt_neg(v)
@ -87,7 +91,7 @@ function fmt_ip(x, d)
a = a or v a = a or v
a = a:match(":") and ip.IPv6(a, m) or ip.IPv4(a, m) a = a:match(":") and ip.IPv6(a, m) or ip.IPv4(a, m)
if a and (a:is6() and a:prefix() < 128 or a:prefix() < 32) then if a and (a:is6() and a:prefix() < 128 or a:prefix() < 32) then
l[1] = translate("IP range") l[1] = tr("IP range")
l[#l+1] = "<var title='%s - %s'>%s%s</var>" %{ l[#l+1] = "<var title='%s - %s'>%s%s</var>" %{
a:minhost():string(), a:minhost():string(),
a:maxhost():string(), a:maxhost():string(),
@ -104,7 +108,7 @@ function fmt_ip(x, d)
if #l > 1 then if #l > 1 then
l[#l] = nil l[#l] = nil
if #l > 3 then if #l > 3 then
l[1] = translate("IPs") l[1] = tr("IPs")
end end
return table.concat(l, "") return table.concat(l, "")
end end
@ -114,7 +118,7 @@ end
function fmt_zone(x, d) function fmt_zone(x, d)
if x == "*" then if x == "*" then
return "<var>%s</var>" % translate("any zone") return "<var>%s</var>" % tr("any zone")
elseif x and #x > 0 then elseif x and #x > 0 then
return "<var>%s</var>" % x return "<var>%s</var>" % x
elseif d then elseif d then
@ -125,7 +129,7 @@ end
function fmt_icmp_type(x) function fmt_icmp_type(x)
if x and #x > 0 then if x and #x > 0 then
local t, v, n local t, v, n
local l = { translate("type"), " " } local l = { tr("type"), " " }
for v in ut.imatch(x) do for v in ut.imatch(x) do
v, n = fmt_neg(v) v, n = fmt_neg(v)
l[#l+1] = "<var>%s%s</var>" %{ n, v } l[#l+1] = "<var>%s%s</var>" %{ n, v }
@ -134,7 +138,7 @@ function fmt_icmp_type(x)
if #l > 1 then if #l > 1 then
l[#l] = nil l[#l] = nil
if #l > 3 then if #l > 3 then
l[1] = translate("types") l[1] = tr("types")
end end
return table.concat(l, "") return table.concat(l, "")
end end
@ -186,13 +190,13 @@ function fmt_limit(limit, burst)
u = u or "second" u = u or "second"
if l then if l then
if u:match("^s") then if u:match("^s") then
u = translate("second") u = tr("second")
elseif u:match("^m") then elseif u:match("^m") then
u = translate("minute") u = tr("minute")
elseif u:match("^h") then elseif u:match("^h") then
u = translate("hour") u = tr("hour")
elseif u:match("^d") then elseif u:match("^d") then
u = translate("day") u = tr("day")
end end
if burst and burst > 0 then if burst and burst > 0 then
return translatef("<var>%d</var> pkts. per <var>%s</var>, \ return translatef("<var>%d</var> pkts. per <var>%s</var>, \
@ -207,23 +211,23 @@ end
function fmt_target(x, dest) function fmt_target(x, dest)
if dest and #dest > 0 then if dest and #dest > 0 then
if x == "ACCEPT" then if x == "ACCEPT" then
return translate("Accept forward") return tr("Accept forward")
elseif x == "REJECT" then elseif x == "REJECT" then
return translate("Refuse forward") return tr("Refuse forward")
elseif x == "NOTRACK" then elseif x == "NOTRACK" then
return translate("Do not track forward") return tr("Do not track forward")
else --if x == "DROP" then else --if x == "DROP" then
return translate("Discard forward") return tr("Discard forward")
end end
else else
if x == "ACCEPT" then if x == "ACCEPT" then
return translate("Accept input") return tr("Accept input")
elseif x == "REJECT" then elseif x == "REJECT" then
return translate("Refuse input") return tr("Refuse input")
elseif x == "NOTRACK" then elseif x == "NOTRACK" then
return translate("Do not track input") return tr("Do not track input")
else --if x == "DROP" then else --if x == "DROP" then
return translate("Discard input") return tr("Discard input")
end end
end end
end end
@ -234,12 +238,12 @@ function opt_enabled(s, t, ...)
local o = s:option(t, "__enabled") local o = s:option(t, "__enabled")
function o.render(self, section) function o.render(self, section)
if self.map:get(section, "enabled") ~= "0" then if self.map:get(section, "enabled") ~= "0" then
self.title = translate("Rule is enabled") self.title = tr("Rule is enabled")
self.inputtitle = translate("Disable") self.inputtitle = tr("Disable")
self.inputstyle = "reset" self.inputstyle = "reset"
else else
self.title = translate("Rule is disabled") self.title = tr("Rule is disabled")
self.inputtitle = translate("Enable") self.inputtitle = tr("Enable")
self.inputstyle = "apply" self.inputstyle = "apply"
end end
t.render(self, section) t.render(self, section)