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

call api method and return result

This commit is contained in:
Dietmar Maurer 2018-11-09 13:48:57 +01:00
parent b82472c0d2
commit c819ec8dde
1 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/main.rs
View File

@ -2,7 +2,7 @@ extern crate apitest;
use failure::*; use failure::*;
use std::collections::HashMap; //use std::collections::HashMap;
use lazy_static::lazy_static; use lazy_static::lazy_static;
//use apitest::json_schema::*; //use apitest::json_schema::*;
@ -12,19 +12,14 @@ use apitest::json_schema::*;
//use serde_derive::{Serialize, Deserialize}; //use serde_derive::{Serialize, Deserialize};
use serde_json::{json, Value}; use serde_json::{json, Value};
//use hyper::body::Payload;
use hyper::body::Payload;
use hyper::http::request::Parts; use hyper::http::request::Parts;
use hyper::{Method, Body, Request, Response, Server, StatusCode}; use hyper::{Method, Body, Request, Response, Server, StatusCode};
use hyper::rt::{Future, Stream}; use hyper::rt::{Future, Stream};
use hyper::service::service_fn; use hyper::service::service_fn;
use futures::prelude::*;
use futures::future; use futures::future;
use http;
use std::io;
type BoxFut = Box<Future<Item = Response<Body>, Error = hyper::Error> + Send>; type BoxFut = Box<Future<Item = Response<Body>, Error = hyper::Error> + Send>;
macro_rules! http_error { macro_rules! http_error {
@ -43,8 +38,10 @@ macro_rules! http_error_future {
} }
fn handle_api_request<'a>( fn handle_api_request<'a>(
info: &'a ApiMethod, parts: Parts, req_body: Body, query: Option<String>) info: &'a ApiMethod,
-> Box<Future<Item = Response<Body>, Error = hyper::Error> + Send + 'a> parts: Parts,
req_body: Body,
) -> Box<Future<Item = Response<Body>, Error = hyper::Error> + Send + 'a>
{ {
let entire_body = req_body.concat2(); let entire_body = req_body.concat2();
@ -55,18 +52,51 @@ fn handle_api_request<'a>(
Err(err) => http_error!(NOT_FOUND, err.to_string()), Err(err) => http_error!(NOT_FOUND, err.to_string()),
}; };
println!("GOT BODY {:?}", parts); println!("GOT BODY {:?}", bytes);
match parse_query_string(&bytes, &info.parameters, true) { let mut test_required = true;
Ok(res) => {
let json_str = res.to_string(); let mut params = json!({});
return Response::new(Body::from(json_str));
} let format_error_list = |error_list: Vec<Error>| {
Err(err) => { error_list.iter().fold(String::from(""), |acc, item| {
http_error!(NOT_FOUND, format!("Method returned error '{:?}'\n", err)); acc + &item.to_string() + "\n"
})
};
if bytes.len() > 0 {
params = match parse_query_string(&bytes, &info.parameters, true) {
Ok(value) => value,
Err(error_list) => http_error!(NOT_FOUND, format_error_list(error_list)),
};
test_required = false;
}
if let Some(query_str) = parts.uri.query() {
let query_params = match parse_query_string(query_str, &info.parameters, test_required) {
Ok(value) => value,
Err(error_list) => http_error!(NOT_FOUND, format_error_list(error_list)),
};
for (k, v) in query_params.as_object().unwrap() {
params[k] = v.clone(); // fixme: why clone()??
} }
} }
println!("GOT PARAMS {}", params);
let res: Value = match (info.handler)(params, info) {
Ok(res) => res,
Err(err) => http_error!(NOT_FOUND, format!("Method returned error '{}'\n", err)),
};
let json_str = res.to_string();
Response::builder()
.status(200)
.header("ContentType", "application/json")
.body(Body::from(json_str))
.unwrap() // fixme: really?
}); });
Box::new(resp) Box::new(resp)
@ -78,7 +108,6 @@ fn handle_request(req: Request<Body>) -> BoxFut {
let method = parts.method.clone(); let method = parts.method.clone();
let path = parts.uri.path(); let path = parts.uri.path();
let query = parts.uri.query().map(|x| x.to_owned());
let components: Vec<&str> = path.split('/').filter(|x| !x.is_empty()).collect(); let components: Vec<&str> = path.split('/').filter(|x| !x.is_empty()).collect();
let comp_len = components.len(); let comp_len = components.len();
@ -111,7 +140,7 @@ fn handle_request(req: Request<Body>) -> BoxFut {
// fixme: handle auth // fixme: handle auth
let res = handle_api_request(api_method, parts, body, query); let res = handle_api_request(api_method, parts, body);
return res; return res;
/* /*