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

util.jsonschema: Implement 'luaPatternProperties' as Lua variant of 'patternProperties'

Browse source 
Previous version of this patch used 'patternProperties' but that would
only work with simpler ECMA-262 regular expressions are also valid Lua
patterns.
This commit is contained in:
Kim Alvefur 2023-04-22 12:14:29 +02:00
parent 3697942a4a
commit 1dad83d28e
2 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,6 +96,9 @@ local record json_schema_object
-- semantic format
format : string
-- for Lua
luaPatternProperties: { string : schema_t }
-- xml
record xml_t
name : string
@ -339,17 +342,37 @@ function complex_validate (schema : json_schema_object, data : any, root : json_
end
end
-- additionalProperties applies to properties not validated by properties
-- or patternProperties, so we must keep track of properties validated by
-- the later
local seen_properties : { string : boolean } = {}
if schema.properties then
for k, sub in pairs(schema.properties) do
if data[k] ~= nil and not validate(sub, data[k], root) then
return false
end
seen_properties[k] = true
end
end
if schema.luaPatternProperties then
-- like patternProperties, but Lua patterns
for pattern, sub in pairs(schema.luaPatternProperties) do
for k in pairs(data) do
if k is string and k:match(pattern) then
if not validate(sub, data[k], root) then
return false
end
seen_properties[k] = true
end
end
end
end
if schema.additionalProperties ~= nil then
for k, v in pairs(data) do
if schema.properties == nil or schema.properties[k as string] == nil then
if not seen_properties[k as string] then
if not validate(schema.additionalProperties, v, root) then
return false
end

19
util/jsonschema.lua
View file

@ -226,17 +226,34 @@ function complex_validate(schema, data, root)
end
end
local seen_properties = {}
if schema.properties then
for k, sub in pairs(schema.properties) do
if data[k] ~= nil and not validate(sub, data[k], root) then
return false
end
seen_properties[k] = true
end
end
if schema.luaPatternProperties then
for pattern, sub in pairs(schema.luaPatternProperties) do
for k in pairs(data) do
if type(k) == "string" and k:match(pattern) then
if not validate(sub, data[k], root) then
return false
end
seen_properties[k] = true
end
end
end
end
if schema.additionalProperties ~= nil then
for k, v in pairs(data) do
if schema.properties == nil or schema.properties[k] == nil then
if not seen_properties[k] then
if not validate(schema.additionalProperties, v, root) then
return false
end