Skip to content

Commit 9dfaa29

Browse files
committed
feat(providers): add aws_sts_assume_role refresh strategy (v2 only)
Add gateway-owned AWS STS AssumeRole as a new credential refresh strategy. The gateway calls sts:AssumeRole and writes three coupled credentials (AccessKeyId, SecretAccessKey, SessionToken) atomically to the provider record via an extended multi-key MintedCredential. Scoped to provider v2 only — ConfigureProviderRefresh rejects aws_sts_assume_role when providers_v2_enabled is false. Ships two built-in profiles: generic 'aws' (credentials only) and 'aws-s3' (with S3 endpoint policy rules). Multi-key collision validation runs at both configure-time and mint-time. Refs NVIDIA#1576
1 parent 7bbde6f commit 9dfaa29

13 files changed

Lines changed: 1149 additions & 51 deletions

File tree

‎Cargo.lock‎

Lines changed: 366 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ apollo-parser = "0.8.5"
7676
# HTTP client
7777
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls-native-roots"] }
7878

79+
# AWS SDK
80+
aws-config = { version = "1", default-features = false, features = ["rustls", "rt-tokio", "behavior-version-latest"] }
81+
aws-sdk-sts = { version = "1", default-features = false, features = ["rustls", "rt-tokio", "behavior-version-latest"] }
82+
7983
# WebSocket
8084
tokio-tungstenite = { version = "0.26", features = ["rustls-tls-native-roots"] }
8185

‎crates/openshell-cli/src/main.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,7 @@ enum CliProviderRefreshStrategy {
661661
Oauth2RefreshToken,
662662
Oauth2ClientCredentials,
663663
GoogleServiceAccountJwt,
664+
AwsStsAssumeRole,
664665
}
665666

666667
impl CliProviderRefreshStrategy {
@@ -669,6 +670,7 @@ impl CliProviderRefreshStrategy {
669670
Self::Oauth2RefreshToken => "oauth2_refresh_token",
670671
Self::Oauth2ClientCredentials => "oauth2_client_credentials",
671672
Self::GoogleServiceAccountJwt => "google_service_account_jwt",
673+
Self::AwsStsAssumeRole => "aws_sts_assume_role",
672674
}
673675
}
674676
}

‎crates/openshell-cli/src/run.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5039,6 +5039,7 @@ fn provider_refresh_strategy(strategy: &str) -> Result<ProviderCredentialRefresh
50395039
"google_service_account_jwt" => {
50405040
Ok(ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt)
50415041
}
5042+
"aws_sts_assume_role" => Ok(ProviderCredentialRefreshStrategy::AwsStsAssumeRole),
50425043
_ => Err(miette!("unsupported provider refresh strategy: {strategy}")),
50435044
}
50445045
}
@@ -5091,6 +5092,7 @@ fn provider_refresh_strategy_name(strategy: ProviderCredentialRefreshStrategy) -
50915092
ProviderCredentialRefreshStrategy::Oauth2RefreshToken => "oauth2_refresh_token",
50925093
ProviderCredentialRefreshStrategy::Oauth2ClientCredentials => "oauth2_client_credentials",
50935094
ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt => "google_service_account_jwt",
5095+
ProviderCredentialRefreshStrategy::AwsStsAssumeRole => "aws_sts_assume_role",
50945096
ProviderCredentialRefreshStrategy::Unspecified => "unspecified",
50955097
}
50965098
}

‎crates/openshell-providers/src/profiles.rs‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ use std::collections::{HashMap, HashSet};
1717
use std::sync::OnceLock;
1818

1919
const BUILT_IN_PROFILE_YAMLS: &[&str] = &[
20+
include_str!("../../../providers/aws.yaml"),
21+
include_str!("../../../providers/aws-s3.yaml"),
2022
include_str!("../../../providers/claude-code.yaml"),
2123
include_str!("../../../providers/codex.yaml"),
2224
include_str!("../../../providers/copilot.yaml"),
@@ -541,6 +543,7 @@ pub fn provider_refresh_strategy_from_yaml(raw: &str) -> Option<ProviderCredenti
541543
"google_service_account_jwt" => {
542544
Some(ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt)
543545
}
546+
"aws_sts_assume_role" => Some(ProviderCredentialRefreshStrategy::AwsStsAssumeRole),
544547
_ => None,
545548
}
546549
}
@@ -555,6 +558,7 @@ pub fn provider_refresh_strategy_to_yaml(
555558
ProviderCredentialRefreshStrategy::Oauth2RefreshToken => "oauth2_refresh_token",
556559
ProviderCredentialRefreshStrategy::Oauth2ClientCredentials => "oauth2_client_credentials",
557560
ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt => "google_service_account_jwt",
561+
ProviderCredentialRefreshStrategy::AwsStsAssumeRole => "aws_sts_assume_role",
558562
ProviderCredentialRefreshStrategy::Unspecified => "unspecified",
559563
}
560564
}
@@ -1598,4 +1602,51 @@ endpoints:
15981602

15991603
assert!(matches!(err, ProfileError::InvalidEndpoint { id, .. } if id == "bad-endpoint"));
16001604
}
1605+
1606+
#[test]
1607+
fn aws_sts_strategy_serde_roundtrip() {
1608+
use openshell_core::proto::ProviderCredentialRefreshStrategy;
1609+
assert_eq!(
1610+
super::provider_refresh_strategy_from_yaml("aws_sts_assume_role"),
1611+
Some(ProviderCredentialRefreshStrategy::AwsStsAssumeRole)
1612+
);
1613+
assert_eq!(
1614+
super::provider_refresh_strategy_to_yaml(
1615+
ProviderCredentialRefreshStrategy::AwsStsAssumeRole
1616+
),
1617+
"aws_sts_assume_role"
1618+
);
1619+
}
1620+
1621+
#[test]
1622+
fn aws_profile_parses_correctly() {
1623+
let aws = get_default_profile("aws").expect("aws profile should exist");
1624+
assert_eq!(aws.display_name, "AWS");
1625+
assert_eq!(aws.credentials.len(), 3);
1626+
let access_key = aws
1627+
.credentials
1628+
.iter()
1629+
.find(|c| c.name == "access_key_id")
1630+
.unwrap();
1631+
assert!(access_key.refresh.is_some());
1632+
let refresh = access_key.refresh.as_ref().unwrap();
1633+
assert_eq!(
1634+
refresh.strategy,
1635+
openshell_core::proto::ProviderCredentialRefreshStrategy::AwsStsAssumeRole
1636+
);
1637+
assert!(
1638+
refresh
1639+
.material
1640+
.iter()
1641+
.any(|m| m.name == "role_arn" && m.required)
1642+
);
1643+
}
1644+
1645+
#[test]
1646+
fn aws_s3_profile_parses_with_endpoints() {
1647+
let aws_s3 = get_default_profile("aws-s3").expect("aws-s3 profile should exist");
1648+
assert_eq!(aws_s3.display_name, "AWS S3");
1649+
assert!(!aws_s3.endpoints.is_empty());
1650+
assert!(aws_s3.endpoints.iter().any(|e| e.host.contains("amazonaws.com")));
1651+
}
16011652
}

‎crates/openshell-server/Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ toml = { workspace = true }
8080
tokio-stream = { workspace = true }
8181
sqlx = { workspace = true }
8282
reqwest = { workspace = true }
83+
aws-config = { workspace = true }
84+
aws-sdk-sts = { workspace = true }
8385
uuid = { workspace = true }
8486
hmac = "0.12"
8587
sha2 = { workspace = true }

‎crates/openshell-server/src/grpc/policy.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,7 @@ async fn profile_provider_policy_layers(
13291329
Ok(layers)
13301330
}
13311331

1332-
fn bool_setting_enabled(settings: &StoredSettings, key: &str) -> Result<bool, Status> {
1332+
pub(super) fn bool_setting_enabled(settings: &StoredSettings, key: &str) -> Result<bool, Status> {
13331333
match settings.settings.get(key) {
13341334
None => Ok(false),
13351335
Some(StoredSettingValue::Bool(value)) => Ok(*value),

0 commit comments

Comments
 (0)