Skip to content

Commit 7556abe

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 7141a81 commit 7556abe

13 files changed

Lines changed: 1153 additions & 53 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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4360,7 +4360,8 @@ fn is_gateway_mintable_refresh_strategy(strategy: i32) -> bool {
43604360
ProviderCredentialRefreshStrategy::try_from(strategy),
43614361
Ok(ProviderCredentialRefreshStrategy::Oauth2RefreshToken
43624362
| ProviderCredentialRefreshStrategy::Oauth2ClientCredentials
4363-
| ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt)
4363+
| ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt
4364+
| ProviderCredentialRefreshStrategy::AwsStsAssumeRole)
43644365
)
43654366
}
43664367

@@ -4805,6 +4806,7 @@ fn provider_refresh_strategy(strategy: &str) -> Result<ProviderCredentialRefresh
48054806
"google_service_account_jwt" => {
48064807
Ok(ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt)
48074808
}
4809+
"aws_sts_assume_role" => Ok(ProviderCredentialRefreshStrategy::AwsStsAssumeRole),
48084810
_ => Err(miette!("unsupported provider refresh strategy: {strategy}")),
48094811
}
48104812
}
@@ -4857,6 +4859,7 @@ fn provider_refresh_strategy_name(strategy: ProviderCredentialRefreshStrategy) -
48574859
ProviderCredentialRefreshStrategy::Oauth2RefreshToken => "oauth2_refresh_token",
48584860
ProviderCredentialRefreshStrategy::Oauth2ClientCredentials => "oauth2_client_credentials",
48594861
ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt => "google_service_account_jwt",
4862+
ProviderCredentialRefreshStrategy::AwsStsAssumeRole => "aws_sts_assume_role",
48604863
ProviderCredentialRefreshStrategy::Unspecified => "unspecified",
48614864
}
48624865
}

‎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/github.yaml"),
2224
include_str!("../../../providers/nvidia.yaml"),
@@ -501,6 +503,7 @@ pub fn provider_refresh_strategy_from_yaml(raw: &str) -> Option<ProviderCredenti
501503
"google_service_account_jwt" => {
502504
Some(ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt)
503505
}
506+
"aws_sts_assume_role" => Some(ProviderCredentialRefreshStrategy::AwsStsAssumeRole),
504507
_ => None,
505508
}
506509
}
@@ -515,6 +518,7 @@ pub fn provider_refresh_strategy_to_yaml(
515518
ProviderCredentialRefreshStrategy::Oauth2RefreshToken => "oauth2_refresh_token",
516519
ProviderCredentialRefreshStrategy::Oauth2ClientCredentials => "oauth2_client_credentials",
517520
ProviderCredentialRefreshStrategy::GoogleServiceAccountJwt => "google_service_account_jwt",
521+
ProviderCredentialRefreshStrategy::AwsStsAssumeRole => "aws_sts_assume_role",
518522
ProviderCredentialRefreshStrategy::Unspecified => "unspecified",
519523
}
520524
}
@@ -1473,4 +1477,51 @@ endpoints:
14731477

14741478
assert!(matches!(err, ProfileError::InvalidEndpoint { id, .. } if id == "bad-endpoint"));
14751479
}
1480+
1481+
#[test]
1482+
fn aws_sts_strategy_serde_roundtrip() {
1483+
use openshell_core::proto::ProviderCredentialRefreshStrategy;
1484+
assert_eq!(
1485+
super::provider_refresh_strategy_from_yaml("aws_sts_assume_role"),
1486+
Some(ProviderCredentialRefreshStrategy::AwsStsAssumeRole)
1487+
);
1488+
assert_eq!(
1489+
super::provider_refresh_strategy_to_yaml(
1490+
ProviderCredentialRefreshStrategy::AwsStsAssumeRole
1491+
),
1492+
"aws_sts_assume_role"
1493+
);
1494+
}
1495+
1496+
#[test]
1497+
fn aws_profile_parses_correctly() {
1498+
let aws = get_default_profile("aws").expect("aws profile should exist");
1499+
assert_eq!(aws.display_name, "AWS");
1500+
assert_eq!(aws.credentials.len(), 3);
1501+
let access_key = aws
1502+
.credentials
1503+
.iter()
1504+
.find(|c| c.name == "access_key_id")
1505+
.unwrap();
1506+
assert!(access_key.refresh.is_some());
1507+
let refresh = access_key.refresh.as_ref().unwrap();
1508+
assert_eq!(
1509+
refresh.strategy,
1510+
openshell_core::proto::ProviderCredentialRefreshStrategy::AwsStsAssumeRole
1511+
);
1512+
assert!(
1513+
refresh
1514+
.material
1515+
.iter()
1516+
.any(|m| m.name == "role_arn" && m.required)
1517+
);
1518+
}
1519+
1520+
#[test]
1521+
fn aws_s3_profile_parses_with_endpoints() {
1522+
let aws_s3 = get_default_profile("aws-s3").expect("aws-s3 profile should exist");
1523+
assert_eq!(aws_s3.display_name, "AWS S3");
1524+
assert!(!aws_s3.endpoints.is_empty());
1525+
assert!(aws_s3.endpoints.iter().any(|e| e.host.contains("amazonaws.com")));
1526+
}
14761527
}

‎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
@@ -1328,7 +1328,7 @@ async fn profile_provider_policy_layers(
13281328
Ok(layers)
13291329
}
13301330

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

0 commit comments

Comments
 (0)