diff options
| author | Kim Alvefur <zash@zash.se> | 2023-04-23 10:42:07 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2023-04-23 10:42:07 +0200 |
| commit | 693ac009db93fd14d15e465f5e11a77485037b09 (patch) | |
| tree | 397256cf9f511717c4032cbb0e0314bc48a95465 | |
| parent | 3621b8ce9168d833303bc8090302a77dcd76e1fd (diff) | |
| download | prosody-693ac009db93fd14d15e465f5e11a77485037b09.tar.gz prosody-693ac009db93fd14d15e465f5e11a77485037b09.zip | |
util.jsonschema: Fix UTF-8ness of 'minLength' and 'maxLength'
| -rw-r--r-- | spec/util_jsonschema_spec.lua | 2 | ||||
| -rw-r--r-- | teal-src/prosody/util/jsonschema.tl | 11 | ||||
| -rw-r--r-- | util/jsonschema.lua | 10 |
3 files changed, 17 insertions, 6 deletions
diff --git a/spec/util_jsonschema_spec.lua b/spec/util_jsonschema_spec.lua index fa1afeca..0bc37f83 100644 --- a/spec/util_jsonschema_spec.lua +++ b/spec/util_jsonschema_spec.lua @@ -22,9 +22,7 @@ local skip = { ["dynamicRef.json"] = "NYI", ["enum.json:1:3"] = "deepcompare", ["id.json"] = "NYI", - ["maxLength.json:0:4"] = "UTF-16", ["maxProperties.json"] = "NYI", - ["minLength.json:0:4"] = "UTF-16", ["minProperties.json"] = "NYI", ["multipleOf.json:1"] = "multiples of IEEE 754 fractions", ["multipleOf.json:2"] = "multiples of IEEE 754 fractions", diff --git a/teal-src/prosody/util/jsonschema.tl b/teal-src/prosody/util/jsonschema.tl index e47b859c..a1dd3cae 100644 --- a/teal-src/prosody/util/jsonschema.tl +++ b/teal-src/prosody/util/jsonschema.tl @@ -10,6 +10,13 @@ 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 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 -- TODO use utf8.len? 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 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 diff --git a/util/jsonschema.lua b/util/jsonschema.lua index 51ad506f..c67fb744 100644 --- a/util/jsonschema.lua +++ b/util/jsonschema.lua @@ -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 |