@@ -701,6 +701,9 @@ async fn mint_aws_sts_assume_role(
701701 // Explicit source credentials are all-or-nothing. A lone key must not
702702 // silently fall through to the gateway's ambient identity (CWE-20): the
703703 // caller asked for a specific principal, so an incomplete pair is an error.
704+ // An optional session token supports temporary source credentials (SSO or a
705+ // prior AssumeRole); it requires the access/secret pair.
706+ let session_token = material_value ( & state. material , & [ "aws_session_token" ] ) ;
704707 match (
705708 material_value ( & state. material , & [ "aws_access_key_id" ] ) ,
706709 material_value ( & state. material , & [ "aws_secret_access_key" ] ) ,
@@ -709,12 +712,17 @@ async fn mint_aws_sts_assume_role(
709712 let creds = aws_sdk_sts:: config:: Credentials :: new (
710713 access_key,
711714 secret_key,
712- None ,
715+ session_token ,
713716 None ,
714717 "openshell-provider-refresh" ,
715718 ) ;
716719 config_loader = config_loader. credentials_provider ( creds) ;
717720 }
721+ ( None , None ) if session_token. is_some ( ) => {
722+ return Err ( Status :: invalid_argument (
723+ "aws_session_token requires aws_access_key_id and aws_secret_access_key" ,
724+ ) ) ;
725+ }
718726 ( None , None ) => { }
719727 _ => {
720728 return Err ( Status :: invalid_argument (
@@ -1838,6 +1846,148 @@ mod tests {
18381846 }
18391847 }
18401848
1849+ #[ tokio:: test]
1850+ async fn aws_sts_mint_accepts_session_token_with_source_pair ( ) {
1851+ let mock_server = MockServer :: start ( ) . await ;
1852+ Mock :: given ( method ( "POST" ) )
1853+ . and ( body_string_contains ( "Action=AssumeRole" ) )
1854+ . respond_with ( ResponseTemplate :: new ( 200 ) . set_body_string (
1855+ r#"<AssumeRoleResponse xmlns="https://sts.amazonaws.com/doc/2011-06-15/">
1856+ <AssumeRoleResult>
1857+ <Credentials>
1858+ <AccessKeyId>ASIAMOCKKEY</AccessKeyId>
1859+ <SecretAccessKey>MockSecretAccessKey123</SecretAccessKey>
1860+ <SessionToken>MockSessionTokenXYZ</SessionToken>
1861+ <Expiration>2099-01-01T00:00:00Z</Expiration>
1862+ </Credentials>
1863+ </AssumeRoleResult>
1864+ </AssumeRoleResponse>"# ,
1865+ ) )
1866+ . mount ( & mock_server)
1867+ . await ;
1868+
1869+ let store = test_store ( ) . await ;
1870+ crate :: grpc:: policy:: set_global_bool_setting_for_test (
1871+ & store,
1872+ openshell_core:: settings:: PROVIDERS_V2_ENABLED_KEY ,
1873+ true ,
1874+ )
1875+ . await
1876+ . unwrap ( ) ;
1877+ let prov = provider ( "aws-sts-session" , "aws" ) ;
1878+ store. put_message ( & prov) . await . unwrap ( ) ;
1879+
1880+ // Temporary source credentials: access key + secret + session token.
1881+ let state = new_refresh_state (
1882+ & prov,
1883+ "AWS_ACCESS_KEY_ID" ,
1884+ NewRefreshStateConfig {
1885+ additional_output_keys : HashMap :: from ( [
1886+ (
1887+ "secret_access_key" . to_string ( ) ,
1888+ "AWS_SECRET_ACCESS_KEY" . to_string ( ) ,
1889+ ) ,
1890+ ( "session_token" . to_string ( ) , "AWS_SESSION_TOKEN" . to_string ( ) ) ,
1891+ ] ) ,
1892+ strategy : ProviderCredentialRefreshStrategy :: AwsStsAssumeRole ,
1893+ material : HashMap :: from ( [
1894+ (
1895+ "role_arn" . to_string ( ) ,
1896+ "arn:aws:iam::123456789012:role/TestRole" . to_string ( ) ,
1897+ ) ,
1898+ ( "aws_access_key_id" . to_string ( ) , "ASIASOURCEKEY" . to_string ( ) ) ,
1899+ (
1900+ "aws_secret_access_key" . to_string ( ) ,
1901+ "SourceSecretKey" . to_string ( ) ,
1902+ ) ,
1903+ (
1904+ "aws_session_token" . to_string ( ) ,
1905+ "SourceSessionToken" . to_string ( ) ,
1906+ ) ,
1907+ ( "sts_endpoint_url" . to_string ( ) , mock_server. uri ( ) ) ,
1908+ ] ) ,
1909+ secret_material_keys : vec ! [
1910+ "aws_secret_access_key" . to_string( ) ,
1911+ "aws_session_token" . to_string( ) ,
1912+ ] ,
1913+ expires_at_ms : 0 ,
1914+ token_url : String :: new ( ) ,
1915+ scopes : Vec :: new ( ) ,
1916+ refresh_before_seconds : 300 ,
1917+ max_lifetime_seconds : 3600 ,
1918+ } ,
1919+ )
1920+ . unwrap ( ) ;
1921+ put_refresh_state ( & store, & state) . await . unwrap ( ) ;
1922+
1923+ let refreshed = refresh_provider_credential ( & store, "aws-sts-session" , "AWS_ACCESS_KEY_ID" )
1924+ . await
1925+ . unwrap ( ) ;
1926+ assert_eq ! ( refreshed. status, "refreshed" ) ;
1927+ let stored = store
1928+ . get_message_by_name :: < Provider > ( "aws-sts-session" )
1929+ . await
1930+ . unwrap ( )
1931+ . unwrap ( ) ;
1932+ assert_eq ! (
1933+ stored. credentials. get( "AWS_ACCESS_KEY_ID" ) ,
1934+ Some ( & "ASIAMOCKKEY" . to_string( ) )
1935+ ) ;
1936+ }
1937+
1938+ #[ tokio:: test]
1939+ async fn aws_sts_mint_rejects_session_token_without_source_pair ( ) {
1940+ let store = test_store ( ) . await ;
1941+ crate :: grpc:: policy:: set_global_bool_setting_for_test (
1942+ & store,
1943+ openshell_core:: settings:: PROVIDERS_V2_ENABLED_KEY ,
1944+ true ,
1945+ )
1946+ . await
1947+ . unwrap ( ) ;
1948+ let prov = provider ( "aws-sts-lonesession" , "aws" ) ;
1949+ store. put_message ( & prov) . await . unwrap ( ) ;
1950+
1951+ let state = new_refresh_state (
1952+ & prov,
1953+ "AWS_ACCESS_KEY_ID" ,
1954+ NewRefreshStateConfig {
1955+ additional_output_keys : HashMap :: from ( [
1956+ (
1957+ "secret_access_key" . to_string ( ) ,
1958+ "AWS_SECRET_ACCESS_KEY" . to_string ( ) ,
1959+ ) ,
1960+ ( "session_token" . to_string ( ) , "AWS_SESSION_TOKEN" . to_string ( ) ) ,
1961+ ] ) ,
1962+ strategy : ProviderCredentialRefreshStrategy :: AwsStsAssumeRole ,
1963+ material : HashMap :: from ( [
1964+ (
1965+ "role_arn" . to_string ( ) ,
1966+ "arn:aws:iam::123456789012:role/TestRole" . to_string ( ) ,
1967+ ) ,
1968+ (
1969+ "aws_session_token" . to_string ( ) ,
1970+ "SourceSessionToken" . to_string ( ) ,
1971+ ) ,
1972+ ] ) ,
1973+ secret_material_keys : vec ! [ "aws_session_token" . to_string( ) ] ,
1974+ expires_at_ms : 0 ,
1975+ token_url : String :: new ( ) ,
1976+ scopes : Vec :: new ( ) ,
1977+ refresh_before_seconds : 300 ,
1978+ max_lifetime_seconds : 3600 ,
1979+ } ,
1980+ )
1981+ . unwrap ( ) ;
1982+ put_refresh_state ( & store, & state) . await . unwrap ( ) ;
1983+
1984+ let err = refresh_provider_credential ( & store, "aws-sts-lonesession" , "AWS_ACCESS_KEY_ID" )
1985+ . await
1986+ . unwrap_err ( ) ;
1987+ assert_eq ! ( err. code( ) , tonic:: Code :: InvalidArgument ) ;
1988+ assert ! ( err. message( ) . contains( "aws_session_token requires" ) ) ;
1989+ }
1990+
18411991 #[ tokio:: test( flavor = "multi_thread" , worker_threads = 4 ) ]
18421992 async fn rotation_does_not_resurrect_refresh_deleted_mid_flight ( ) {
18431993 let mock_server = MockServer :: start ( ) . await ;
0 commit comments