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

REST: rename token to csrf_token

Browse Source 
for easier differentiation with (future) api_token

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-10-19 09:39:07 +02:00 committed by Thomas Lamprecht
parent 97168f920e
commit 02479720c0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/rest.rs
View File

@ -542,18 +542,18 @@ fn extract_auth_data(headers: &http::HeaderMap) -> (Option<String>, Option<Strin
} }
} }
let token = match headers.get("CSRFPreventionToken").map(|v| v.to_str()) { let csrf_token = match headers.get("CSRFPreventionToken").map(|v| v.to_str()) {
Some(Ok(v)) => Some(v.to_owned()), Some(Ok(v)) => Some(v.to_owned()),
_ => None, _ => None,
}; };
(ticket, token, language) (ticket, csrf_token, language)
} }
fn check_auth( fn check_auth(
method: &hyper::Method, method: &hyper::Method,
ticket: &Option<String>, ticket: &Option<String>,
token: &Option<String>, csrf_token: &Option<String>,
user_info: &CachedUserInfo, user_info: &CachedUserInfo,
) -> Result<Userid, Error> { ) -> Result<Userid, Error> {
let ticket_lifetime = tools::ticket::TICKET_LIFETIME; let ticket_lifetime = tools::ticket::TICKET_LIFETIME;
@ -567,8 +567,8 @@ fn check_auth(
} }
if method != hyper::Method::GET { if method != hyper::Method::GET {
if let Some(token) = token { if let Some(csrf_token) = csrf_token {
verify_csrf_prevention_token(csrf_secret(), &userid, &token, -300, ticket_lifetime)?; verify_csrf_prevention_token(csrf_secret(), &userid, &csrf_token, -300, ticket_lifetime)?;
} else { } else {
bail!("missing CSRF prevention token"); bail!("missing CSRF prevention token");
} }
@ -630,8 +630,8 @@ async fn handle_request(
} }
if auth_required { if auth_required {
let (ticket, token, _) = extract_auth_data(&parts.headers); let (ticket, csrf_token, _) = extract_auth_data(&parts.headers);
match check_auth(&method, &ticket, &token, &user_info) { match check_auth(&method, &ticket, &csrf_token, &user_info) {
Ok(userid) => rpcenv.set_user(Some(userid.to_string())), Ok(userid) => rpcenv.set_user(Some(userid.to_string())),
Err(err) => { Err(err) => {
// always delay unauthorized calls by 3 seconds (from start of request) // always delay unauthorized calls by 3 seconds (from start of request)
@ -684,12 +684,12 @@ async fn handle_request(
} }
if comp_len == 0 { if comp_len == 0 {
let (ticket, token, language) = extract_auth_data(&parts.headers); let (ticket, csrf_token, language) = extract_auth_data(&parts.headers);
if ticket != None { if ticket != None {
match check_auth(&method, &ticket, &token, &user_info) { match check_auth(&method, &ticket, &csrf_token, &user_info) {
Ok(userid) => { Ok(userid) => {
let new_token = assemble_csrf_prevention_token(csrf_secret(), &userid); let new_csrf_token = assemble_csrf_prevention_token(csrf_secret(), &userid);
return Ok(get_index(Some(userid), Some(new_token), language, &api, parts)); return Ok(get_index(Some(userid), Some(new_csrf_token), language, &api, parts));
} }
_ => { _ => {
tokio::time::delay_until(Instant::from_std(delay_unauth_time)).await; tokio::time::delay_until(Instant::from_std(delay_unauth_time)).await;