diff --git a/src/api_server.rs b/src/api_server.rs index 38d8d53c..26558995 100644 --- a/src/api_server.rs +++ b/src/api_server.rs @@ -1,20 +1,39 @@ use std::collections::HashMap; use std::path::{PathBuf}; +use std::sync::Arc; + +use failure::*; +use serde_json::{json, Value}; + +use crate::json_schema::*; use crate::api_info::*; -//use crate::json_schema::*; -use hyper::{Method}; -pub struct ApiServer { +use futures::future::{self, Either}; +//use tokio::prelude::*; +//use tokio::timer::Delay; +use tokio::fs::File; +use tokio_codec; +//use bytes::{BytesMut, BufMut}; + +//use hyper::body::Payload; +use hyper::http::request::Parts; +use hyper::{Body, Request, Method, Response, StatusCode}; +use hyper::service::{Service, NewService}; +use hyper::rt::{Future, Stream}; +use hyper::header; + + +pub struct ApiConfig { basedir: PathBuf, router: &'static MethodInfo, aliases: HashMap, } -impl ApiServer { +impl ApiConfig { pub fn new>(basedir: B, router: &'static MethodInfo) -> Self { - ApiServer { + Self { basedir: basedir.into(), router: router, aliases: HashMap::new(), @@ -61,3 +80,264 @@ impl ApiServer { self.aliases.insert(alias.into(), path.into()); } } + +type BoxFut = Box, Error = failure::Error> + Send>; + +macro_rules! error_response { + ($status:ident, $msg:expr) => {{ + let mut resp = Response::new(Body::from($msg)); + *resp.status_mut() = StatusCode::$status; + resp + }} +} + +macro_rules! http_error_future { + ($status:ident, $msg:expr) => {{ + let resp = error_response!($status, $msg); + return Box::new(future::ok(resp)); + }} +} + +fn get_request_parameters_async<'a>( + info: &'a ApiMethod, + parts: Parts, + req_body: Body, +) -> Box + Send + 'a> +{ + let resp = req_body + .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("Promlems reading request body: {}", err)))) + .fold(Vec::new(), |mut acc, chunk| { + if acc.len() + chunk.len() < 64*1024 { //fimxe: max request body size? + acc.extend_from_slice(&*chunk); + Ok(acc) + } + else { Err(Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("Request body too large")))) } + }) + .and_then(move |body| { + + let bytes = String::from_utf8(body.to_vec())?; // why copy?? + + println!("GOT BODY {:?}", bytes); + + let mut test_required = true; + + let mut params = json!({}); + + if bytes.len() > 0 { + params = parse_query_string(&bytes, &info.parameters, true)?; + test_required = false; + } + + if let Some(query_str) = parts.uri.query() { + let query_params = parse_query_string(query_str, &info.parameters, test_required)?; + + for (k, v) in query_params.as_object().unwrap() { + params[k] = v.clone(); // fixme: why clone()?? + } + } + + println!("GOT PARAMS {}", params); + Ok(params) + }); + + Box::new(resp) +} + +fn handle_sync_api_request<'a>( + info: &'a ApiMethod, + parts: Parts, + req_body: Body, +) -> Box, Error = failure::Error> + Send + 'a> +{ + let params = get_request_parameters_async(info, parts, req_body); + + let resp = params + .and_then(move |params| { + + println!("GOT PARAMS {}", params); + + /* + let when = Instant::now() + Duration::from_millis(3000); + let task = Delay::new(when).then(|_| { + println!("A LAZY TASK"); + ok(()) + }); + + tokio::spawn(task); + */ + + let res = (info.handler)(params, info)?; + + Ok(res) + + }).then(|result| { + match result { + Ok(ref value) => { + let json_str = value.to_string(); + + Ok(Response::builder() + .status(StatusCode::OK) + .header(header::CONTENT_TYPE, "application/json") + .body(Body::from(json_str))?) + } + Err(err) => Ok(error_response!(BAD_REQUEST, err.to_string())) + } + }); + + Box::new(resp) +} + +fn simple_static_file_download(filename: PathBuf) -> BoxFut { + + Box::new(File::open(filename) + .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("File open failed: {}", err)))) + .and_then(|file| { + let buf: Vec = Vec::new(); + tokio::io::read_to_end(file, buf) + .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("File read failed: {}", err)))) + .and_then(|data| Ok(Response::new(data.1.into()))) + })) +} + +fn chuncked_static_file_download(filename: PathBuf) -> BoxFut { + + Box::new(File::open(filename) + .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("File open failed: {}", err)))) + .and_then(|file| { + let payload = tokio_codec::FramedRead::new(file, tokio_codec::BytesCodec::new()). + map(|bytes| { + //sigh - howto avoid copy here? or the whole map() ?? + hyper::Chunk::from(bytes.to_vec()) + }); + let body = Body::wrap_stream(payload); + // fixme: set content type and other headers + Ok(Response::builder() + .status(StatusCode::OK) + .body(body) + .unwrap()) + })) +} + +fn handle_static_file_download(filename: PathBuf) -> BoxFut { + + let response = tokio::fs::metadata(filename.clone()) + .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("File access problems: {}", err)))) + .and_then(|metadata| { + if metadata.len() < 1024*32 { + Either::A(simple_static_file_download(filename)) + } else { + Either::B(chuncked_static_file_download(filename)) + } + }); + + return Box::new(response); +} + +pub fn handle_request(api: Arc, req: Request) -> BoxFut { + + let (parts, body) = req.into_parts(); + + let method = parts.method.clone(); + let path = parts.uri.path(); + + // normalize path + // do not allow ".", "..", or hidden files ".XXXX" + // also remove empty path components + + let items = path.split('/'); + let mut path = String::new(); + let mut components = vec![]; + + for name in items { + if name.is_empty() { continue; } + if name.starts_with(".") { + http_error_future!(BAD_REQUEST, "Path contains illegal components.\n"); + } + path.push('/'); + path.push_str(name); + components.push(name); + } + + let comp_len = components.len(); + + println!("REQUEST {} {}", method, path); + println!("COMPO {:?}", components); + + if comp_len >= 1 && components[0] == "api3" { + println!("GOT API REQUEST"); + if comp_len >= 2 { + let format = components[1]; + if format != "json" { + http_error_future!(BAD_REQUEST, format!("Unsupported output format '{}'.", format)) + } + + if let Some(api_method) = api.find_method(&components[2..], method) { + // fixme: handle auth + return handle_sync_api_request(api_method, parts, body); + } + } + } else { + // not Auth for accessing files! + + let filename = api.find_alias(&components); + return handle_static_file_download(filename); + } + + http_error_future!(NOT_FOUND, "Path not found.") + //Box::new(ok(Response::new(Body::from("RETURN WEB GUI\n")))) +} + +pub struct RestServer { + pub api_config: Arc, +} + +impl RestServer { + + pub fn new(api_config: ApiConfig) -> Self { + Self { api_config: Arc::new(api_config) } + } +} + +impl NewService for RestServer +{ + type ReqBody = Body; + type ResBody = Body; + type Error = hyper::Error; + type InitError = hyper::Error; + type Service = ApiService; + type Future = Box + Send>; + fn new_service(&self) -> Self::Future { + Box::new(future::ok(ApiService { api_config: self.api_config.clone() })) + } +} + +pub struct ApiService { + pub api_config: Arc, +} + +impl Service for ApiService { + type ReqBody = Body; + type ResBody = Body; + type Error = hyper::Error; + type Future = Box, Error = Self::Error> + Send>; + + fn call(&mut self, req: Request) -> Self::Future { + + Box::new(handle_request(self.api_config.clone(), req).then(|result| { + match result { + Ok(res) => Ok::<_, hyper::Error>(res), + Err(err) => { + if let Some(apierr) = err.downcast_ref::() { + let mut resp = Response::new(Body::from(apierr.message.clone())); + *resp.status_mut() = apierr.code; + Ok(resp) + } else { + let mut resp = Response::new(Body::from(err.to_string())); + *resp.status_mut() = StatusCode::BAD_REQUEST; + Ok(resp) + } + } + } + })) + } +} diff --git a/src/main.rs b/src/main.rs index 24f31157..70439ff3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,245 +1,13 @@ -extern crate apitest; - -use failure::*; -use std::sync::Arc; -//use std::collections::HashMap; -//use std::io; -//use std::fs; -use std::path::{PathBuf}; - -//use std::collections::HashMap; +//use failure::*; use lazy_static::lazy_static; //use apitest::json_schema::*; use apitest::api_info::*; -use apitest::json_schema::*; use apitest::api_server::*; -//use serde_derive::{Serialize, Deserialize}; -use serde_json::{json, Value}; +use futures::future::Future; -use futures::future::{self, Either}; -//use tokio::prelude::*; -//use tokio::timer::Delay; -use tokio::fs::File; -use tokio_codec; -//use bytes::{BytesMut, BufMut}; - -//use hyper::body::Payload; -use hyper::http::request::Parts; -use hyper::{Body, Request, Response, Server, StatusCode}; -use hyper::rt::{Future, Stream}; -use hyper::service::service_fn; -use hyper::header; - -//use std::time::{Duration, Instant}; - -type BoxFut = Box, Error = failure::Error> + Send>; - -macro_rules! error_response { - ($status:ident, $msg:expr) => {{ - let mut resp = Response::new(Body::from($msg)); - *resp.status_mut() = StatusCode::$status; - resp - }} -} - -macro_rules! http_error_future { - ($status:ident, $msg:expr) => {{ - let resp = error_response!($status, $msg); - return Box::new(future::ok(resp)); - }} -} - -fn get_request_parameters_async<'a>( - info: &'a ApiMethod, - parts: Parts, - req_body: Body, -) -> Box + Send + 'a> -{ - let resp = req_body - .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("Promlems reading request body: {}", err)))) - .fold(Vec::new(), |mut acc, chunk| { - if acc.len() + chunk.len() < 64*1024 { //fimxe: max request body size? - acc.extend_from_slice(&*chunk); - Ok(acc) - } - else { Err(Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("Request body too large")))) } - }) - .and_then(move |body| { - - let bytes = String::from_utf8(body.to_vec())?; // why copy?? - - println!("GOT BODY {:?}", bytes); - - let mut test_required = true; - - let mut params = json!({}); - - if bytes.len() > 0 { - params = parse_query_string(&bytes, &info.parameters, true)?; - test_required = false; - } - - if let Some(query_str) = parts.uri.query() { - let query_params = parse_query_string(query_str, &info.parameters, test_required)?; - - for (k, v) in query_params.as_object().unwrap() { - params[k] = v.clone(); // fixme: why clone()?? - } - } - - println!("GOT PARAMS {}", params); - Ok(params) - }); - - Box::new(resp) -} - -fn handle_sync_api_request<'a>( - info: &'a ApiMethod, - parts: Parts, - req_body: Body, -) -> Box, Error = failure::Error> + Send + 'a> -{ - let params = get_request_parameters_async(info, parts, req_body); - - let resp = params - .and_then(move |params| { - - println!("GOT PARAMS {}", params); - - /* - let when = Instant::now() + Duration::from_millis(3000); - let task = Delay::new(when).then(|_| { - println!("A LAZY TASK"); - ok(()) - }); - - tokio::spawn(task); - */ - - let res = (info.handler)(params, info)?; - - Ok(res) - - }).then(|result| { - match result { - Ok(ref value) => { - let json_str = value.to_string(); - - Ok(Response::builder() - .status(StatusCode::OK) - .header(header::CONTENT_TYPE, "application/json") - .body(Body::from(json_str))?) - } - Err(err) => Ok(error_response!(BAD_REQUEST, err.to_string())) - } - }); - - Box::new(resp) -} - -fn simple_static_file_download(filename: PathBuf) -> BoxFut { - - Box::new(File::open(filename) - .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("File open failed: {}", err)))) - .and_then(|file| { - let buf: Vec = Vec::new(); - tokio::io::read_to_end(file, buf) - .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("File read failed: {}", err)))) - .and_then(|data| Ok(Response::new(data.1.into()))) - })) -} - -fn chuncked_static_file_download(filename: PathBuf) -> BoxFut { - - Box::new(File::open(filename) - .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("File open failed: {}", err)))) - .and_then(|file| { - let payload = tokio_codec::FramedRead::new(file, tokio_codec::BytesCodec::new()). - map(|bytes| { - //sigh - howto avoid copy here? or the whole map() ?? - hyper::Chunk::from(bytes.to_vec()) - }); - let body = Body::wrap_stream(payload); - // fixme: set content type and other headers - Ok(Response::builder() - .status(StatusCode::OK) - .body(body) - .unwrap()) - })) -} - -fn handle_static_file_download(filename: PathBuf) -> BoxFut { - - let response = tokio::fs::metadata(filename.clone()) - .map_err(|err| Error::from(ApiError::new(StatusCode::BAD_REQUEST, format!("File access problems: {}", err)))) - .and_then(|metadata| { - if metadata.len() < 1024*32 { - Either::A(simple_static_file_download(filename)) - } else { - Either::B(chuncked_static_file_download(filename)) - } - }); - - return Box::new(response); -} - -fn handle_request(api: Arc, req: Request) -> BoxFut { - - let (parts, body) = req.into_parts(); - - let method = parts.method.clone(); - let path = parts.uri.path(); - - // normalize path - // do not allow ".", "..", or hidden files ".XXXX" - // also remove empty path components - - let items = path.split('/'); - let mut path = String::new(); - let mut components = vec![]; - - for name in items { - if name.is_empty() { continue; } - if name.starts_with(".") { - http_error_future!(BAD_REQUEST, "Path contains illegal components.\n"); - } - path.push('/'); - path.push_str(name); - components.push(name); - } - - let comp_len = components.len(); - - println!("REQUEST {} {}", method, path); - println!("COMPO {:?}", components); - - if comp_len >= 1 && components[0] == "api3" { - println!("GOT API REQUEST"); - if comp_len >= 2 { - let format = components[1]; - if format != "json" { - http_error_future!(BAD_REQUEST, format!("Unsupported output format '{}'.", format)) - } - - if let Some(api_method) = api.find_method(&components[2..], method) { - // fixme: handle auth - return handle_sync_api_request(api_method, parts, body); - } - } - } else { - // not Auth for accessing files! - - let filename = api.find_alias(&components); - return handle_static_file_download(filename); - } - - - http_error_future!(NOT_FOUND, "Path not found.") - //Box::new(ok(Response::new(Body::from("RETURN WEB GUI\n")))) -} +use hyper; fn main() { println!("Fast Static Type Definitions 1"); @@ -250,45 +18,23 @@ fn main() { static ref ROUTER: MethodInfo = apitest::api3::router(); } - let mut api_server = ApiServer::new("/var/www", &ROUTER); + let mut config = ApiConfig::new("/var/www", &ROUTER); // add default dirs which includes jquery and bootstrap // my $base = '/usr/share/libpve-http-server-perl'; // add_dirs($self->{dirs}, '/css/' => "$base/css/"); // add_dirs($self->{dirs}, '/js/' => "$base/js/"); // add_dirs($self->{dirs}, '/fonts/' => "$base/fonts/"); - api_server.add_alias("novnc", "/usr/share/novnc-pve"); - api_server.add_alias("extjs", "/usr/share/javascript/extjs"); - api_server.add_alias("fontawesome", "/usr/share/fonts-font-awesome"); - api_server.add_alias("xtermjs", "/usr/share/pve-xtermjs"); - api_server.add_alias("widgettoolkit", "/usr/share/javascript/proxmox-widget-toolkit"); + config.add_alias("novnc", "/usr/share/novnc-pve"); + config.add_alias("extjs", "/usr/share/javascript/extjs"); + config.add_alias("fontawesome", "/usr/share/fonts-font-awesome"); + config.add_alias("xtermjs", "/usr/share/pve-xtermjs"); + config.add_alias("widgettoolkit", "/usr/share/javascript/proxmox-widget-toolkit"); - let api_server = Arc::new(api_server); + let rest_server = RestServer::new(config); - let new_svc = move || { - - let api_server = api_server.clone(); - - service_fn(move |req| { - handle_request(api_server.clone(), req).then(|result| { - match result { - Ok(res) => Ok::<_,String>(res), - Err(err) => { - if let Some(apierr) = err.downcast_ref::() { - let mut resp = Response::new(Body::from(apierr.message.clone())); - *resp.status_mut() = apierr.code; - Ok(resp) - } else { - Ok(error_response!(BAD_REQUEST, err.to_string())) - } - } - } - }) - }) - }; - - let server = Server::bind(&addr) - .serve(new_svc) + let server = hyper::Server::bind(&addr) + .serve(rest_server) .map_err(|e| eprintln!("server error: {}", e)); // Run this server for... forever!