delay unauthorized request (rate limit)

This commit is contained in:
Dietmar Maurer 2019-01-31 14:34:21 +01:00
parent 5996577ab6
commit a154a8e8a4
2 changed files with 22 additions and 3 deletions

View File

@ -6,6 +6,8 @@ use crate::api::router::*;
use crate::tools::ticket::*; use crate::tools::ticket::*;
use crate::auth_helpers::*; use crate::auth_helpers::*;
use hyper::StatusCode;
use serde_json::{json, Value}; use serde_json::{json, Value};
fn authenticate_user(username: &str, password: &str) -> Result<(), Error> { fn authenticate_user(username: &str, password: &str) -> Result<(), Error> {
@ -44,7 +46,7 @@ fn create_ticket(
Err(err) => { Err(err) => {
let client_ip = "unknown"; // $rpcenv->get_client_ip() || ''; let client_ip = "unknown"; // $rpcenv->get_client_ip() || '';
log::error!("authentication failure; rhost={} user={} msg={}", client_ip, username, err.to_string()); log::error!("authentication failure; rhost={} user={} msg={}", client_ip, username, err.to_string());
bail!("authentication failure"); return Err(http_err!(UNAUTHORIZED, "permission check failed.".into()));
} }
} }
} }

View File

@ -168,13 +168,30 @@ fn handle_sync_api_request(
{ {
let params = get_request_parameters_async(info, parts, req_body, uri_param); let params = get_request_parameters_async(info, parts, req_body, uri_param);
let delay_unauth_time = std::time::Instant::now() + std::time::Duration::from_millis(3000);
let resp = params let resp = params
.and_then(move |params| { .and_then(move |params| {
let mut delay = false;
let resp = match (info.handler)(params, info, &mut rpcenv) { let resp = match (info.handler)(params, info, &mut rpcenv) {
Ok(data) => (formatter.format_result)(data, &rpcenv), Ok(data) => (formatter.format_result)(data, &rpcenv),
Err(err) => (formatter.format_error)(err), Err(err) => {
if let Some(httperr) = err.downcast_ref::<HttpError>() {
if httperr.code == StatusCode::UNAUTHORIZED { delay = true; }
}
(formatter.format_error)(err)
}
}; };
Ok(resp)
if delay {
let delayed_response = tokio::timer::Delay::new(delay_unauth_time)
.map_err(|err| http_err!(INTERNAL_SERVER_ERROR, format!("tokio timer delay error: {}", err)))
.and_then(|_| Ok(resp));
Either::A(delayed_response)
} else {
Either::B(future::ok(resp))
}
}); });
Box::new(resp) Box::new(resp)