From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D61CA1FF187 for ; Mon, 28 Jul 2025 08:45:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B0FA71A2CB; Mon, 28 Jul 2025 08:47:05 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 28 Jul 2025 08:46:37 +0200 Message-ID: <20250728064645.158414-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250728064645.158414-1-c.ebner@proxmox.com> References: <20250728064645.158414-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753685213011 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.043 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 2/4] s3 client: make bucket name optional in S3 client options 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Not all operations require the bucket name, e.g. the list buckets operation works also without the bucket name. Since vhost style addressing might contain the bucket name as subdomain template pattern, strip the pattern in that case and use the url without the subdomain. Signed-off-by: Christian Ebner --- proxmox-s3-client/examples/s3_client.rs | 2 +- proxmox-s3-client/src/client.rs | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/proxmox-s3-client/examples/s3_client.rs b/proxmox-s3-client/examples/s3_client.rs index 1cbb3939..4a9625cb 100644 --- a/proxmox-s3-client/examples/s3_client.rs +++ b/proxmox-s3-client/examples/s3_client.rs @@ -28,7 +28,7 @@ async fn run() -> Result<(), anyhow::Error> { // Must match the port the api is listening on port: Some(7480), // Name of the bucket to be used - bucket: "testbucket".to_string(), + bucket: Some("testbucket".to_string()), common_prefix: "teststore".to_string(), path_style: false, access_key: "".to_string(), diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs index 3a981bf4..91188f1a 100644 --- a/proxmox-s3-client/src/client.rs +++ b/proxmox-s3-client/src/client.rs @@ -54,7 +54,7 @@ pub struct S3ClientOptions { /// Port to access S3 object store. pub port: Option, /// Bucket to access S3 object store. - pub bucket: String, + pub bucket: Option, /// Common prefix within bucket to use for objects keys for this client instance. pub common_prefix: String, /// Use path style bucket addressing over vhost style. @@ -76,7 +76,7 @@ impl S3ClientOptions { pub fn from_config( config: S3ClientConfig, secret_key: String, - bucket: String, + bucket: Option, common_prefix: String, ) -> Self { Self { @@ -154,9 +154,16 @@ impl S3Client { } else { options.endpoint.clone() }; + let authority = authority_template - .replace("{{bucket}}", &options.bucket) .replace("{{region}}", &options.region); + + let authority = if let Some(bucket) = &options.bucket { + authority.replace("{{bucket}}", bucket) + } else { + authority.replace("{{bucket}}.", "") + }; + let authority = Authority::try_from(authority)?; let put_rate_limiter = options.put_rate_limit.map(|limit| { @@ -452,8 +459,12 @@ impl S3Client { source_key: S3ObjectKey, destination_key: S3ObjectKey, ) -> Result { + let bucket = match &self.options.bucket { + Some(bucket) => bucket, + None => bail!("missing bucket name for copy source"), + }; let copy_source = - source_key.to_copy_source_key(&self.options.bucket, &self.options.common_prefix); + source_key.to_copy_source_key(bucket, &self.options.common_prefix); let copy_source = aws_sign_v4_uri_encode(©_source, true); let destination_key = destination_key.to_full_key(&self.options.common_prefix); let destination_key = aws_sign_v4_uri_encode(&destination_key, true); @@ -652,7 +663,11 @@ impl S3Client { } let path = aws_sign_v4_uri_encode(path, true); let mut path_and_query = if self.options.path_style { - format!("/{bucket}/{path}", bucket = self.options.bucket) + if let Some(bucket) = &self.options.bucket { + format!("/{bucket}/{path}") + } else { + format!("/{path}") + } } else { format!("/{path}") }; -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel