gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-09-20 01:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(admin): keep the gateway key inventory off the s3s surface (#7817)

Browse Source 
The gateway key inventory handler added in #7785 imported s3s directly and built four errors with s3_error!, pushing the s3s footprint ratchet to 210 files and 1592 s3_error! lines on main. Route its S3 types and error construction through the crate::admin::storage_api::s3 facade like sibling admin handlers; the codes, HTTP statuses and messages are unchanged, and a new unit test pins them.

Co-authored-by: cxymds <cxymds@gmail.com>
Co-authored-by: Hauser <housemecn@gmail.com>
This commit is contained in:
Chris
2026-09-14 21:04:45 +08:00
committed by GitHub
parent 6b2dd06ce6
commit dd847d8e4c
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/admin/handlers/gateway_key_inventory.rs
+26 -6
View File
@@ -31,13 +31,13 @@ use crate::admin::router::{AdminOperation, Operation, S3Router};
use crate::admin::runtime_sources::current_object_store_handle;
use crate::admin::storage_api::contract::bucket::{BucketOperations as _, BucketOptions};
use crate::admin::storage_api::contract::list::ListOperations as _;
use crate::admin::storage_api::s3::{self, Body, S3ErrorCode, S3Request, S3Response, S3Result};
use crate::error::ApiError;
use crate::server::ADMIN_PREFIX;
use http::StatusCode;
use hyper::Method;
use matchit::Params;
use rustfs_policy::policy::action::{Action, AdminAction};
use s3s::{Body, S3Request, S3Response, S3Result, s3_error};
use serde::Serialize;
use std::collections::BTreeMap;
@@ -196,17 +196,17 @@ fn parse_inventory_query(query: Option<&str>) -> S3Result<InventoryQuery> {
match key.as_ref() {
"bucket" => {
crate::storage::ecstore_bucket::utils::check_valid_bucket_name_strict(&value)
.map_err(|_| s3_error!(InvalidArgument, "invalid bucket name"))?;
.map_err(|_| s3::error(S3ErrorCode::InvalidArgument, "invalid bucket name"))?;
bucket = Some(value.into_owned());
}
"max-findings" => {
max_findings = Some(
value
.parse::<usize>()
.map_err(|_| s3_error!(InvalidArgument, "max-findings must be a positive integer"))?,
.map_err(|_| s3::error(S3ErrorCode::InvalidArgument, "max-findings must be a positive integer"))?,
);
}
other => return Err(s3_error!(InvalidArgument, "unknown query parameter: {other}")),
other => return Err(s3::error(S3ErrorCode::InvalidArgument, format!("unknown query parameter: {other}"))),
}
}
Ok(InventoryQuery {
@@ -231,7 +231,8 @@ impl Operation for GatewayKeyInventoryHandler {
async fn call(&self, req: S3Request<Body>, _params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
let cred = authorize_admin_request(&req, vec![Action::AdminAction(AdminAction::InspectDataAction)]).await?;
let query = parse_inventory_query(req.uri.query())?;
let store = current_object_store_handle().ok_or_else(|| s3_error!(InternalError, "object store not initialized"))?;
let store =
current_object_store_handle().ok_or_else(|| s3::error(S3ErrorCode::InternalError, "object store not initialized"))?;
let buckets = match query.bucket {
Some(bucket) => vec![bucket],
@@ -273,7 +274,6 @@ impl Operation for GatewayKeyInventoryHandler {
mod tests {
use super::*;
use http::HeaderMap;
use s3s::S3ErrorCode;
#[test]
fn keys_the_gateway_reaches_are_not_reported() {
@@ -378,6 +378,26 @@ mod tests {
assert!(parse_inventory_query(Some("prefix=x")).is_err());
}
#[test]
fn query_errors_keep_their_s3_code_status_and_message() {
let cases = [
("bucket=Bad_Name", "invalid bucket name"),
("max-findings=-1", "max-findings must be a positive integer"),
("prefix=x", "unknown query parameter: prefix"),
];
for (query, message) in cases {
let err = parse_inventory_query(Some(query)).expect_err(query);
assert_eq!(err.code(), &S3ErrorCode::InvalidArgument, "{query}");
assert_eq!(err.status_code(), Some(StatusCode::BAD_REQUEST), "{query}");
assert_eq!(err.message(), Some(message), "{query}");
}
let err = s3::error(S3ErrorCode::InternalError, "object store not initialized");
assert_eq!(err.code(), &S3ErrorCode::InternalError);
assert_eq!(err.status_code(), Some(StatusCode::INTERNAL_SERVER_ERROR));
assert_eq!(err.message(), Some("object store not initialized"));
}
#[tokio::test]
async fn a_request_without_credentials_is_refused_before_any_listing() {
let req = S3Request {