refactor: route action credentials through app context (#3783)

This commit is contained in:
Zhengchao An
2026-06-23 16:29:46 +08:00
committed by GitHub
parent e42c6df0e8
commit a62e2b6c94
5 changed files with 53 additions and 14 deletions
+5 -4
View File
@@ -12,9 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::app::context::resolve_action_credentials;
use http::HeaderMap;
use http::Uri;
use rustfs_credentials::{Credentials, get_global_action_cred};
use rustfs_credentials::Credentials;
use rustfs_iam::error::Error as IamError;
use rustfs_iam::sys::{
SESSION_POLICY_NAME, get_claims_from_token_with_secret, get_claims_from_token_with_secret_allow_missing_exp,
@@ -330,7 +331,7 @@ pub async fn check_key_valid(session_token: &str, access_key: &str) -> S3Result<
return Err(s3_error!(InvalidAccessKeyId, "Keystone authentication requires X-Auth-Token header"));
}
let Some(mut cred) = get_global_action_cred() else {
let Some(mut cred) = resolve_action_credentials() else {
return Err(S3Error::with_message(
S3ErrorCode::InternalError,
format!("get_global_action_cred {:?}", IamError::IamSysNotInitialized),
@@ -434,7 +435,7 @@ pub fn check_claims_from_token(token: &str, cred: &Credentials) -> S3Result<Hash
return Err(s3_error!(InvalidRequest, "invalid access key is temp and expired"));
}
let Some(sys_cred) = get_global_action_cred() else {
let Some(sys_cred) = resolve_action_credentials() else {
return Err(s3_error!(InternalError, "action cred not init"));
};
@@ -610,7 +611,7 @@ pub fn get_condition_values_with_query_and_client_info(
cred.access_key.clone()
};
let sys_cred = get_global_action_cred().unwrap_or_default();
let sys_cred = resolve_action_credentials().unwrap_or_default();
let claims = &cred.claims;
+2 -1
View File
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::app::context::resolve_action_credentials;
use crate::storage::ecfs::FS;
use http::{HeaderMap, Method};
use percent_encoding::{AsciiSet, CONTROLS, utf8_percent_encode};
@@ -139,7 +140,7 @@ impl ProtocolStorageClient {
) -> S3Result<S3Request<T>> {
let mut extensions = http::Extensions::default();
let is_owner = if let Some(global_cred) = rustfs_credentials::get_global_action_cred() {
let is_owner = if let Some(global_cred) = resolve_action_credentials() {
params.access_key == global_cred.access_key
} else {
false
+3 -2
View File
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::app::context::resolve_action_credentials;
use crate::server::{convert_ecstore_object_info, is_audit_module_enabled, is_notify_module_enabled};
use crate::storage::access::{ReqInfo, request_context_from_req};
use crate::storage::request_context::{RequestContext, extract_request_id_from_headers};
@@ -311,8 +312,8 @@ impl OperationHelper {
final_builder = final_builder.error(err);
}
if let Some(sk) = rustfs_credentials::get_global_access_key_opt() {
final_builder = final_builder.access_key(&sk);
if let Some(cred) = resolve_action_credentials() {
final_builder = final_builder.access_key(&cred.access_key);
}
// Inject OpenTelemetry trace context into audit tags for distributed tracing correlation