GetBucketInfo: properly return keys that have local aliases even if they have no permissions

src/api/admin/bucket.rs

@@ -690,45 +690,36 @@ async fn bucket_info_results(
 		.map(|x| x.filtered_values(&garage.system.cluster_layout()))
 		.unwrap_or_default();
 
-	let mut relevant_keys = HashMap::new();
+	let state = bucket.state.as_option().unwrap();
-	for (k, _) in bucket
+
-		.state
+	let keys1 = state
-		.as_option()
-		.unwrap()
 		.authorized_keys
 		.items()
 		.iter()
-	{
+		.filter(|(_, p)| p.is_any())
-		if let Some(key) = garage
+		.map(|(k, _)| k);
-			.key_table
+	let keys2 = state
-			.get(&EmptyKey, k)
-			.await?
-			.filter(|k| !k.is_deleted())
-		{
-			if !key.state.is_deleted() {
-				relevant_keys.insert(k.clone(), key);
-			}
-		}
-	}
-	for ((k, _), _, _) in bucket
-		.state
-		.as_option()
-		.unwrap()
 		.local_aliases
 		.items()
 		.iter()
-	{
+		.filter(|(_, _, p)| *p)
-		if relevant_keys.contains_key(k) {
+		.map(|((k, _), _, _)| k);
+
+	let mut relevant_keys = HashMap::new();
+	for key_id in keys1.chain(keys2) {
+		if relevant_keys.contains_key(key_id) {
 			continue;
 		}
-		if let Some(key) = garage.key_table.get(&EmptyKey, k).await? {
+		if let Some(key) = garage.key_table.get(&EmptyKey, key_id).await? {
-			if !key.state.is_deleted() {
+			relevant_keys.insert(key_id.clone(), key);
-				relevant_keys.insert(k.clone(), key);
+		} else {
-			}
+			warn!(
+				"Bucket {:?} references non-existent key {}",
+				bucket.id, key_id
+			);
 		}
 	}
-
+	relevant_keys.retain(|_, k| !k.is_deleted());
-	let state = bucket.state.as_option().unwrap();
 
 	let quotas = state.quotas.get();
 	let res = GetBucketInfoResponse {
@@ -768,29 +759,30 @@ async fn bucket_info_results(
 		}),
 		keys: relevant_keys
 			.into_values()
-			.filter_map(|key| {
+			.map(|key| {
-				let p = key.state.as_option().unwrap();
+				let st = key.state.as_option().unwrap();
-				let permissions = p
+				let permissions = st
 					.authorized_buckets
 					.get(&bucket.id)
-					.filter(|p| p.is_any())
 					.map(|p| ApiBucketKeyPerm {
 						read: p.allow_read,
 						write: p.allow_write,
 						owner: p.allow_owner,
-					})?;
+					})
-				Some(GetBucketInfoKey {
+					.unwrap_or_default();
+				let bucket_local_aliases = st
+					.local_aliases
+					.items()
+					.iter()
+					.filter(|(_, _, b)| b.into_inner() == Some(bucket.id))
+					.map(|(n, _, _)| n.to_string())
+					.collect::<Vec<_>>();
+				GetBucketInfoKey {
 					access_key_id: key.key_id,
-					name: p.name.get().to_string(),
+					name: st.name.get().to_string(),
 					permissions,
-					bucket_local_aliases: p
+					bucket_local_aliases,
-						.local_aliases
+				}
-						.items()
-						.iter()
-						.filter(|(_, _, b)| b.into_inner() == Some(bucket.id))
-						.map(|(n, _, _)| n.to_string())
-						.collect::<Vec<_>>(),
-				})
 			})
 			.collect::<Vec<_>>(),
 		objects: *counters.get(OBJECTS).unwrap_or(&0),