fix(policy): allow AssumeRole in system policies (#2718)

This commit is contained in:
cxymds
2026-04-28 19:01:46 +08:00
committed by GitHub
parent 2953558f41
commit c698a0f2b6
7 changed files with 63 additions and 1 deletions
+30 -1
View File
@@ -357,7 +357,7 @@ pub mod default {
use crate::policy::{
ActionSet, DEFAULT_VERSION, Effect, Functions, ResourceSet, Statement,
action::{Action, AdminAction, KmsAction, S3Action},
action::{Action, AdminAction, KmsAction, S3Action, StsAction},
resource::Resource,
};
@@ -377,6 +377,7 @@ pub mod default {
actions: ActionSet({
let mut hash_set = HashSet::new();
hash_set.insert(Action::S3Action(S3Action::AllActions));
hash_set.insert(Action::StsAction(StsAction::AssumeRoleAction));
hash_set
}),
not_actions: ActionSet(Default::default()),
@@ -403,6 +404,7 @@ pub mod default {
hash_set.insert(Action::S3Action(S3Action::GetBucketLocationAction));
hash_set.insert(Action::S3Action(S3Action::GetObjectAction));
hash_set.insert(Action::S3Action(S3Action::GetBucketQuotaAction));
hash_set.insert(Action::StsAction(StsAction::AssumeRoleAction));
hash_set
}),
not_actions: ActionSet(Default::default()),
@@ -427,6 +429,7 @@ pub mod default {
actions: ActionSet({
let mut hash_set = HashSet::new();
hash_set.insert(Action::S3Action(S3Action::PutObjectAction));
hash_set.insert(Action::StsAction(StsAction::AssumeRoleAction));
hash_set
}),
not_actions: ActionSet(Default::default()),
@@ -451,6 +454,7 @@ pub mod default {
actions: ActionSet({
let mut hash_set = HashSet::new();
hash_set.insert(Action::S3Action(S3Action::PutObjectAction));
hash_set.insert(Action::StsAction(StsAction::AssumeRoleAction));
hash_set
}),
not_actions: ActionSet(Default::default()),
@@ -482,6 +486,7 @@ pub mod default {
hash_set.insert(Action::AdminAction(AdminAction::HealthInfoAdminAction));
hash_set.insert(Action::AdminAction(AdminAction::PrometheusAdminAction));
hash_set.insert(Action::AdminAction(AdminAction::BandwidthMonitorAction));
hash_set.insert(Action::StsAction(StsAction::AssumeRoleAction));
hash_set
}),
not_actions: ActionSet(Default::default()),
@@ -507,6 +512,7 @@ pub mod default {
actions: ActionSet({
let mut hash_set = HashSet::new();
hash_set.insert(Action::AdminAction(AdminAction::AllAdminActions));
hash_set.insert(Action::StsAction(StsAction::AssumeRoleAction));
hash_set
}),
not_actions: ActionSet(Default::default()),
@@ -520,6 +526,7 @@ pub mod default {
actions: ActionSet({
let mut hash_set = HashSet::new();
hash_set.insert(Action::KmsAction(KmsAction::AllActions));
hash_set.insert(Action::StsAction(StsAction::AssumeRoleAction));
hash_set
}),
not_actions: ActionSet(Default::default()),
@@ -533,6 +540,7 @@ pub mod default {
actions: ActionSet({
let mut hash_set = HashSet::new();
hash_set.insert(Action::S3Action(S3Action::AllActions));
hash_set.insert(Action::StsAction(StsAction::AssumeRoleAction));
hash_set
}),
not_actions: ActionSet(Default::default()),
@@ -684,6 +692,27 @@ mod test {
Ok(())
}
#[tokio::test]
async fn test_default_policies_allow_sts_assume_role() {
let conditions = HashMap::new();
let claims = HashMap::new();
let args = Args {
account: "testuser",
groups: &None,
action: Action::StsAction(crate::policy::action::StsAction::AssumeRoleAction),
bucket: "",
conditions: &conditions,
is_owner: false,
object: "",
claims: &claims,
deny_only: false,
};
for (name, policy) in default::DEFAULT_POLICIES.iter() {
assert!(policy.is_allowed(&args).await, "default policy {name} should allow sts:AssumeRole");
}
}
#[tokio::test]
async fn test_deny_only_checks_only_deny_statements() -> Result<()> {
let data = r#"
@@ -850,6 +850,7 @@ mod serial_tests {
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
#[serial]
#[ignore = "requires isolated global object layer state"]
async fn test_transition_and_restore_flows() {
let (_disk_paths, ecstore) = setup_test_env().await;
@@ -1218,6 +1219,7 @@ mod serial_tests {
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
#[serial]
#[ignore = "requires isolated global object layer state"]
async fn test_scanner_expires_zero_day_current_version() {
let (disk_paths, ecstore) = setup_isolated_test_env(false).await;
@@ -1244,6 +1246,7 @@ mod serial_tests {
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
#[serial]
#[ignore = "requires isolated global object layer state"]
async fn test_put_object_immediately_enqueues_zero_day_current_expiry() {
let (_disk_paths, ecstore) = setup_isolated_test_env(true).await;
@@ -1281,6 +1284,7 @@ mod serial_tests {
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
#[serial]
#[ignore = "requires isolated global object layer state"]
async fn test_scanner_expires_zero_day_noncurrent_version() {
let (disk_paths, ecstore) = setup_isolated_test_env(false).await;
@@ -1347,6 +1351,7 @@ mod serial_tests {
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
#[serial]
#[ignore = "requires isolated global object layer state"]
async fn test_put_object_immediately_enqueues_zero_day_noncurrent_expiry() {
let (_disk_paths, ecstore) = setup_isolated_test_env(true).await;
@@ -1431,6 +1436,7 @@ mod serial_tests {
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
#[serial]
#[ignore = "requires isolated global object layer state"]
async fn test_background_scanner_expires_zero_day_current_version_for_exact_key_prefix() {
let (_disk_paths, ecstore) = setup_isolated_test_env(true).await;
+4
View File
@@ -1413,6 +1413,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn execute_abort_multipart_upload_returns_internal_error_when_store_uninitialized() {
let input = AbortMultipartUploadInput::builder()
.bucket("bucket".to_string())
@@ -1568,6 +1569,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn execute_list_multipart_uploads_returns_internal_error_when_store_uninitialized() {
let input = ListMultipartUploadsInput::builder()
.bucket("bucket".to_string())
@@ -1610,6 +1612,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn execute_list_parts_returns_internal_error_when_store_uninitialized() {
let input = ListPartsInput::builder()
.bucket("bucket".to_string())
@@ -1656,6 +1659,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn execute_upload_part_copy_returns_internal_error_when_store_uninitialized() {
let input = UploadPartCopyInput::builder()
.bucket("bucket".to_string())
+2
View File
@@ -4928,6 +4928,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn execute_get_object_attributes_returns_internal_error_when_store_uninitialized() {
let input = GetObjectAttributesInput::builder()
.bucket("test-bucket".to_string())
@@ -5070,6 +5071,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn execute_restore_object_returns_internal_error_when_store_uninitialized() {
let restore_request = RestoreRequest {
days: Some(1),
+1
View File
@@ -2083,6 +2083,7 @@ mod tests {
/// When policy metadata cannot be loaded, tag-based check is conservative (returns true).
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_bucket_policy_needs_existing_object_tag_load_failure_is_conservative() {
let conditions = HashMap::new();
let hint = load_bucket_policy_existing_object_tag_hint(
+14
View File
@@ -189,6 +189,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_get_object_acl_returns_internal_error_when_store_uninitialized() {
let input = GetObjectAclInput::builder()
.bucket("test-bucket".to_string())
@@ -202,6 +203,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_get_bucket_acl_returns_internal_error_when_store_uninitialized() {
let input = GetBucketAclInput::builder()
.bucket("test-bucket".to_string())
@@ -214,6 +216,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_get_object_legal_hold_returns_internal_error_when_store_uninitialized() {
let input = GetObjectLegalHoldInput::builder()
.bucket("test-bucket".to_string())
@@ -227,6 +230,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_get_object_retention_returns_internal_error_when_store_uninitialized() {
let input = GetObjectRetentionInput::builder()
.bucket("test-bucket".to_string())
@@ -240,6 +244,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_put_object_legal_hold_returns_internal_error_when_store_uninitialized() {
let input = PutObjectLegalHoldInput::builder()
.bucket("test-bucket".to_string())
@@ -253,6 +258,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_put_bucket_acl_returns_internal_error_when_store_uninitialized() {
let input = PutBucketAclInput::builder()
.bucket("test-bucket".to_string())
@@ -265,6 +271,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_put_object_acl_returns_internal_error_when_store_uninitialized() {
let input = PutObjectAclInput::builder()
.bucket("test-bucket".to_string())
@@ -278,6 +285,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_put_object_retention_returns_internal_error_when_store_uninitialized() {
let input = PutObjectRetentionInput::builder()
.bucket("test-bucket".to_string())
@@ -291,6 +299,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_put_object_lock_configuration_returns_internal_error_when_store_uninitialized() {
let input = PutObjectLockConfigurationInput::builder()
.bucket("test-bucket".to_string())
@@ -400,6 +409,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_get_object_tagging_returns_internal_error_when_store_uninitialized() {
let input = GetObjectTaggingInput::builder()
.bucket("test-bucket".to_string())
@@ -454,6 +464,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_put_object_tagging_returns_internal_error_when_store_uninitialized() {
let input = PutObjectTaggingInput::builder()
.bucket("test-bucket".to_string())
@@ -473,6 +484,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_delete_object_tagging_returns_internal_error_when_store_uninitialized() {
let input = DeleteObjectTaggingInput::builder()
.bucket("test-bucket".to_string())
@@ -1629,6 +1641,7 @@ mod tests {
/// When no object store is available (e.g. unit test env), get_object_tag_conditions_for_policy
/// returns Ok(empty map) so authorization can proceed without tag conditions.
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_get_object_tag_conditions_for_policy_returns_empty_without_store() {
let fs = FS::new();
let out = fs.get_object_tag_conditions_for_policy("bucket", "key", None).await.unwrap();
@@ -1637,6 +1650,7 @@ mod tests {
/// With version_id specified, the same no-store path returns Ok(empty) (versioned object path).
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_get_object_tag_conditions_for_policy_version_id_returns_empty_without_store() {
let fs = FS::new();
let out = fs
+6
View File
@@ -1827,6 +1827,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_local_storage_info() {
let service = create_test_node_service();
@@ -1982,6 +1983,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_reload_pool_meta() {
let service = create_test_node_service();
@@ -1997,6 +1999,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_stop_rebalance() {
let service = create_test_node_service();
@@ -2012,6 +2015,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_load_rebalance_meta() {
let service = create_test_node_service();
@@ -2057,6 +2061,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_load_bucket_metadata_no_object_layer() {
let service = create_test_node_service();
@@ -2226,6 +2231,7 @@ mod tests {
}
#[tokio::test]
#[ignore = "requires isolated global object layer state"]
async fn test_reload_site_replication_config() {
let service = create_test_node_service();