Deuxfleurs/garage
34
65
Fork 83
Code Issues 95 Pull requests 16 Releases 32 Wiki Activity

WIP: Garage v2 #948

Draft
lx wants to merge 125 commits from next-v2 into main
pull from: next-v2
merge into: Deuxfleurs:main
Conversation 0 Commits 125 Files changed 113 +3 -5
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9dcc5232a6 - Show all commits

8
src/api/admin/api_server.rs
View file

@ -169,8 +169,7 @@ impl AdminApiServer {
};
if token_required {
verify_authorization(&self.garage, global_token_hash, auth_header, request.name())
.await?;
verify_authorization(&self.garage, global_token_hash, auth_header, request.name())?;
}
match request {
@ -245,7 +244,7 @@ fn hash_bearer_token(token: &str) -> String {
.to_string()
}
async fn verify_authorization(
fn verify_authorization(
garage: &Garage,
global_token_hash: Option<&str>,
auth_header: Option<hyper::http::HeaderValue>,
@ -271,8 +270,7 @@ async fn verify_authorization(
let token_hash_string = if let Some((prefix, _)) = token.split_once('.') {
garage
.admin_token_table
.get(&EmptyKey, &prefix.to_string())
.await?
.get_local(&EmptyKey, &prefix.to_string())?
.and_then(|k| k.state.into_option())
.filter(|p| {
p.expiration