aboutsummaryrefslogtreecommitdiffstats
path: root/teal-src/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-04-23 10:42:07 +0200
committerKim Alvefur <zash@zash.se>2023-04-23 10:42:07 +0200
commit693ac009db93fd14d15e465f5e11a77485037b09 (patch)
tree397256cf9f511717c4032cbb0e0314bc48a95465 /teal-src/prosody
parent3621b8ce9168d833303bc8090302a77dcd76e1fd (diff)
downloadprosody-693ac009db93fd14d15e465f5e11a77485037b09.tar.gz
prosody-693ac009db93fd14d15e465f5e11a77485037b09.zip
util.jsonschema: Fix UTF-8ness of 'minLength' and 'maxLength'
Diffstat (limited to 'teal-src/prosody')
-rw-r--r--teal-src/prosody/util/jsonschema.tl11
1 files changed, 9 insertions, 2 deletions
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