mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.dataforms: Add support for validating (integer) ranges

Browse source
This commit is contained in:
Kim Alvefur 2019-11-21 18:56:43 +01:00
parent 1f15950510
commit bc20052a9b
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spec/util_dataforms_spec.lua
View file

@ -423,6 +423,8 @@ describe("util.dataforms", function ()
name = "number",
type = "text-single",
datatype = "xs:integer",
range_min = -10,
range_max = 10,
},
};
@ -437,6 +439,13 @@ describe("util.dataforms", function ()
assert.table(e);
assert.string(e.number);
end);
it("works", function ()
local d,e = f:data(f:form({number = 100}));
assert.not_equal(100, d.number);
assert.table(e);
assert.string(e.number);
end);
end);
describe("media element", function ()
it("produced media element correctly", function ()

14
util/dataforms.lua
View file

@ -10,6 +10,7 @@ local setmetatable = setmetatable;
local ipairs = ipairs;
local type, next = type, next;
local tonumber = tonumber;
local tostring = tostring;
local t_concat = table.concat;
local st = require "util.stanza";
local jid_prep = require "util.jid".prep;
@ -54,6 +55,12 @@ function form_t.form(layout, data, formtype)
if formtype == "form" and field.datatype then
form:tag("validate", { xmlns = xmlns_validate, datatype = field.datatype });
if field.range_min or field.range_max then
form:tag("range", {
min = field.range_min and tostring(field.range_min),
max = field.range_max and tostring(field.range_max),
}):up();
end
-- <basic/> assumed
form:up();
end
@ -290,13 +297,18 @@ field_readers["hidden"] =
end
data_validators["xs:integer"] =
function (data)
function (data, field)
local n = tonumber(data);
if not n then
return false, "not a number";
elseif n % 1 ~= 0 then
return false, "not an integer";
end
if field.range_max and n > field.range_max then
return false, "out of bounds";
elseif field.range_min and n < field.range_min then
return false, "out of bounds";
end
return true, n;
end