Skip to content

Add cross-platform root user check function and refactor usage #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add cross-platform root user check function and refactor usage #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions clearml_session/interactive_session_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,19 @@ def _get_env_vars(*var_names, default=None):
return default


def _is_root_user():
"""Check if running as root/administrator in a cross-platform way."""
try:
if platform.system() == "Windows":
import ctypes
return ctypes.windll.shell32.IsUserAnAdmin() != 0
else:
# Unix/Linux/macOS
return os.geteuid() == 0
except:
return False


def init_task(param, a_default_ssh_fingerprint):
# initialize ClearML
Task.add_requirements('jupyter')
Expand Down Expand Up @@ -707,7 +720,7 @@ def setup_ssh_server(hostname, hostnames, param, task, env):
use_dropbear = bool(param.get("force_dropbear", False))

# if we are root, install open-ssh
if not use_dropbear and os.geteuid() == 0:
if not use_dropbear and _is_root_user():
# noinspection SpellCheckingInspection
os.system(
"export PYTHONPATH=\"\" && "
Expand Down Expand Up @@ -977,7 +990,7 @@ def setup_user_env(param, task):
print('Applying vault configuration failed: {}'.format(ex))

# do not change user bash/profile if we are not running inside a container
if os.geteuid() != 0:
if not _is_root_user():
# check if we are inside a container
is_container = False
try:
Expand Down Expand Up @@ -1703,7 +1716,7 @@ def _shutdown_cmd(self):
return

# if we are not running as root, remove the root check
if os.getuid() != 0:
if not _is_root_user():
batch_command = [batch_command[0]] + batch_command[2:]

path_folders = os.environ.get("PATH", "/usr/bin").split(os.pathsep)
Expand Down