@@ -38,20 +38,21 @@ use openshell_core::proto::{
3838 CreateSandboxRequest , CreateSshSessionRequest , DeleteInferenceRouteRequest ,
3939 DeleteProviderProfileRequest , DeleteProviderRefreshRequest , DeleteProviderRequest ,
4040 DeleteSandboxRequest , DeleteServiceRequest , DetachSandboxProviderRequest , ExecSandboxRequest ,
41- ExposeServiceRequest , GetDraftHistoryRequest , GetDraftPolicyRequest , GetGatewayConfigRequest ,
42- GetInferenceRouteRequest , GetProviderProfileRequest , GetProviderRefreshStatusRequest ,
43- GetProviderRequest , GetSandboxConfigRequest , GetSandboxConfigResponse , GetSandboxLogsRequest ,
44- GetSandboxPolicyStatusRequest , GetSandboxRequest , GetServiceRequest , GpuResourceRequirements ,
45- ImportProviderProfilesRequest , LintProviderProfilesRequest , ListProviderProfilesRequest ,
46- ListProvidersRequest , ListSandboxPoliciesRequest , ListSandboxProvidersRequest ,
47- ListSandboxesRequest , ListServicesRequest , PolicySource , PolicyStatus , Provider ,
48- ProviderCredentialRefreshStatus , ProviderCredentialRefreshStrategy , ProviderProfile ,
49- ProviderProfileDiagnostic , ProviderProfileImportItem , RejectDraftChunkRequest ,
50- ResourceRequirements , RevokeSshSessionRequest , RotateProviderCredentialRequest , Sandbox ,
51- SandboxPhase , SandboxPolicy , SandboxSpec , SandboxTemplate , ServiceEndpointResponse ,
52- SetInferenceRouteRequest , SettingScope , TcpForwardFrame , TcpForwardInit , TcpRelayTarget ,
53- UpdateConfigRequest , UpdateProviderProfilesRequest , UpdateProviderRequest , WatchSandboxRequest ,
54- exec_sandbox_event, setting_value, tcp_forward_init,
41+ ExposeServiceRequest , GetCurrentUserRequest , GetDraftHistoryRequest , GetDraftPolicyRequest ,
42+ GetGatewayConfigRequest , GetInferenceRouteRequest , GetProviderProfileRequest ,
43+ GetProviderRefreshStatusRequest , GetProviderRequest , GetSandboxConfigRequest ,
44+ GetSandboxConfigResponse , GetSandboxLogsRequest , GetSandboxPolicyStatusRequest ,
45+ GetSandboxRequest , GetServiceRequest , GpuResourceRequirements , ImportProviderProfilesRequest ,
46+ LintProviderProfilesRequest , ListProviderProfilesRequest , ListProvidersRequest ,
47+ ListSandboxPoliciesRequest , ListSandboxProvidersRequest , ListSandboxesRequest ,
48+ ListServicesRequest , PolicySource , PolicyStatus , Provider , ProviderCredentialRefreshStatus ,
49+ ProviderCredentialRefreshStrategy , ProviderProfile , ProviderProfileDiagnostic ,
50+ ProviderProfileImportItem , RejectDraftChunkRequest , ResourceRequirements ,
51+ RevokeSshSessionRequest , RotateProviderCredentialRequest , Sandbox , SandboxPhase , SandboxPolicy ,
52+ SandboxSpec , SandboxTemplate , ServiceEndpointResponse , SetInferenceRouteRequest , SettingScope ,
53+ TcpForwardFrame , TcpForwardInit , TcpRelayTarget , UpdateConfigRequest ,
54+ UpdateProviderProfilesRequest , UpdateProviderRequest , WatchSandboxRequest , exec_sandbox_event,
55+ setting_value, tcp_forward_init,
5556} ;
5657use openshell_core:: settings;
5758use openshell_core:: { ObjectId , ObjectName , ObjectWorkspace } ;
@@ -115,6 +116,65 @@ impl ProgressOutput {
115116 }
116117}
117118
119+ #[ derive( Debug , Clone ) ]
120+ struct CurrentUserView {
121+ subject : String ,
122+ display_name : Option < String > ,
123+ roles : Vec < String > ,
124+ scopes : Vec < String > ,
125+ identity_provider : String ,
126+ }
127+
128+ /// Show the identity validated by the selected gateway.
129+ pub async fn whoami ( server : & str , tls : & TlsOptions , output : & str ) -> Result < ( ) > {
130+ let mut client = grpc_client ( server, tls) . await ?;
131+ let identity = client
132+ . get_current_user ( GetCurrentUserRequest { } )
133+ . await
134+ . map_err ( |err| match err. code ( ) {
135+ Code :: Unimplemented => miette ! ( "whoami is not supported by this gateway version" ) ,
136+ Code :: Unauthenticated => miette ! ( "whoami requires authentication: {err}" ) ,
137+ _ => miette ! ( "get_current_user failed: {err}" ) ,
138+ } ) ?
139+ . into_inner ( ) ;
140+
141+ let view = CurrentUserView {
142+ subject : identity. subject ,
143+ display_name : ( !identity. display_name . is_empty ( ) ) . then_some ( identity. display_name ) ,
144+ roles : identity. roles ,
145+ scopes : identity. scopes ,
146+ identity_provider : identity. identity_provider ,
147+ } ;
148+ print_current_user ( & view, output)
149+ }
150+
151+ fn print_current_user ( view : & CurrentUserView , output : & str ) -> Result < ( ) > {
152+ if crate :: output:: print_output_single ( output, view, current_user_to_json) ? {
153+ return Ok ( ( ) ) ;
154+ }
155+
156+ println ! ( "{}" , "Current User" . cyan( ) . bold( ) ) ;
157+ println ! ( ) ;
158+ println ! ( " {} {}" , "Subject:" . dimmed( ) , view. subject) ;
159+ if let Some ( display_name) = & view. display_name {
160+ println ! ( " {} {}" , "Name:" . dimmed( ) , display_name) ;
161+ }
162+ println ! ( " {} {}" , "Provider:" . dimmed( ) , view. identity_provider) ;
163+ println ! ( " {} {}" , "Roles:" . dimmed( ) , view. roles. join( ", " ) ) ;
164+ println ! ( " {} {}" , "Scopes:" . dimmed( ) , view. scopes. join( ", " ) ) ;
165+ Ok ( ( ) )
166+ }
167+
168+ fn current_user_to_json ( view : & CurrentUserView ) -> serde_json:: Value {
169+ serde_json:: json!( {
170+ "subject" : & view. subject,
171+ "display_name" : & view. display_name,
172+ "roles" : & view. roles,
173+ "scopes" : & view. scopes,
174+ "identity_provider" : & view. identity_provider,
175+ } )
176+ }
177+
118178/// Validate system prerequisites for running a gateway.
119179///
120180/// Checks Docker connectivity and reports the result. Returns exit code 0
@@ -420,11 +480,17 @@ pub async fn sandbox_create(
420480 }
421481 None => None ,
422482 } ;
423- let providers_v2_enabled = gateway_providers_v2_enabled ( & mut client) . await ?;
483+ let inferred_provider = inferred_provider_type ( command) ;
484+ let providers_v2_enabled =
485+ if inferred_provider. is_some ( ) && auto_providers_override != Some ( false ) {
486+ gateway_providers_v2_enabled ( & mut client) . await ?
487+ } else {
488+ false
489+ } ;
424490 let inferred_types: Vec < String > = if providers_v2_enabled {
425491 Vec :: new ( )
426492 } else {
427- inferred_provider_type ( command ) . into_iter ( ) . collect ( )
493+ inferred_provider . into_iter ( ) . collect ( )
428494 } ;
429495 let configured_providers = ensure_required_providers (
430496 & mut client,
0 commit comments