From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id C511E1FF0AB for ; Wed, 07 Oct 2026 14:34:33 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 1FE3721323; Wed, 07 Oct 2026 14:34:33 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox 2/3] s3-client: factor out request signing and related header updates Date: Wed, 7 Oct 2026 14:34:05 +0200 Message-ID: <20261007123406.429342-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261007123406.429342-1-c.ebner@proxmox.com> References: <20261007123406.429342-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1791376468626 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.577 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) 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 Message-ID-Hash: 3ED2YZBJKGPAGUGGSMIT26WPFNU26MFA X-Message-ID-Hash: 3ED2YZBJKGPAGUGGSMIT26WPFNU26MFA X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Currently this is performed as part of the request prepare, but since the request time might be to skewed on retries which can in principle happen after a very long time, this needs to be updated on-demand. Therefore move the required code into a dedicated reusable helper. Signed-off-by: Christian Ebner --- proxmox-s3-client/src/client.rs | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs index 7903f090..631bbd0f 100644 --- a/proxmox-s3-client/src/client.rs +++ b/proxmox-s3-client/src/client.rs @@ -420,12 +420,6 @@ impl S3Client { let payload_digest = hex::encode(hasher.finish()); let payload_len = contents.len(); - let epoch = proxmox_time::epoch_i64(); - let datetime = proxmox_time::strftime_utc(AWS_SIGN_V4_DATETIME_FORMAT, epoch)?; - - request - .headers_mut() - .insert("x-amz-date", HeaderValue::from_str(&datetime)?); request .headers_mut() .insert("host", HeaderValue::from_str(&host_header)?); @@ -452,13 +446,27 @@ impl S3Client { .insert("Content-MD5", HeaderValue::from_str(&md5_digest)?); } - let signature = aws_sign_v4_signature(&request, &self.options, epoch, &payload_digest)?; + self.sign_request(&mut request, &payload_digest)?; - request + Ok(request) + } + + /// Set or update the `x-amz-date` header to the current time, calculate the request signature + /// based on the provided payload digest and set or update the authorization header accordingly. + fn sign_request(&self, request: &mut Request, payload_digest: &str) -> Result<(), Error> { + let epoch = proxmox_time::epoch_i64(); + let datetime = proxmox_time::strftime_utc(AWS_SIGN_V4_DATETIME_FORMAT, epoch)?; + + let _prev_date = request + .headers_mut() + .insert("x-amz-date", HeaderValue::from_str(&datetime)?); + + let signature = aws_sign_v4_signature(&request, &self.options, epoch, &payload_digest)?; + let _prev_auth = request .headers_mut() .insert(header::AUTHORIZATION, HeaderValue::from_str(&signature)?); - Ok(request) + Ok(()) } /// Send API request to the configured endpoint using the inner https client. -- 2.47.3