proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-14 21:48:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/api/schema.rs - verify_json_object: improve error message

Browse Source
This commit is contained in:
Dietmar Maurer 2020-01-31 09:00:51 +01:00
parent c4311d4f11
commit f62fe221f0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proxmox/src/api/schema.rs
View File

@ -871,15 +871,18 @@ pub fn verify_json_object(data: &Value, schema: &ObjectSchema) -> Result<(), Err
for (key, value) in map { for (key, value) in map {
if let Some((_optional, prop_schema)) = schema.lookup(&key) { if let Some((_optional, prop_schema)) = schema.lookup(&key) {
match prop_schema { let result = match prop_schema {
Schema::Object(object_schema) => { Schema::Object(object_schema) => {
verify_json_object(value, object_schema)?; verify_json_object(value, object_schema)
} }
Schema::Array(array_schema) => { Schema::Array(array_schema) => {
verify_json_array(value, array_schema)?; verify_json_array(value, array_schema)
}
_ => verify_json(value, prop_schema)?,
} }
_ => verify_json(value, prop_schema),
};
if let Err(err) = result {
bail!("property '{}': {}", key, err);
};
} else if !additional_properties { } else if !additional_properties {
bail!( bail!(
"property '{}': schema does not allow additional properties.", "property '{}': schema does not allow additional properties.",