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

factor out server code into api_server.rs

This commit is contained in:
Dietmar Maurer 2018-11-14 13:22:33 +01:00
parent a9696f7beb
commit 1a53be1443
4 changed files with 99 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api_info.rs
View File

@ -59,7 +59,7 @@ impl MethodInfo {
self self
} }
pub fn find_method(&self, components: &[&str]) -> Option<&MethodInfo> { pub fn find_route(&self, components: &[&str]) -> Option<&MethodInfo> {
if components.len() == 0 { return Some(self); }; if components.len() == 0 { return Some(self); };
@ -67,7 +67,7 @@ impl MethodInfo {
if let Some(ref dirmap) = self.subdirs { if let Some(ref dirmap) = self.subdirs {
if let Some(ref info) = dirmap.get(dir) { if let Some(ref info) = dirmap.get(dir) {
return info.find_method(rest); return info.find_route(rest);
} }
} }

73
src/api_server.rs Normal file
View File

@ -0,0 +1,73 @@
use std::collections::HashMap;
use std::path::{PathBuf};
use crate::api_info::*;
use crate::json_schema::*;
use futures::future::{self, Either};
use tokio::fs::File;
use tokio_codec;
use hyper::http::request::Parts;
use hyper::{Method, Body, Request, Response, Server, StatusCode};
use hyper::rt::{Future, Stream};
use hyper::service::{service_fn, NewService};
use hyper::header;
pub struct ApiServer {
basedir: PathBuf,
router: &'static MethodInfo,
aliases: HashMap<String, PathBuf>,
}
impl ApiServer {
pub fn new<B: Into<PathBuf>>(basedir: B, router: &'static MethodInfo) -> Self {
ApiServer {
basedir: basedir.into(),
router: router,
aliases: HashMap::new(),
}
}
pub fn find_method(&self, components: &[&str], method: Method) -> Option<&'static ApiMethod> {
if let Some(info) = self.router.find_route(components) {
println!("FOUND INFO");
let opt_api_method = match method {
Method::GET => &info.get,
Method::PUT => &info.put,
Method::POST => &info.post,
Method::DELETE => &info.delete,
_ => &None,
};
if let Some(api_method) = opt_api_method {
return Some(&api_method);
}
}
None
}
pub fn find_alias(&self, components: &[&str]) -> PathBuf {
let mut prefix = String::new();
let mut filename = self.basedir.clone();
let comp_len = components.len();
if comp_len >= 1 {
prefix.push_str(components[0]);
if let Some(subdir) = self.aliases.get(&prefix) {
filename.push(subdir);
for i in 1..comp_len { filename.push(components[i]) }
}
}
filename
}
pub fn add_alias<S, P>(&mut self, alias: S, path: P)
where S: Into<String>,
P: Into<PathBuf>,
{
self.aliases.insert(alias.into(), path.into());
}
}

2
src/lib.rs
View File

@ -6,5 +6,7 @@ pub mod json_schema;
#[macro_use] #[macro_use]
pub mod api_info; pub mod api_info;
pub mod api_server;
pub mod api3; pub mod api3;

87
src/main.rs
View File

@ -2,7 +2,7 @@ extern crate apitest;
use failure::*; use failure::*;
use std::sync::Arc; use std::sync::Arc;
use std::collections::HashMap; //use std::collections::HashMap;
//use std::io; //use std::io;
//use std::fs; //use std::fs;
use std::path::{PathBuf}; use std::path::{PathBuf};
@ -13,6 +13,7 @@ use lazy_static::lazy_static;
//use apitest::json_schema::*; //use apitest::json_schema::*;
use apitest::api_info::*; use apitest::api_info::*;
use apitest::json_schema::*; use apitest::json_schema::*;
use apitest::api_server::*;
//use serde_derive::{Serialize, Deserialize}; //use serde_derive::{Serialize, Deserialize};
use serde_json::{json, Value}; use serde_json::{json, Value};
@ -26,7 +27,7 @@ use tokio_codec;
//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::{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 hyper::header; use hyper::header;
@ -214,7 +215,7 @@ fn handle_static_file_download(filename: PathBuf) -> BoxFut {
return Box::new(response); return Box::new(response);
} }
fn handle_request(api: &ApiServer, req: Request<Body>) -> BoxFut { fn handle_request<'a>(api: &'a ApiServer, req: Request<Body>) -> BoxFut {
let (parts, body) = req.into_parts(); let (parts, body) = req.into_parts();
@ -252,38 +253,15 @@ fn handle_request(api: &ApiServer, req: Request<Body>) -> BoxFut {
http_error_future!(BAD_REQUEST, format!("Unsupported output format '{}'.", format)) http_error_future!(BAD_REQUEST, format!("Unsupported output format '{}'.", format))
} }
if let Some(info) = api.router.find_method(&components[2..]) { if let Some(api_method) = api.find_method(&components[2..], method) {
println!("FOUND INFO");
let api_method_opt = match method {
Method::GET => &info.get,
Method::PUT => &info.put,
Method::POST => &info.post,
Method::DELETE => &info.delete,
_ => &None,
};
let api_method = match api_method_opt {
Some(m) => m,
_ => http_error_future!(NOT_FOUND, format!("No such method '{}'.", method)),
};
// fixme: handle auth // fixme: handle auth
//return handle_sync_api_request(api_method, parts, body);
return handle_async_api_request(api_method, parts, body); return handle_async_api_request(api_method, parts, body);
} }
} }
} else { } else {
// not Auth for accessing files! // not Auth for accessing files!
let mut prefix = String::new(); let filename = api.find_alias(&components);
let mut filename = PathBuf::from("/var/www"); // fixme
if comp_len >= 1 {
prefix.push_str(components[0]);
if let Some(subdir) = api.aliases.get(&prefix) {
filename.push(subdir);
for i in 1..comp_len { filename.push(components[i]) }
}
}
return handle_static_file_download(filename); return handle_static_file_download(filename);
} }
@ -292,51 +270,30 @@ fn handle_request(api: &ApiServer, req: Request<Body>) -> BoxFut {
//Box::new(ok(Response::new(Body::from("RETURN WEB GUI\n")))) //Box::new(ok(Response::new(Body::from("RETURN WEB GUI\n"))))
} }
// 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/");
fn initialize_directory_aliases() -> HashMap<String, PathBuf> {
let mut basedirs: HashMap<String, PathBuf> = HashMap::new();
let mut add_directory_alias = |name, path| {
basedirs.insert(String::from(name), PathBuf::from(path));
};
add_directory_alias("novnc", "/usr/share/novnc-pve");
add_directory_alias("extjs", "/usr/share/javascript/extjs");
add_directory_alias("fontawesome", "/usr/share/fonts-font-awesome");
add_directory_alias("xtermjs", "/usr/share/pve-xtermjs");
add_directory_alias("widgettoolkit", "/usr/share/javascript/proxmox-widget-toolkit");
basedirs
}
struct ApiServer {
basedir: PathBuf,
router: &'static MethodInfo,
aliases: &'static HashMap<String, PathBuf>,
}
fn main() { fn main() {
println!("Fast Static Type Definitions 1"); println!("Fast Static Type Definitions 1");
let addr = ([127, 0, 0, 1], 8007).into(); let addr = ([127, 0, 0, 1], 8007).into();
lazy_static!{ lazy_static!{
static ref ALIASES: HashMap<String, PathBuf> = initialize_directory_aliases(); static ref ROUTER: MethodInfo = apitest::api3::router();
static ref ROUTER: MethodInfo = apitest::api3::router();
} }
let api_server = Arc::new(ApiServer { let mut api_server = ApiServer::new("/var/www", &ROUTER);
basedir: "/var/www". into(),
router: &ROUTER, // add default dirs which includes jquery and bootstrap
aliases: &ALIASES, // 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");
let api_server = Arc::new(api_server);
let new_svc = move || { let new_svc = move || {