gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-24 13:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(admin): move kms dynamic route registration (#1798)

Browse Source
This commit is contained in:
安正超
2026-02-13 18:34:02 +08:00
committed by GitHub
parent 6bf4fd1273
commit 53d601e6ec
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/admin/handlers/kms.rs
+1 -35
View File
@@ -112,7 +112,7 @@ fn extract_query_params(uri: &hyper::Uri) -> HashMap<String, String> {
pub fn register_kms_route(r: &mut S3Router<AdminOperation>) -> std::io::Result<()> { pub fn register_kms_route(r: &mut S3Router<AdminOperation>) -> std::io::Result<()> {
register_kms_management_route(r)?; register_kms_management_route(r)?;
register_kms_dynamic_route(r)?; kms_dynamic::register_kms_dynamic_route(r)?;
register_kms_key_route(r)?; register_kms_key_route(r)?;
Ok(()) Ok(())
@@ -164,40 +164,6 @@ fn register_kms_management_route(r: &mut S3Router<AdminOperation>) -> std::io::R
Ok(()) Ok(())
} }
fn register_kms_dynamic_route(r: &mut S3Router<AdminOperation>) -> std::io::Result<()> {
r.insert(
Method::POST,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/configure").as_str(),
AdminOperation(&kms_dynamic::ConfigureKmsHandler {}),
)?;
r.insert(
Method::POST,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/start").as_str(),
AdminOperation(&kms_dynamic::StartKmsHandler {}),
)?;
r.insert(
Method::POST,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/stop").as_str(),
AdminOperation(&kms_dynamic::StopKmsHandler {}),
)?;
r.insert(
Method::GET,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/service-status").as_str(),
AdminOperation(&kms_dynamic::GetKmsStatusHandler {}),
)?;
r.insert(
Method::POST,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/reconfigure").as_str(),
AdminOperation(&kms_dynamic::ReconfigureKmsHandler {}),
)?;
Ok(())
}
fn register_kms_key_route(r: &mut S3Router<AdminOperation>) -> std::io::Result<()> { fn register_kms_key_route(r: &mut S3Router<AdminOperation>) -> std::io::Result<()> {
r.insert( r.insert(
Method::POST, Method::POST,
rustfs/src/admin/handlers/kms_dynamic.rs
+37 -3
View File
@@ -15,10 +15,10 @@
//! KMS dynamic configuration admin API handlers //! KMS dynamic configuration admin API handlers
use crate::admin::auth::validate_admin_request; use crate::admin::auth::validate_admin_request;
use crate::admin::router::Operation; use crate::admin::router::{AdminOperation, Operation, S3Router};
use crate::auth::{check_key_valid, get_session_token}; use crate::auth::{check_key_valid, get_session_token};
use crate::server::RemoteAddr; use crate::server::{ADMIN_PREFIX, RemoteAddr};
use hyper::StatusCode; use hyper::{Method, StatusCode};
use matchit::Params; use matchit::Params;
use rustfs_config::MAX_ADMIN_REQUEST_BODY_SIZE; use rustfs_config::MAX_ADMIN_REQUEST_BODY_SIZE;
use rustfs_ecstore::config::com::{read_config, save_config}; use rustfs_ecstore::config::com::{read_config, save_config};
@@ -80,6 +80,40 @@ pub async fn load_kms_config() -> Option<KmsConfig> {
} }
} }
pub fn register_kms_dynamic_route(r: &mut S3Router<AdminOperation>) -> std::io::Result<()> {
r.insert(
Method::POST,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/configure").as_str(),
AdminOperation(&ConfigureKmsHandler {}),
)?;
r.insert(
Method::POST,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/start").as_str(),
AdminOperation(&StartKmsHandler {}),
)?;
r.insert(
Method::POST,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/stop").as_str(),
AdminOperation(&StopKmsHandler {}),
)?;
r.insert(
Method::GET,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/service-status").as_str(),
AdminOperation(&GetKmsStatusHandler {}),
)?;
r.insert(
Method::POST,
format!("{}{}", ADMIN_PREFIX, "/v3/kms/reconfigure").as_str(),
AdminOperation(&ReconfigureKmsHandler {}),
)?;
Ok(())
}
/// Configure KMS service handler /// Configure KMS service handler
pub struct ConfigureKmsHandler; pub struct ConfigureKmsHandler;