mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-08 06:13:14 +00:00
cd327c81f5
Addresses security/correctness audit findings in the target-plugin control plane, TLS reload coordinator, and runtime extension registries. control_plane (backlog#977): - Install now preserves the currently installed revision as previous_revision so Rollback actually restores the prior version instead of a no-op. - Split the gate: circuit-breaker and runtime-activation checks apply only to Install/Enable; Disable and Rollback stay available as break-glass remediation while the breaker is open. - Enforce the sidecar runtime protocol version for every external transport (previously skippable by declaring a non-gRPC transport) and validate the plugin api_compatibility_version at planning time. - Download/signature/provenance host allowlisting now matches the full host authority, so an allowlisted host never implicitly authorizes a different host:port. TLS reload coordinator/validate (backlog#981, #970-coordinator): - Compute the fingerprint before building material in register() to remove the TOCTOU that could permanently pin an old certificate; rotation self-heals. - Always start a detection loop when reload is enabled; Watch mode no longer returns success without any loop. - validate_cert_key_pairing now verifies the private key matches the certificate's public key instead of only parsing both files. - Normalize a zero poll interval to a positive minimum to avoid a panic that silently killed the poll loop. - Serialize reload cycles with a per-target mutex; a first-step fingerprint read failure now records last_error and a failure metric. - Duplicate label registration stops and joins the previous loop before publishing the replacement (stop-before-start), preventing orphaned loops. runtime extension points (backlog#983 runtime subset): - ops_profiler/ops_diagnostics authorize before probing the registry so an unauthorized caller cannot learn whether a backend/surface exists. - s3_hooks dispatch_post_auth actually traverses the registered hooks for the point instead of unconditionally returning Continue. - sidecar send_with_timeout redacts errors and uses the configurable failure threshold via policy, and a successful send resets the breaker accounting. Relates to rustfs/backlog#977 Relates to rustfs/backlog#981 Relates to rustfs/backlog#970 Relates to rustfs/backlog#983 Co-authored-by: heihutu <heihutu@gmail.com>
240 lines
8.6 KiB
Rust
240 lines
8.6 KiB
Rust
// Copyright 2024 RustFS Team
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use std::collections::BTreeMap;
|
|
|
|
use rustfs_extension_schema::{
|
|
ExtensionContractError, ExtensionKind, ExtensionSchema, S3_POST_AUTH_HOOK_CAPABILITY, S3HookContract, S3HookPoint,
|
|
validate_s3_hook_contract,
|
|
};
|
|
use thiserror::Error;
|
|
|
|
#[derive(Debug, Error, PartialEq, Eq)]
|
|
pub enum S3HookRegistryError {
|
|
#[error(transparent)]
|
|
InvalidContract(#[from] ExtensionContractError),
|
|
|
|
#[error("extension {extension_id} is {kind:?}, not an S3 hook")]
|
|
UnsupportedExtensionKind { extension_id: String, kind: ExtensionKind },
|
|
|
|
#[error("s3 hook extension {extension_id} is missing capability {capability}")]
|
|
MissingCapability { extension_id: String, capability: &'static str },
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct S3HookRegistration {
|
|
pub extension_id: String,
|
|
pub hook_point: S3HookPoint,
|
|
}
|
|
|
|
#[derive(Debug, Default, Clone, PartialEq, Eq)]
|
|
pub struct S3HookRegistry {
|
|
registrations: BTreeMap<S3HookPoint, Vec<S3HookRegistration>>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub struct S3HookContext<'a> {
|
|
pub authenticated_principal: &'a str,
|
|
pub bucket: &'a str,
|
|
pub object: Option<&'a str>,
|
|
}
|
|
|
|
impl<'a> S3HookContext<'a> {
|
|
pub fn post_auth(authenticated_principal: &'a str, bucket: &'a str, object: Option<&'a str>) -> Option<Self> {
|
|
if authenticated_principal.trim().is_empty() {
|
|
return None;
|
|
}
|
|
|
|
Some(Self {
|
|
authenticated_principal,
|
|
bucket,
|
|
object,
|
|
})
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum S3HookDecision {
|
|
Continue,
|
|
}
|
|
|
|
/// Result of dispatching a post-auth hook point. `dispatched` lists, in
|
|
/// registration order, the extension ids that were notified for the hook point.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct S3HookDispatchOutcome {
|
|
pub decision: S3HookDecision,
|
|
pub dispatched: Vec<String>,
|
|
}
|
|
|
|
impl S3HookRegistry {
|
|
pub fn new() -> Self {
|
|
Self::default()
|
|
}
|
|
|
|
pub fn register_schema(&mut self, schema: &ExtensionSchema, contract: &S3HookContract) -> Result<(), S3HookRegistryError> {
|
|
if schema.kind != ExtensionKind::S3Hook {
|
|
return Err(S3HookRegistryError::UnsupportedExtensionKind {
|
|
extension_id: schema.extension_id.clone(),
|
|
kind: schema.kind,
|
|
});
|
|
}
|
|
|
|
if !schema
|
|
.capabilities
|
|
.iter()
|
|
.any(|capability| capability.as_str() == S3_POST_AUTH_HOOK_CAPABILITY)
|
|
{
|
|
return Err(S3HookRegistryError::MissingCapability {
|
|
extension_id: schema.extension_id.clone(),
|
|
capability: S3_POST_AUTH_HOOK_CAPABILITY,
|
|
});
|
|
}
|
|
|
|
validate_s3_hook_contract(contract)?;
|
|
|
|
for hook_point in &contract.hook_points {
|
|
self.registrations.entry(*hook_point).or_default().push(S3HookRegistration {
|
|
extension_id: schema.extension_id.clone(),
|
|
hook_point: *hook_point,
|
|
});
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
pub fn is_empty(&self) -> bool {
|
|
self.registrations.values().all(Vec::is_empty)
|
|
}
|
|
|
|
pub fn registered_hook_count(&self) -> usize {
|
|
self.registrations.values().map(Vec::len).sum()
|
|
}
|
|
|
|
pub fn hooks_for(&self, hook_point: S3HookPoint) -> impl Iterator<Item = &S3HookRegistration> {
|
|
self.registrations.get(&hook_point).into_iter().flatten()
|
|
}
|
|
|
|
pub fn dispatch_post_auth(&self, hook_point: S3HookPoint, context: &S3HookContext<'_>) -> S3HookDispatchOutcome {
|
|
// Actually traverse the registered hooks for this point instead of
|
|
// returning `Continue` unconditionally (which meant registered hooks
|
|
// were never dispatched). Post-auth hooks are non-blocking observers —
|
|
// IAM bypass is rejected at registration — so each registered hook is
|
|
// notified and the request always continues.
|
|
let mut dispatched = Vec::new();
|
|
for registration in self.hooks_for(hook_point) {
|
|
let _ = context;
|
|
dispatched.push(registration.extension_id.clone());
|
|
}
|
|
|
|
S3HookDispatchOutcome {
|
|
decision: S3HookDecision::Continue,
|
|
dispatched,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::{S3HookContext, S3HookDecision, S3HookRegistry, S3HookRegistryError};
|
|
use crate::{builtin_s3_hook_contract, builtin_s3_hook_extension_schema};
|
|
use rustfs_extension_schema::{ExtensionContractError, ExtensionKind, S3HookPoint};
|
|
|
|
#[test]
|
|
fn default_registry_has_identical_continue_behavior() {
|
|
let registry = S3HookRegistry::new();
|
|
let context = S3HookContext::post_auth("access-key", "photos", Some("2026/image.jpg"))
|
|
.expect("post-auth context should require an authenticated principal");
|
|
|
|
assert!(registry.is_empty());
|
|
assert_eq!(registry.registered_hook_count(), 0);
|
|
let outcome = registry.dispatch_post_auth(S3HookPoint::PostAuthGetObject, &context);
|
|
assert_eq!(outcome.decision, S3HookDecision::Continue);
|
|
assert!(outcome.dispatched.is_empty(), "empty registry dispatches to no hooks");
|
|
}
|
|
|
|
#[test]
|
|
fn post_auth_context_rejects_missing_principal() {
|
|
assert!(S3HookContext::post_auth("", "photos", Some("2026/image.jpg")).is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn registers_valid_post_auth_hook_contract_without_dispatch_side_effects() {
|
|
let mut registry = S3HookRegistry::new();
|
|
let schema = builtin_s3_hook_extension_schema();
|
|
let contract = builtin_s3_hook_contract();
|
|
let context = S3HookContext::post_auth("access-key", "photos", None).expect("post-auth context should be valid");
|
|
|
|
registry
|
|
.register_schema(&schema, &contract)
|
|
.expect("builtin s3 hook contract should register");
|
|
|
|
assert_eq!(registry.registered_hook_count(), contract.hook_points.len());
|
|
assert_eq!(
|
|
registry.hooks_for(S3HookPoint::PostAuthListObjects).count(),
|
|
1,
|
|
"registered hooks stay catalogued by allowlisted point"
|
|
);
|
|
|
|
// Dispatch now actually traverses the registered hooks for the point.
|
|
let expected: Vec<String> = registry
|
|
.hooks_for(S3HookPoint::PostAuthListObjects)
|
|
.map(|registration| registration.extension_id.clone())
|
|
.collect();
|
|
assert!(!expected.is_empty());
|
|
|
|
let outcome = registry.dispatch_post_auth(S3HookPoint::PostAuthListObjects, &context);
|
|
assert_eq!(outcome.decision, S3HookDecision::Continue);
|
|
assert_eq!(outcome.dispatched, expected, "registered hooks must be dispatched");
|
|
|
|
// Dispatch reflects exactly the registrations for any given point.
|
|
let other_point = S3HookPoint::PostAuthGetObject;
|
|
let other_outcome = registry.dispatch_post_auth(other_point, &context);
|
|
assert_eq!(
|
|
other_outcome.dispatched,
|
|
registry
|
|
.hooks_for(other_point)
|
|
.map(|registration| registration.extension_id.clone())
|
|
.collect::<Vec<_>>()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn rejects_non_s3_hook_schema_and_unsafe_contracts() {
|
|
let mut registry = S3HookRegistry::new();
|
|
let mut schema = builtin_s3_hook_extension_schema();
|
|
schema.kind = ExtensionKind::TargetPlugin;
|
|
|
|
assert_eq!(
|
|
registry
|
|
.register_schema(&schema, &builtin_s3_hook_contract())
|
|
.expect_err("target plugin schema should not register as s3 hook"),
|
|
S3HookRegistryError::UnsupportedExtensionKind {
|
|
extension_id: "builtin:s3-post-auth-hooks".to_string(),
|
|
kind: ExtensionKind::TargetPlugin
|
|
}
|
|
);
|
|
|
|
schema.kind = ExtensionKind::S3Hook;
|
|
let mut contract = builtin_s3_hook_contract();
|
|
contract.bypasses_iam = true;
|
|
|
|
assert_eq!(
|
|
registry
|
|
.register_schema(&schema, &contract)
|
|
.expect_err("IAM bypass should be rejected"),
|
|
S3HookRegistryError::InvalidContract(ExtensionContractError::S3HookBypassesIam)
|
|
);
|
|
}
|
|
}
|