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

refactor(admin): route kms handlers through app context (#1967)

Browse Source 
Signed-off-by: 安正超 <anzhengchao@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
安正超
2026-02-26 13:31:59 +08:00
committed by GitHub
parent ae6eacd7e3
commit 0f8bc461d6
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/admin/handlers/kms.rs
+16 -4
View File
@@ -17,11 +17,12 @@
use super::{kms_dynamic, kms_keys, kms_management};
use crate::admin::auth::validate_admin_request;
use crate::admin::router::{AdminOperation, Operation, S3Router};
use crate::app::context::resolve_kms_runtime_service_manager;
use crate::auth::{check_key_valid, get_session_token};
use crate::server::RemoteAddr;
use hyper::{HeaderMap, StatusCode};
use matchit::Params;
use rustfs_kms::get_global_encryption_service;
use rustfs_kms::init_global_kms_service_manager;
use rustfs_policy::policy::action::{Action, AdminAction};
use s3s::header::CONTENT_TYPE;
use s3s::{Body, S3Request, S3Response, S3Result, s3_error};
@@ -29,6 +30,17 @@ use serde::{Deserialize, Serialize};
use serde_json;
use tracing::{error, info, warn};
async fn kms_encryption_service_from_context() -> Option<std::sync::Arc<rustfs_kms::ObjectEncryptionService>> {
let manager = match resolve_kms_runtime_service_manager() {
Some(manager) => manager,
None => {
warn!("KMS service manager not initialized, initializing now as fallback");
init_global_kms_service_manager()
}
};
manager.get_encryption_service().await
}
#[derive(Debug, Serialize, Deserialize)]
pub struct KmsStatusResponse {
pub backend_type: String,
@@ -83,7 +95,7 @@ impl Operation for KmsStatusHandler {
)
.await?;
let Some(service) = get_global_encryption_service().await else {
let Some(service) = kms_encryption_service_from_context().await else {
return Err(s3_error!(InternalError, "KMS service not initialized"));
};
@@ -141,7 +153,7 @@ impl Operation for KmsConfigHandler {
)
.await?;
let Some(service) = get_global_encryption_service().await else {
let Some(service) = kms_encryption_service_from_context().await else {
return Err(s3_error!(InternalError, "KMS service not initialized"));
};
@@ -186,7 +198,7 @@ impl Operation for KmsClearCacheHandler {
)
.await?;
let Some(service) = get_global_encryption_service().await else {
let Some(service) = kms_encryption_service_from_context().await else {
return Err(s3_error!(InternalError, "KMS service not initialized"));
};