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 C04986B839 for ; Tue, 21 Sep 2021 07:59:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5CA288E97 for ; Tue, 21 Sep 2021 07:59:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 5840F8E20 for ; Tue, 21 Sep 2021 07:58:58 +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 28BB3449E7; Tue, 21 Sep 2021 07:58:58 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Tue, 21 Sep 2021 07:58:46 +0200 Message-Id: <20210921055854.3799470-9-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210921055854.3799470-1-dietmar@proxmox.com> References: <20210921055854.3799470-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.609 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rest.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 08/16] rest server: simplify get_index() method signature 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: Tue, 21 Sep 2021 05:59:32 -0000 --- src/server/rest.rs | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/server/rest.rs b/src/server/rest.rs index c63b3df8..3cc6bccb 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -33,7 +33,7 @@ use proxmox::tools::fs::CreateOptions; use pbs_tools::compression::{DeflateEncoder, Level}; use pbs_tools::stream::AsyncReaderStream; -use pbs_api_types::{Authid, Userid}; +use pbs_api_types::Authid; use proxmox_rest_server::{ ApiConfig, FileLogger, FileLogOptions, AuthError, RestEnvironment, CompressionMethod, extract_cookie, normalize_uri_path, @@ -469,12 +469,27 @@ pub async fn handle_api_request, - csrf_token: Option, + auth_id: Option, language: Option, api: &Arc, parts: Parts, ) -> Response { + + let (userid, csrf_token) = match auth_id { + Some(auth_id) => { + let auth_id = auth_id.parse::(); + match auth_id { + Ok(auth_id) if !auth_id.is_token() => { + let userid = auth_id.user().clone(); + let new_csrf_token = assemble_csrf_prevention_token(csrf_secret(), &userid); + (Some(userid), Some(new_csrf_token)) + } + _ => (None, None) + } + } + None => (None, None), + }; + let nodename = proxmox::tools::nodename(); let user = userid.as_ref().map(|u| u.as_str()).unwrap_or(""); @@ -787,25 +802,14 @@ async fn handle_request( let language = extract_lang_header(&parts.headers); match auth.check_auth(&parts.headers, &method) { Ok(auth_id) => { - let auth_id: Authid = auth_id.parse()?; - if !auth_id.is_token() { - let userid = auth_id.user(); - let new_csrf_token = assemble_csrf_prevention_token(csrf_secret(), userid); - return Ok(get_index( - Some(userid.clone()), - Some(new_csrf_token), - language, - &api, - parts, - )); - } + return Ok(get_index(Some(auth_id), language, &api, parts)); } Err(AuthError::Generic(_)) => { tokio::time::sleep_until(Instant::from_std(delay_unauth_time)).await; } Err(AuthError::NoData) => {} } - return Ok(get_index(None, None, language, &api, parts)); + return Ok(get_index(None, language, &api, parts)); } else { let filename = api.find_alias(&components); let compression = extract_compression_method(&parts.headers); -- 2.30.2