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

cleanup schema function calls

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-12-16 11:02:53 +01:00
parent 88b56894c7
commit 049972844e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
proxmox-rest-server/src/rest.rs
View File

@ -26,10 +26,7 @@ use proxmox_router::{
RpcEnvironmentType, UserInformation, RpcEnvironmentType, UserInformation,
}; };
use proxmox_router::http_err; use proxmox_router::http_err;
use proxmox_schema::{ use proxmox_schema::{ObjectSchemaType, ParameterSchema};
parse_parameter_strings, parse_simple_value, verify_json_object, ObjectSchemaType,
ParameterSchema,
};
use proxmox_http::client::RateLimitedStream; use proxmox_http::client::RateLimitedStream;
@ -330,7 +327,7 @@ fn parse_query_parameters<S: 'static + BuildHasher + Send>(
param_list.push((k.clone(), v.clone())); param_list.push((k.clone(), v.clone()));
} }
let params = parse_parameter_strings(&param_list, param_schema, true)?; let params = param_schema.parse_parameter_strings(&param_list, true)?;
Ok(params) Ok(params)
} }
@ -376,10 +373,10 @@ async fn get_request_parameters<S: 'static + BuildHasher + Send>(
let mut params: Value = serde_json::from_str(utf8_data)?; let mut params: Value = serde_json::from_str(utf8_data)?;
for (k, v) in uri_param { for (k, v) in uri_param {
if let Some((_optional, prop_schema)) = param_schema.lookup(&k) { if let Some((_optional, prop_schema)) = param_schema.lookup(&k) {
params[&k] = parse_simple_value(&v, prop_schema)?; params[&k] = prop_schema.parse_simple_value(&v)?;
} }
} }
verify_json_object(&params, &param_schema)?; param_schema.verify_json(&params)?;
return Ok(params); return Ok(params);
} else { } else {
parse_query_parameters(param_schema, utf8_data, &parts, &uri_param) parse_query_parameters(param_schema, utf8_data, &parts, &uri_param)