From adc373e3a0a8a2cdeefeb1b6a0bbbeb3a076bc11 Mon Sep 17 00:00:00 2001 From: Amit Gelber Date: Fri, 20 Nov 2026 10:22:37 +0200 Subject: [PATCH] [API Server] Keep user_type on the request user for authenticated requests #11292 skips the users upsert for authenticated requests, so the user the request runs as carries only id and name. Admin policies then see UserRequest.user.user_type=None for every authenticated user, the value they would see for a request with no auth. Read the users row for authenticated requests, as the workspace resolver already does. --- sky/server/requests/executor.py | 2 ++ .../test_sky/server/requests/test_executor.py | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/sky/server/requests/executor.py b/sky/server/requests/executor.py index 888945a9c85..1c514772a7e 100644 --- a/sky/server/requests/executor.py +++ b/sky/server/requests/executor.py @@ -1065,6 +1065,8 @@ def override_request_env_and_config( _, user = global_user_state.add_or_update_user(user, return_user=True) _seed_role_if_missing(user.id) + else: + user = global_user_state.get_user(user.id) or user using_remote_api_server = request_body.using_remote_api_server # Force color to be enabled. diff --git a/tests/unit_tests/test_sky/server/requests/test_executor.py b/tests/unit_tests/test_sky/server/requests/test_executor.py index d609e7b71e9..bd867a68caf 100644 --- a/tests/unit_tests/test_sky/server/requests/test_executor.py +++ b/tests/unit_tests/test_sky/server/requests/test_executor.py @@ -3331,6 +3331,22 @@ def fake_resolve(user, action, pick_for_read): assert not counted_user_upsert +def test_authenticated_request_user_carries_user_type(counted_user_upsert, + monkeypatch): + """Admin policies read user_type to tell authenticated users apart.""" + monkeypatch.setattr( + 'sky.global_user_state.get_user', + mock.Mock(return_value=models.User( + id='user-1', name='alice', user_type=models.UserType.SSO.value))) + reload = mock.Mock() + monkeypatch.setattr(executor.server_common, 'reload_for_new_request', + reload) + _run_override_as_user(authenticated=True) + assert reload.call_args.kwargs['user'].user_type == ( + models.UserType.SSO.value) + assert not counted_user_upsert + + def test_stamp_sets_authenticated_from_auth_user(): """A client cannot claim to be authenticated.""" body = payloads.RequestBody(env_vars={