From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EDCFA60925 for ; Mon, 19 Oct 2020 09:40:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E10F429812 for ; Mon, 19 Oct 2020 09:39:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C8F0C29806 for ; Mon, 19 Oct 2020 09:39:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8B7DF45D69 for ; Mon, 19 Oct 2020 09:39:34 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 19 Oct 2020 09:39:07 +0200 Message-Id: <20201019073919.588521-4-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201019073919.588521-1-f.gruenbichler@proxmox.com> References: <20201019073919.588521-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.033 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 03/15] REST: rename token to csrf_token X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 07:40:06 -0000 for easier differentiation with (future) api_token Signed-off-by: Fabian Grünbichler --- src/server/rest.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/server/rest.rs b/src/server/rest.rs index 7235a291..c650a3aa 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -542,18 +542,18 @@ fn extract_auth_data(headers: &http::HeaderMap) -> (Option, Option Some(v.to_owned()), _ => None, }; - (ticket, token, language) + (ticket, csrf_token, language) } fn check_auth( method: &hyper::Method, ticket: &Option, - token: &Option, + csrf_token: &Option, user_info: &CachedUserInfo, ) -> Result { let ticket_lifetime = tools::ticket::TICKET_LIFETIME; @@ -567,8 +567,8 @@ fn check_auth( } if method != hyper::Method::GET { - if let Some(token) = token { - verify_csrf_prevention_token(csrf_secret(), &userid, &token, -300, ticket_lifetime)?; + if let Some(csrf_token) = csrf_token { + verify_csrf_prevention_token(csrf_secret(), &userid, &csrf_token, -300, ticket_lifetime)?; } else { bail!("missing CSRF prevention token"); } @@ -630,8 +630,8 @@ async fn handle_request( } if auth_required { - let (ticket, token, _) = extract_auth_data(&parts.headers); - match check_auth(&method, &ticket, &token, &user_info) { + let (ticket, csrf_token, _) = extract_auth_data(&parts.headers); + match check_auth(&method, &ticket, &csrf_token, &user_info) { Ok(userid) => rpcenv.set_user(Some(userid.to_string())), Err(err) => { // always delay unauthorized calls by 3 seconds (from start of request) @@ -684,12 +684,12 @@ async fn handle_request( } 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 { - match check_auth(&method, &ticket, &token, &user_info) { + match check_auth(&method, &ticket, &csrf_token, &user_info) { Ok(userid) => { - let new_token = assemble_csrf_prevention_token(csrf_secret(), &userid); - return Ok(get_index(Some(userid), Some(new_token), language, &api, parts)); + let new_csrf_token = assemble_csrf_prevention_token(csrf_secret(), &userid); + return Ok(get_index(Some(userid), Some(new_csrf_token), language, &api, parts)); } _ => { tokio::time::delay_until(Instant::from_std(delay_unauth_time)).await; -- 2.20.1