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

api/router.rs: allow different types of api methods

Browse Source 
Added a prototype for file/backup uploads.
This commit is contained in:
Dietmar Maurer 2019-01-14 12:26:04 +01:00
parent ac1397dedb
commit c1582dcf39
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/server/rest.rs
View File

@ -82,8 +82,6 @@ impl Service for ApiService {
}
}
type BoxFut = Box<Future<Item = Response<Body>, Error = failure::Error> + Send>;
#[derive(Debug, Fail)]
pub struct HttpError {
pub code: StatusCode,
@ -180,6 +178,31 @@ fn handle_sync_api_request(
Box::new(resp)
}
fn handle_upload_api_request(
info: &'static ApiUploadMethod,
formatter: &'static OutputFormatter,
parts: Parts,
req_body: Body,
uri_param: HashMap<String, String>,
) -> BoxFut
{
// fixme: convert parameters to Json
let mut param_list: Vec<(String, String)> = vec![];
for (k, v) in uri_param {
param_list.push((k.clone(), v.clone()));
}
let params = match parse_parameter_strings(&param_list, &info.parameters, true) {
Ok(v) => v,
Err(err) => {
return Box::new(future::err(err.into()));
}
};
(info.handler)(req_body, params, info)
}
fn get_index() -> BoxFut {
let nodename = "unknown";
@ -362,9 +385,15 @@ pub fn handle_request(api: Arc<ApiConfig>, req: Request<Body>) -> BoxFut {
let mut uri_param = HashMap::new();
if let Some(api_method) = api.find_method(&components[2..], method, &mut uri_param) {
// fixme: handle auth
return handle_sync_api_request(api_method, formatter, parts, body, uri_param);
// fixme: handle auth
match api.find_method(&components[2..], method, &mut uri_param) {
MethodDefinition::None => {}
MethodDefinition::Simple(api_method) => {
return handle_sync_api_request(api_method, formatter, parts, body, uri_param);
}
MethodDefinition::Upload(upload_method) => {
return handle_upload_api_request(upload_method, formatter, parts, body, uri_param);
}
}
}
} else {