Skip to content

Commit 37f0499

Browse files
committed
feat(sandbox): support AWS session tokens in SigV4 signing
Add session_token parameter to apply_sigv4_to_request so SigV4 signing works with temporary STS credentials (AccessKeyId + SecretAccessKey + SessionToken). The aws-sigv4 SDK handles injecting the x-amz-security-token header automatically when a session token is present. The call site resolves AWS_SESSION_TOKEN from the SecretResolver alongside the access/secret keys. The token is optional — static IAM keys continue to work without it. Prepares for issue NVIDIA#1576 (aws_sts_assume_role refresh strategy) which will provide short-lived STS credentials via gateway-side rotation. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> Signed-off-by: Jesse Jaggars <[email protected]>
1 parent 181af80 commit 37f0499

2 files changed

Lines changed: 26 additions & 1 deletion

File tree

‎crates/openshell-sandbox/src/l7/rest.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,12 +467,15 @@ where
467467
crate::secrets::placeholder_for_env_key("AWS_ACCESS_KEY_ID");
468468
let secret_key_placeholder =
469469
crate::secrets::placeholder_for_env_key("AWS_SECRET_ACCESS_KEY");
470+
let session_token_placeholder =
471+
crate::secrets::placeholder_for_env_key("AWS_SESSION_TOKEN");
470472

471473
match (
472474
resolver.resolve_placeholder(&access_key_placeholder),
473475
resolver.resolve_placeholder(&secret_key_placeholder),
474476
) {
475477
(Some(access_key), Some(secret_key)) => {
478+
let session_token = resolver.resolve_placeholder(&session_token_placeholder);
476479
let region = crate::sigv4::extract_aws_region(&options.host)
477480
.unwrap_or_else(|| "us-east-1".to_string());
478481
let service = &options.signing_service;
@@ -510,6 +513,7 @@ where
510513
service,
511514
access_key,
512515
secret_key,
516+
session_token.as_deref(),
513517
);
514518
upstream.write_all(&signed).await.into_diagnostic()?;
515519
}

‎crates/openshell-sandbox/src/sigv4.rs‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ pub fn apply_sigv4_to_request(
7878
service: &str,
7979
access_key: &str,
8080
secret_key: &str,
81+
session_token: Option<&str>,
8182
) -> Vec<u8> {
8283
let header_end = raw
8384
.windows(4)
@@ -127,7 +128,7 @@ pub fn apply_sigv4_to_request(
127128
let identity: Identity = Credentials::new(
128129
access_key,
129130
secret_key,
130-
None,
131+
session_token.map(|s| s.to_string()),
131132
None,
132133
"openshell",
133134
)
@@ -220,11 +221,30 @@ mod tests {
220221
"bedrock",
221222
"AKIAIOSFODNN7EXAMPLE",
222223
"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
224+
None,
223225
);
224226
let result_str = String::from_utf8_lossy(&result);
225227
assert!(result_str.contains("authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/"));
226228
assert!(result_str.contains("x-amz-content-sha256: "));
227229
assert!(result_str.contains("x-amz-date: "));
230+
assert!(!result_str.contains("x-amz-security-token"));
231+
}
232+
233+
#[test]
234+
fn sign_with_session_token() {
235+
let raw = b"POST /model/test/invoke HTTP/1.1\r\nHost: bedrock-runtime.us-east-2.amazonaws.com\r\nContent-Type: application/json\r\n\r\n{}";
236+
let result = apply_sigv4_to_request(
237+
raw,
238+
"bedrock-runtime.us-east-2.amazonaws.com",
239+
"us-east-2",
240+
"bedrock",
241+
"ASIAEXAMPLE",
242+
"secret",
243+
Some("FwoGZXIvYXdzEBYaDH+session+token"),
244+
);
245+
let result_str = String::from_utf8_lossy(&result);
246+
assert!(result_str.contains("authorization: AWS4-HMAC-SHA256 Credential=ASIAEXAMPLE/"));
247+
assert!(result_str.contains("x-amz-security-token: FwoGZXIvYXdzEBYaDH+session+token"));
228248
}
229249

230250
#[test]
@@ -237,6 +257,7 @@ mod tests {
237257
"bedrock",
238258
"AKIATEST",
239259
"secret",
260+
None,
240261
);
241262
let result_str = String::from_utf8_lossy(&result);
242263
assert!(result_str.contains("authorization: AWS4-HMAC-SHA256 Credential=AKIATEST/"));

0 commit comments

Comments
 (0)