mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 06:07:37 +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

2
spec/util_jsonschema_spec.lua
View file

@ -22,9 +22,7 @@ local skip = {
["dynamicRef.json"] = "NYI", ["dynamicRef.json"] = "NYI",
["enum.json:1:3"] = "deepcompare", ["enum.json:1:3"] = "deepcompare",
["id.json"] = "NYI", ["id.json"] = "NYI",
["maxLength.json:0:4"] = "UTF-16",
["maxProperties.json"] = "NYI", ["maxProperties.json"] = "NYI",
["minLength.json:0:4"] = "UTF-16",
["minProperties.json"] = "NYI", ["minProperties.json"] = "NYI",
["multipleOf.json:1"] = "multiples of IEEE 754 fractions", ["multipleOf.json:1"] = "multiples of IEEE 754 fractions",
["multipleOf.json:2"] = "multiples of IEEE 754 fractions", ["multipleOf.json:2"] = "multiples of IEEE 754 fractions",

11
teal-src/prosody/util/jsonschema.tl
View file

@ -10,6 +10,13 @@
if not math.type then require "prosody.util.mathcompat" end if not math.type then require "prosody.util.mathcompat" 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 json = require "prosody.util.json"
local null = json.null; local null = json.null;
@ -220,10 +227,10 @@ function complex_validate (schema : json_schema_object, data : any, root : json_
-- XXX this is measured in byte, while JSON measures in ... bork -- XXX this is measured in byte, while JSON measures in ... bork
-- TODO use utf8.len? -- TODO use utf8.len?
if data is string then if data is string then
if schema.maxLength and #data > schema.maxLength then if schema.maxLength and utf8_len(data) > schema.maxLength then
return false return false
end end
if schema.minLength and #data < schema.minLength then if schema.minLength and utf8_len(data) < schema.minLength then
return false return false
end end
if schema.luaPattern and not data:match(schema.luaPattern) then if schema.luaPattern and not data:match(schema.luaPattern) then

10
util/jsonschema.lua
View file

@ -3,6 +3,12 @@
local m_type = function(n) local m_type = function(n)
return type(n) == "number" and n % 1 == 0 and n <= 9007199254740992 and n >= -9007199254740992 and "integer" or "float"; return type(n) == "number" and n % 1 == 0 and n <= 9007199254740992 and n >= -9007199254740992 and "integer" or "float";
end; 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 json = require("prosody.util.json")
local null = json.null; local null = json.null;
@ -103,10 +109,10 @@ function complex_validate(schema, data, root)
end end
if type(data) == "string" then 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 return false
end end
if schema.minLength and #data < schema.minLength then if schema.minLength and utf8_len(data) < schema.minLength then
return false return false
end end
if schema.luaPattern and not data:match(schema.luaPattern) then if schema.luaPattern and not data:match(schema.luaPattern) then