From 53f71b3a57b3c1828292e26b7865d31e9bec44d6 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 15 Dec 2021 18:36:15 +0100
Subject: Implement bucket alias and bucket unalias

---
 src/model/bucket_helper.rs | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'src/model/bucket_helper.rs')

diff --git a/src/model/bucket_helper.rs b/src/model/bucket_helper.rs
index e0720b4e..c1280afa 100644
--- a/src/model/bucket_helper.rs
+++ b/src/model/bucket_helper.rs
@@ -14,13 +14,27 @@ impl<'a> BucketHelper<'a> {
 		&self,
 		bucket_name: &String,
 	) -> Result<Option<Uuid>, Error> {
-		Ok(self
-			.0
-			.bucket_alias_table
-			.get(&EmptyKey, bucket_name)
-			.await?
-			.map(|x| x.state.get().as_option().map(|x| x.bucket_id))
-			.flatten())
+		let hexbucket = hex::decode(bucket_name.as_str())
+			.ok()
+			.map(|by| Uuid::try_from(&by))
+			.flatten();
+		if let Some(bucket_id) = hexbucket {
+			Ok(self
+				.0
+				.bucket_table
+				.get(&bucket_id, &EmptyKey)
+				.await?
+				.filter(|x| !x.state.is_deleted())
+				.map(|_| bucket_id))
+		} else {
+			Ok(self
+				.0
+				.bucket_alias_table
+				.get(&EmptyKey, bucket_name)
+				.await?
+				.map(|x| x.state.get().as_option().map(|x| x.bucket_id))
+				.flatten())
+		}
 	}
 
 	#[allow(clippy::ptr_arg)]
-- 
cgit v1.2.3