mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-14 00:53:14 +00:00
5e3010c6b5
* fix(table-catalog): harden commit publication * fix(table-catalog): make commit replay deterministic * test(table-catalog): cover denied commit object reads * fix(table-catalog): guard ref commits and order publication locks * fix(table-catalog): close commit publication race gaps * fix(table-catalog): close publication review gaps * fix(table-catalog): isolate blocked strong publications * fix(table-catalog): scale and fence commit publication * fix(table-catalog): close publication compatibility gaps * fix(table-catalog): clarify compatibility cleanup marker * fix(table-catalog): repair publication hardening checks * fix(table-catalog): align commit tests with publication fences * fix(table-catalog): bind authorization to request context * refactor(table-catalog): reuse internal error mapping * test(storage): install request context for tag conditions --------- Co-authored-by: Henry Guo <marshawcoco@users.noreply.github.com> Co-authored-by: houseme <housemecn@gmail.com> Co-authored-by: Zhengchao An <anzhengchao@gmail.com>
140 lines
5.0 KiB
Rust
140 lines
5.0 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 super::metadata_sys::get_bucket_metadata_sys;
|
|
use crate::error::{Result, StorageError};
|
|
use crate::store::ECStore;
|
|
use rustfs_policy::policy::{BucketPolicy, BucketPolicyArgs};
|
|
|
|
pub struct PolicySys {}
|
|
|
|
impl PolicySys {
|
|
pub async fn is_allowed(args: &BucketPolicyArgs<'_>) -> bool {
|
|
matches!(Self::try_is_allowed(args).await, Ok(true))
|
|
}
|
|
|
|
pub async fn try_is_allowed(args: &BucketPolicyArgs<'_>) -> Result<bool> {
|
|
Self::is_allowed_with_policy(args, Self::get(args.bucket).await).await
|
|
}
|
|
|
|
pub async fn try_is_allowed_for_store(store: &ECStore, args: &BucketPolicyArgs<'_>) -> Result<bool> {
|
|
Self::is_allowed_with_policy(args, store.get_bucket_policy(args.bucket).await.map(|(policy, _)| policy)).await
|
|
}
|
|
|
|
async fn is_allowed_with_policy(args: &BucketPolicyArgs<'_>, policy: Result<BucketPolicy>) -> Result<bool> {
|
|
match policy {
|
|
Ok(policy) => Ok(policy.is_allowed(args).await),
|
|
Err(StorageError::ConfigNotFound) => Ok(args.is_owner),
|
|
Err(err) => Err(err),
|
|
}
|
|
}
|
|
|
|
pub async fn get(bucket: &str) -> Result<BucketPolicy> {
|
|
let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
|
|
let bucket_meta_sys = bucket_meta_sys_lock.read().await;
|
|
|
|
let (cfg, _) = bucket_meta_sys.get_bucket_policy(bucket).await?;
|
|
|
|
Ok(cfg)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::{PolicySys, StorageError};
|
|
use rustfs_policy::policy::action::{Action, S3Action};
|
|
use rustfs_policy::policy::{BucketPolicy, BucketPolicyArgs};
|
|
use std::collections::HashMap;
|
|
|
|
fn args<'a>(
|
|
is_owner: bool,
|
|
groups: &'a Option<Vec<String>>,
|
|
conditions: &'a HashMap<String, Vec<String>>,
|
|
) -> BucketPolicyArgs<'a> {
|
|
BucketPolicyArgs {
|
|
bucket: "bucket",
|
|
action: Action::S3Action(S3Action::GetObjectAction),
|
|
is_owner,
|
|
account: "account",
|
|
groups,
|
|
conditions,
|
|
object: "object",
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn missing_policy_preserves_owner_and_iam_fallback_semantics() {
|
|
let groups = None;
|
|
let conditions = HashMap::new();
|
|
assert!(
|
|
PolicySys::is_allowed_with_policy(&args(true, &groups, &conditions), Err(StorageError::ConfigNotFound),)
|
|
.await
|
|
.expect("missing policy should preserve owner access")
|
|
);
|
|
assert!(
|
|
!PolicySys::is_allowed_with_policy(&args(false, &groups, &conditions), Err(StorageError::ConfigNotFound),)
|
|
.await
|
|
.expect("missing policy should defer non-owner access to IAM")
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn policy_load_failures_propagate() {
|
|
let groups = None;
|
|
let conditions = HashMap::new();
|
|
for (failure, expected_message) in [
|
|
(StorageError::Io(std::io::Error::other("policy read failed")), "policy read failed"),
|
|
(
|
|
StorageError::other("bucket metadata sys not initialized for this instance"),
|
|
"bucket metadata sys not initialized for this instance",
|
|
),
|
|
] {
|
|
let result = PolicySys::is_allowed_with_policy(&args(true, &groups, &conditions), Err(failure)).await;
|
|
|
|
assert!(
|
|
matches!(result, Err(StorageError::Io(ref err)) if err.to_string().contains(expected_message)),
|
|
"policy I/O and uninitialized metadata failures must propagate instead of granting owner access"
|
|
);
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn explicit_bucket_deny_precedes_iam_allow() {
|
|
let groups = None;
|
|
let conditions = HashMap::new();
|
|
let policy: BucketPolicy = serde_json::from_str(
|
|
r#"{
|
|
"Version":"2012-10-17",
|
|
"Statement":[{
|
|
"Effect":"Deny",
|
|
"Principal":{"AWS":"*"},
|
|
"Action":["s3:GetObject"],
|
|
"Resource":["arn:aws:s3:::bucket/*"]
|
|
}]
|
|
}"#,
|
|
)
|
|
.expect("deny policy should parse");
|
|
|
|
let bucket_allowed = PolicySys::is_allowed_with_policy(&args(true, &groups, &conditions), Ok(policy))
|
|
.await
|
|
.expect("loaded bucket policy should evaluate");
|
|
let iam_allowed = true;
|
|
let request_allowed = bucket_allowed && iam_allowed;
|
|
|
|
assert!(iam_allowed, "test precondition: IAM grants the action");
|
|
assert!(!bucket_allowed, "test precondition: bucket policy explicitly denies the action");
|
|
assert!(!request_allowed, "explicit bucket Deny must reject before IAM Allow fallback");
|
|
}
|
|
}
|