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 B9DE56B3A1 for ; Mon, 20 Sep 2021 11:14:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 50B931E414 for ; Mon, 20 Sep 2021 11:13:47 +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 E6EA71E3D8 for ; Mon, 20 Sep 2021 11:13:45 +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 C0069449A0; Mon, 20 Sep 2021 11:13:45 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Mon, 20 Sep 2021 11:13:36 +0200 Message-Id: <20210920091340.3251578-11-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210920091340.3251578-1-dietmar@proxmox.com> References: <20210920091340.3251578-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.633 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 Subject: [pbs-devel] [PATCH proxmox-backup rebase 11/15] rest server: do not use pbs_api_types::Authid 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, 20 Sep 2021 09:14:17 -0000 --- src/server/rest.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/server/rest.rs b/src/server/rest.rs index fab9705c..f0187a67 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -33,7 +33,6 @@ use proxmox::tools::fs::CreateOptions; use pbs_tools::compression::{DeflateEncoder, Level}; use pbs_tools::stream::AsyncReaderStream; -use pbs_api_types::Authid; use pbs_server::{ ApiConfig, FileLogger, FileLogOptions, AuthError, RestEnvironment, CompressionMethod, extract_cookie, normalize_uri_path, @@ -44,6 +43,8 @@ extern "C" { fn tzset(); } +struct AuthStringExtension(String); + struct EmptyUserInformation {} impl UserInformation for EmptyUserInformation { @@ -176,8 +177,8 @@ fn log_response( ); } if let Some(logfile) = logfile { - let auth_id = match resp.extensions().get::() { - Some(auth_id) => auth_id.to_string(), + let auth_id = match resp.extensions().get::() { + Some(AuthStringExtension(auth_id)) => auth_id.clone(), None => "-".to_string(), }; let now = proxmox::tools::time::epoch_i64(); @@ -198,6 +199,7 @@ fn log_response( )); } } + pub fn auth_logger() -> Result { let backup_user = pbs_config::backup_user()?; @@ -720,8 +722,7 @@ async fn handle_request( }; if let Some(auth_id) = auth_id { - let auth_id: Authid = auth_id.parse()?; - response.extensions_mut().insert(auth_id); + response.extensions_mut().insert(AuthStringExtension(auth_id)); } return Ok(response); -- 2.30.2