fix: enforce security invariant for CMISVGAS

This commit is contained in:
overtrue
2026-11-18 04:54:26 +08:00
parent 217e8224f8
commit 9cefecb045
2 changed files with 64 additions and 8 deletions
+8
View File
@@ -913,6 +913,14 @@ pub struct S3Router<T> {
server_ctx: Option<Arc<ServerContextSlot>>,
}
/// Only control-plane routes may share the console's browser origin. Object Lambda and
/// bucket extensions have dispatch precedence even when their paths resemble console assets.
pub(crate) fn console_listener_route(method: &Method, uri: &Uri, headers: &HeaderMap) -> bool {
is_control_plane_route(method, uri, headers)
&& parse_object_lambda_request(method, uri).is_none()
&& s3_extension::route_key(method, uri).is_none()
}
/// Whether this router answers the request itself rather than an S3 operation: the RustFS extension
/// routes and every control-plane route.
#[cfg(feature = "gateway-stack")]
+56 -8
View File
@@ -1634,6 +1634,7 @@ fn select_s3_stack(
#[derive(Clone)]
struct ControlBodyDigestService<S> {
inner: S,
console_listener: bool,
idle_timeout: Duration,
total_timeout: Duration,
max_body_size: usize,
@@ -1644,6 +1645,7 @@ impl<S> ControlBodyDigestService<S> {
fn new(inner: S, idle_timeout: Duration) -> Self {
Self {
inner,
console_listener: false,
idle_timeout,
total_timeout: Duration::from_secs(30),
max_body_size: rustfs_s3_config().xml_max_body_size,
@@ -1651,6 +1653,11 @@ impl<S> ControlBodyDigestService<S> {
}
}
fn with_console_listener(mut self, enabled: bool) -> Self {
self.console_listener = enabled;
self
}
fn with_virtual_host_domains(mut self, domains: Arc<[String]>) -> Self {
if !domains.is_empty() {
// Startup already validated this same domain set for S3Service.
@@ -1860,6 +1867,11 @@ where
fn call(&mut self, request: HttpRequest<B>) -> Self::Future {
use http_body_util::BodyExt;
if self.console_listener && !admin::router::console_listener_route(request.method(), request.uri(), request.headers()) {
let mut response = Response::new(s3s::Body::empty());
*response.status_mut() = http::StatusCode::NOT_FOUND;
return Box::pin(async move { Ok(response) });
}
let clone = self.inner.clone();
let mut inner = std::mem::replace(&mut self.inner, clone);
let required = control_body_digest_required(&request, self.virtual_host.as_deref());
@@ -2502,13 +2514,18 @@ async fn start_http_server_inner(
b.set_auth(IAMAuth::with_server_context(access_key, secret_key, server_ctx.clone()));
b.set_access(store);
b.set_route(storage::metadata_route::with_metadata_route(
admin::make_admin_route(config.console_enable, admin_server_ctx)?,
metadata_route_host,
website_route_domains,
protocol,
Arc::clone(&server_ctx),
));
let admin_route = admin::make_admin_route(config.console_enable, admin_server_ctx)?;
if config.console_enable {
b.set_route(admin_route);
} else {
b.set_route(storage::metadata_route::with_metadata_route(
admin_route,
metadata_route_host,
website_route_domains,
protocol,
Arc::clone(&server_ctx),
));
}
// Normalize leading/duplicate forward slashes in object keys (MinIO parity).
// AWS S3 accepts keys such as "/foo/bar"; without this, requests like
@@ -3291,9 +3308,10 @@ fn process_connection(
);
let http_service = ControlBodyDigestService::new(s3_service, request_body_idle_timeout)
.with_console_listener(is_console)
.with_virtual_host_domains(vh_domain_hosts.clone());
#[cfg(feature = "swift")]
let http_service = SwiftService::new(true, None, http_service);
let http_service = SwiftService::new(!is_console, None, http_service);
let http_service =
EarlyResponseBodyService::new(http_service, request_body_idle_timeout).with_task_owner(task_owner.clone());
#[cfg(not(feature = "internode-transport"))]
@@ -4352,6 +4370,36 @@ mod tests {
assert_eq!(calls.load(Ordering::SeqCst), 0);
}
#[tokio::test]
async fn console_listener_isolates_object_routes() {
use tower::ServiceExt;
let inner = tower::service_fn(|_: HttpRequest<ControlRequestBody>| async {
Ok::<_, Infallible>(Response::new(s3s::Body::empty()))
});
let data = ControlBodyDigestService::new(inner, Duration::from_secs(1));
let console = data.clone().with_console_listener(true);
for (uri, expected) in [
("/bucket/notes.txt", StatusCode::NOT_FOUND),
("/bucket/notes.txt?response-content-type=text%2Fplain", StatusCode::NOT_FOUND),
("/favicon.ico?events", StatusCode::NOT_FOUND),
("/rustfs/admin/v3/info?lambdaArn=example", StatusCode::NOT_FOUND),
("/favicon.ico", StatusCode::OK),
("/rustfs/admin/v3/info", StatusCode::OK),
] {
for signed in [false, true] {
let request = || {
let mut req = HttpRequest::builder().uri(uri);
if signed {
req = req.header("authorization", "routing-test");
}
req.body(s3s::Body::empty()).unwrap()
};
assert_eq!(console.clone().oneshot(request()).await.unwrap().status(), expected, "{uri}");
assert_eq!(data.clone().oneshot(request()).await.unwrap().status(), StatusCode::OK, "{uri}");
}
}
}
#[tokio::test]
async fn control_body_digest_preserves_streaming_uploads_and_checks_config_md5() {
use tower::ServiceExt;