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

server/rest.rs: add proxy_sync_api_request() dummy

This commit is contained in:
Dietmar Maurer 2019-01-28 17:30:39 +01:00
parent 4e4df8e2f0
commit f120483353
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/router.rs
View File

@ -24,7 +24,7 @@ pub trait RpcEnvironment {
fn get_user(&self) -> Option<String>; fn get_user(&self) -> Option<String>;
} }
#[derive(Copy, Clone)] #[derive(PartialEq, Copy, Clone)]
pub enum RpcEnvironmentType { pub enum RpcEnvironmentType {
/// command started from command line /// command started from command line
CLI, CLI,

2
src/api2/node/dns.rs
View File

@ -148,7 +148,7 @@ pub fn router() -> Router {
.optional("dns2", SECOND_DNS_SERVER_SCHEMA.clone()) .optional("dns2", SECOND_DNS_SERVER_SCHEMA.clone())
.optional("dns3", THIRD_DNS_SERVER_SCHEMA.clone()) .optional("dns3", THIRD_DNS_SERVER_SCHEMA.clone())
.optional("digest", PVE_CONFIG_DIGEST_SCHEMA.clone()) .optional("digest", PVE_CONFIG_DIGEST_SCHEMA.clone())
) ).protected(true)
); );
route route

22
src/server/rest.rs
View File

@ -158,6 +158,19 @@ fn get_request_parameters_async(
Box::new(resp) Box::new(resp)
} }
fn proxy_sync_api_request(
mut rpcenv: RestEnvironment,
info: &'static ApiMethod,
formatter: &'static OutputFormatter,
parts: Parts,
req_body: Body,
uri_param: HashMap<String, String>,
) -> BoxFut
{
return Box::new(future::err(http_err!(BAD_REQUEST, String::from("implement proxy"))));
}
fn handle_sync_api_request( fn handle_sync_api_request(
mut rpcenv: RestEnvironment, mut rpcenv: RestEnvironment,
info: &'static ApiMethod, info: &'static ApiMethod,
@ -397,7 +410,8 @@ pub fn handle_request(api: Arc<ApiConfig>, req: Request<Body>) -> BoxFut {
println!("REQUEST {} {}", method, path); println!("REQUEST {} {}", method, path);
println!("COMPO {:?}", components); println!("COMPO {:?}", components);
let mut rpcenv = RestEnvironment::new(api.env_type()); let env_type = api.env_type();
let mut rpcenv = RestEnvironment::new(env_type);
if comp_len >= 1 && components[0] == "api2" { if comp_len >= 1 && components[0] == "api2" {
println!("GOT API REQUEST"); println!("GOT API REQUEST");
@ -419,7 +433,11 @@ pub fn handle_request(api: Arc<ApiConfig>, req: Request<Body>) -> BoxFut {
match api.find_method(&components[2..], method, &mut uri_param) { match api.find_method(&components[2..], method, &mut uri_param) {
MethodDefinition::None => {} MethodDefinition::None => {}
MethodDefinition::Simple(api_method) => { MethodDefinition::Simple(api_method) => {
return handle_sync_api_request(rpcenv, api_method, formatter, parts, body, uri_param); if api_method.protected && env_type == RpcEnvironmentType::PUBLIC {
return proxy_sync_api_request(rpcenv, api_method, formatter, parts, body, uri_param);
} else {
return handle_sync_api_request(rpcenv, api_method, formatter, parts, body, uri_param);
}
} }
MethodDefinition::Async(async_method) => { MethodDefinition::Async(async_method) => {
return handle_async_api_request(rpcenv, async_method, formatter, parts, body, uri_param); return handle_async_api_request(rpcenv, async_method, formatter, parts, body, uri_param);