@@ -3831,7 +3831,7 @@ pub(super) async fn handle_configure_provider_refresh(
38313831 Err ( err) => Err ( err) ,
38323832 }
38333833 } else {
3834- crate :: provider_refresh:: put_refresh_state ( state. store . as_ref ( ) , & state_record) . await
3834+ crate :: provider_refresh:: create_refresh_state ( state. store . as_ref ( ) , & state_record) . await
38353835 } ;
38363836 if let Err ( err) = persist_result {
38373837 if let Err ( cleanup_err) = state
@@ -6041,6 +6041,127 @@ mod tests {
60416041 ) ;
60426042 }
60436043
6044+ #[ tokio:: test( flavor = "multi_thread" , worker_threads = 4 ) ]
6045+ async fn concurrent_first_refresh_configure_keeps_only_winner_material ( ) {
6046+ let first_state = test_server_state ( ) . await ;
6047+ import_test_graph_refresh_profile ( & first_state) . await ;
6048+ create_provider_record (
6049+ first_state. store . as_ref ( ) ,
6050+ "default" ,
6051+ Provider {
6052+ metadata : Some ( openshell_core:: proto:: datamodel:: v1:: ObjectMeta {
6053+ name : "configure-create-race" . to_string ( ) ,
6054+ workspace : "default" . to_string ( ) ,
6055+ ..Default :: default ( )
6056+ } ) ,
6057+ r#type : TEST_GRAPH_PROVIDER_TYPE . to_string ( ) ,
6058+ profile_workspace : "default" . to_string ( ) ,
6059+ ..Default :: default ( )
6060+ } ,
6061+ )
6062+ . await
6063+ . unwrap ( ) ;
6064+
6065+ // Model a second gateway replica: it shares the durable database and
6066+ // credential backend, but owns an independent sandbox synchronization
6067+ // guard, so process-local serialization cannot hide this race.
6068+ let second_state = Arc :: new ( ServerState :: new_with_credentials (
6069+ first_state. config . clone ( ) ,
6070+ Arc :: clone ( & first_state. store ) ,
6071+ crate :: compute:: new_test_runtime ( Arc :: clone ( & first_state. store ) ) . await ,
6072+ crate :: sandbox_index:: SandboxIndex :: new ( ) ,
6073+ crate :: sandbox_watch:: SandboxWatchBus :: new ( ) ,
6074+ crate :: tracing_bus:: TracingLogBus :: new ( ) ,
6075+ Arc :: new ( crate :: supervisor_session:: SupervisorSessionRegistry :: new ( ) ) ,
6076+ None ,
6077+ first_state. credentials . clone ( ) ,
6078+ ) ) ;
6079+ let request = |client_secret : & str | ConfigureProviderRefreshRequest {
6080+ provider : "configure-create-race" . to_string ( ) ,
6081+ credential_key : "MS_GRAPH_ACCESS_TOKEN" . to_string ( ) ,
6082+ strategy : ProviderCredentialRefreshStrategy :: Oauth2ClientCredentials as i32 ,
6083+ material : HashMap :: from ( [
6084+ ( "tenant_id" . to_string ( ) , "tenant" . to_string ( ) ) ,
6085+ ( "client_id" . to_string ( ) , "client-id" . to_string ( ) ) ,
6086+ ( "client_secret" . to_string ( ) , client_secret. to_string ( ) ) ,
6087+ ] ) ,
6088+ secret_material_keys : vec ! [ "client_secret" . to_string( ) ] ,
6089+ expires_at_ms : None ,
6090+ workspace : "default" . to_string ( ) ,
6091+ } ;
6092+ let ( first_store_hit, release_first_store) = first_state. credentials . gate_next_store ( ) ;
6093+
6094+ let first = handle_configure_provider_refresh (
6095+ & first_state,
6096+ authed_request ( request ( "loser-secret" ) ) ,
6097+ ) ;
6098+ let second = async {
6099+ first_store_hit. await . unwrap ( ) ;
6100+ let result = handle_configure_provider_refresh (
6101+ & second_state,
6102+ authed_request ( request ( "winner-secret" ) ) ,
6103+ )
6104+ . await ;
6105+ release_first_store. send ( ( ) ) . unwrap ( ) ;
6106+ result
6107+ } ;
6108+ let ( first_result, second_result) = tokio:: join!( first, second) ;
6109+
6110+ assert_eq ! ( first_result. unwrap_err( ) . code( ) , Code :: Aborted ) ;
6111+ second_result. unwrap ( ) ;
6112+ assert_eq ! ( first_state. credentials. stored_credential_count( ) , Some ( 1 ) ) ;
6113+
6114+ let provider = first_state
6115+ . store
6116+ . get_message_by_name :: < Provider > ( "default" , "configure-create-race" )
6117+ . await
6118+ . unwrap ( )
6119+ . unwrap ( ) ;
6120+ let stored = crate :: provider_refresh:: get_refresh_state (
6121+ first_state. store . as_ref ( ) ,
6122+ "default" ,
6123+ provider. object_id ( ) ,
6124+ "MS_GRAPH_ACCESS_TOKEN" ,
6125+ )
6126+ . await
6127+ . unwrap ( )
6128+ . unwrap ( ) ;
6129+ assert_eq ! (
6130+ first_state
6131+ . credentials
6132+ . resolve_refresh_material(
6133+ crate :: provider_refresh:: refresh_material_scope( & stored) ,
6134+ & stored. secret_material_handles,
6135+ )
6136+ . await
6137+ . unwrap( )
6138+ . get( "client_secret" ) ,
6139+ Some ( & "winner-secret" . to_string( ) )
6140+ ) ;
6141+
6142+ let physical = first_state
6143+ . store
6144+ . get_by_name (
6145+ StoredProviderCredentialRefreshState :: object_type ( ) ,
6146+ "default" ,
6147+ stored. object_name ( ) ,
6148+ )
6149+ . await
6150+ . unwrap ( )
6151+ . unwrap ( ) ;
6152+ assert_eq ! ( physical. id, stored. object_id( ) ) ;
6153+ assert_eq ! (
6154+ crate :: provider_refresh:: list_refresh_states_for_provider(
6155+ first_state. store. as_ref( ) ,
6156+ provider. object_id( ) ,
6157+ )
6158+ . await
6159+ . unwrap( )
6160+ . len( ) ,
6161+ 1
6162+ ) ;
6163+ }
6164+
60446165 async fn state_with_authoritative_profiles_over_default_grants ( ) -> Arc < ServerState > {
60456166 let state = test_server_state ( ) . await ;
60466167 let store = state. store . as_ref ( ) ;
0 commit comments