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

admin API refactoring (step 1) #939

Merged
lx merged 19 commits from refactor-admin into next-v2 2025-01-29 20:42:57 +00:00
Conversation 0 Commits 19 Files changed 22 +15 -6
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4cb45bd398 - Show all commits

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

@ -4,7 +4,7 @@ use std::sync::Arc;
use argon2::password_hash::PasswordHash; use argon2::password_hash::PasswordHash;
use async_trait::async_trait; use async_trait::async_trait;
use http::header::AUTHORIZATION; use http::header::{HeaderValue, ACCESS_CONTROL_ALLOW_ORIGIN, AUTHORIZATION};
use hyper::{body::Incoming as IncomingBody, Request, Response, StatusCode}; use hyper::{body::Incoming as IncomingBody, Request, Response, StatusCode};
use tokio::sync::watch; use tokio::sync::watch;
@ -134,6 +134,8 @@ impl ApiHandler for AdminApiServer {
Endpoint::New(_) => AdminApiRequest::from_request(req).await?, Endpoint::New(_) => AdminApiRequest::from_request(req).await?,
}; };
info!("Admin request: {}", request.name());
let required_auth_hash = let required_auth_hash =
match request.authorization_type() { match request.authorization_type() {
Authorization::None => None, Authorization::None => None,
@ -162,7 +164,10 @@ impl ApiHandler for AdminApiServer {
AdminApiRequest::Metrics(_req) => self.handle_metrics(), AdminApiRequest::Metrics(_req) => self.handle_metrics(),
req => { req => {
let res = req.handle(&self.garage).await?; let res = req.handle(&self.garage).await?;
json_ok_response(&res) let mut res = json_ok_response(&res)?;
res.headers_mut()
.insert(ACCESS_CONTROL_ALLOW_ORIGIN, HeaderValue::from_static("*"));
Ok(res)
} }
} }
} }

1
src/api/admin/router_v2.rs
View file

@ -219,6 +219,7 @@ impl AdminApiRequest {
/// Get the kind of authorization which is required to perform the operation. /// Get the kind of authorization which is required to perform the operation.
pub fn authorization_type(&self) -> Authorization { pub fn authorization_type(&self) -> Authorization {
match self { match self {
Self::Options(_) => Authorization::None,
Self::Health(_) => Authorization::None, Self::Health(_) => Authorization::None,
Self::CheckDomain(_) => Authorization::None, Self::CheckDomain(_) => Authorization::None,
Self::Metrics(_) => Authorization::MetricsToken, Self::Metrics(_) => Authorization::MetricsToken,

7
src/api/admin/special.rs
View file

@ -2,7 +2,9 @@ use std::sync::Arc;
use async_trait::async_trait; use async_trait::async_trait;
use http::header::{ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN, ALLOW}; use http::header::{
ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN, ALLOW,
};
use hyper::{Response, StatusCode}; use hyper::{Response, StatusCode};
use garage_model::garage::Garage; use garage_model::garage::Garage;
@ -20,9 +22,10 @@ impl EndpointHandler for OptionsRequest {
async fn handle(self, _garage: &Arc<Garage>) -> Result<Response<ResBody>, Error> { async fn handle(self, _garage: &Arc<Garage>) -> Result<Response<ResBody>, Error> {
Ok(Response::builder() Ok(Response::builder()
.status(StatusCode::NO_CONTENT) .status(StatusCode::OK)
.header(ALLOW, "OPTIONS,GET,POST") .header(ALLOW, "OPTIONS,GET,POST")
.header(ACCESS_CONTROL_ALLOW_METHODS, "OPTIONS,GET,POST") .header(ACCESS_CONTROL_ALLOW_METHODS, "OPTIONS,GET,POST")
.header(ACCESS_CONTROL_ALLOW_HEADERS, "authorization,content-type")
.header(ACCESS_CONTROL_ALLOW_ORIGIN, "*") .header(ACCESS_CONTROL_ALLOW_ORIGIN, "*")
.body(empty_body())?) .body(empty_body())?)
} }