Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sky/server/requests/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 16 additions & 0 deletions tests/unit_tests/test_sky/server/requests/test_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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={
Expand Down
Loading