tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/server/rest.rs - only pass ObjectSchema to get_request_parameters_async()

This commit is contained in:
Dietmar Maurer 2019-11-22 17:22:07 +01:00
parent ad51d02aa9
commit 75a5a68944
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/rest.rs
View File

@ -19,7 +19,7 @@ use url::form_urlencoded;
use proxmox::api::http_err; use proxmox::api::http_err;
use proxmox::api::{ApiHandler, ApiMethod, HttpError}; use proxmox::api::{ApiHandler, ApiMethod, HttpError};
use proxmox::api::{RpcEnvironment, RpcEnvironmentType}; use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
use proxmox::api::schema::{parse_simple_value, verify_json_object, parse_parameter_strings}; use proxmox::api::schema::{ObjectSchema, parse_simple_value, verify_json_object, parse_parameter_strings};
use super::environment::RestEnvironment; use super::environment::RestEnvironment;
use super::formatter::*; use super::formatter::*;
@ -150,7 +150,7 @@ impl tower_service::Service<Request<Body>> for ApiService {
} }
async fn get_request_parameters_async<S: 'static + BuildHasher + Send>( async fn get_request_parameters_async<S: 'static + BuildHasher + Send>(
info: &'static ApiMethod, param_schema: &ObjectSchema,
parts: Parts, parts: Parts,
req_body: Body, req_body: Body,
uri_param: HashMap<String, String, S>, uri_param: HashMap<String, String, S>,
@ -184,16 +184,14 @@ async fn get_request_parameters_async<S: 'static + BuildHasher + Send>(
let utf8 = std::str::from_utf8(&body) let utf8 = std::str::from_utf8(&body)
.map_err(|err| format_err!("Request body not uft8: {}", err))?; .map_err(|err| format_err!("Request body not uft8: {}", err))?;
let obj_schema = &info.parameters;
if is_json { if is_json {
let mut params: Value = serde_json::from_str(utf8)?; let mut params: Value = serde_json::from_str(utf8)?;
for (k, v) in uri_param { for (k, v) in uri_param {
if let Some((_optional, prop_schema)) = obj_schema.lookup(&k) { if let Some((_optional, prop_schema)) = param_schema.lookup(&k) {
params[&k] = parse_simple_value(&v, prop_schema)?; params[&k] = parse_simple_value(&v, prop_schema)?;
} }
} }
verify_json_object(&params, obj_schema)?; verify_json_object(&params, param_schema)?;
return Ok(params); return Ok(params);
} }
@ -216,7 +214,7 @@ async fn get_request_parameters_async<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, obj_schema, true)?; let params = parse_parameter_strings(&param_list, param_schema, true)?;
Ok(params) Ok(params)
} }
@ -269,7 +267,7 @@ pub async fn handle_sync_api_request<Env: RpcEnvironment, S: 'static + BuildHash
ApiHandler::Sync(handler) => handler, ApiHandler::Sync(handler) => handler,
}; };
let params = get_request_parameters_async(info, parts, req_body, uri_param).await?; let params = get_request_parameters_async(info.parameters, parts, req_body, uri_param).await?;
let delay_unauth_time = std::time::Instant::now() + std::time::Duration::from_millis(3000); let delay_unauth_time = std::time::Instant::now() + std::time::Duration::from_millis(3000);