konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

rest-server: accept empty body as valid parameters

Browse Source 
technically an empty string is not valid json, but when sending an api
request without any parameters, treating the empty body as an empty
parameter hash instead of an error, makes the the api more robust for
clients

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2023-08-24 12:22:31 +02:00 committed by Thomas Lamprecht
parent 92be86d776
commit 359da67e9b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,12 @@ async fn get_request_parameters<S: 'static + BuildHasher + Send>(
std::str::from_utf8(&body).map_err(|err| format_err!("Request body not uft8: {}", err))?;
if is_json {
let mut params: Value = serde_json::from_str(utf8_data)?;
// treat empty body as empty paramater hash
let mut params: Value = if utf8_data.is_empty() {
Value::Object(serde_json::Map::new())
} else {
serde_json::from_str(utf8_data)?
};
for (k, v) in uri_param {
if let Some((_optional, prop_schema)) = param_schema.lookup(&k) {
params[&k] = prop_schema.parse_simple_value(&v)?;