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

util.jsonschema: Fix UTF-8ness of 'minLength' and 'maxLength'

Browse source
This commit is contained in:
Kim Alvefur 2023-04-23 10:42:07 +02:00
parent 3621b8ce91
commit 693ac009db
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/jsonschema.lua
View file

@ -3,6 +3,12 @@
local m_type = function(n)
return type(n) == "number" and n % 1 == 0 and n <= 9007199254740992 and n >= -9007199254740992 and "integer" or "float";
end;
local utf8 = rawget(_G, "utf8") or require("prosody.util.encodings").utf8;
local utf8_len = utf8.len or function(s)
local _, count = s:gsub("[%z\001-\127\194-\253][\128-\191]*", "");
return count
end;
local json = require("prosody.util.json")
local null = json.null;
@ -103,10 +109,10 @@ function complex_validate(schema, data, root)
end
if type(data) == "string" then
if schema.maxLength and #data > schema.maxLength then
if schema.maxLength and utf8_len(data) > schema.maxLength then
return false
end
if schema.minLength and #data < schema.minLength then
if schema.minLength and utf8_len(data) < schema.minLength then
return false
end
if schema.luaPattern and not data:match(schema.luaPattern) then