Deuxfleurs/garage
33
58
Fork 80
Code Issues 101 Pull requests 18 Releases 30 Wiki Activity

admin api: fix panic on GetKeyInfo with no args
Some checks are pending
ci/woodpecker/push/debug Pipeline is running
Details
ci/woodpecker/pr/debug Pipeline was successful
Details

Browse source
This commit is contained in:
Alex 2025-01-29 12:46:20 +01:00
parent 4f0b923c4f
commit 1c03941b19
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/api/admin/key.rs
View file

@ -43,15 +43,19 @@ impl EndpointHandler for GetKeyInfoRequest {
type Response = GetKeyInfoResponse; type Response = GetKeyInfoResponse;
async fn handle(self, garage: &Arc<Garage>) -> Result<GetKeyInfoResponse, Error> { async fn handle(self, garage: &Arc<Garage>) -> Result<GetKeyInfoResponse, Error> {
let key = if let Some(id) = self.id { let key = match (self.id, self.search) {
garage.key_helper().get_existing_key(&id).await? (Some(id), None) => garage.key_helper().get_existing_key(&id).await?,
} else if let Some(search) = self.search { (None, Some(search)) => {
garage garage
.key_helper() .key_helper()
.get_existing_matching_key(&search) .get_existing_matching_key(&search)
.await? .await?
} else { }
unreachable!(); _ => {
return Err(Error::bad_request(
"Either id or search must be provided (but not both)",
));
}
}; };
Ok(key_info_results(garage, key, self.show_secret_key).await?) Ok(key_info_results(garage, key, self.show_secret_key).await?)