Skip to content

Feature: Optional adding the OS user to a OS group #122

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
ohmer1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Feature: Optional adding the OS user to a OS group #122

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions open_terminal/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ def _resolve_file_env(var: str, default: str = "") -> str:
config.get("user_prefix", ""),
)

USER_GROUP = os.environ.get(
"OPEN_TERMINAL_USER_GROUP",
config.get("user_group", ""),
)

UVICORN_LOOP = os.environ.get(
"OPEN_TERMINAL_UVICORN_LOOP",
config.get("uvicorn_loop", "auto"),
Expand Down
5 changes: 5 additions & 0 deletions open_terminal/utils/user_isolation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ def ensure_os_user(username: str) -> str:
for reads while other provisioned users still get ``Permission denied``.
Returns the home directory path.
"""
from open_terminal.env import USER_GROUP

try:
pw = pwd.getpwnam(username)
return pw.pw_dir
Expand All @@ -100,6 +102,9 @@ def ensure_os_user(username: str) -> str:
# different UID assignment) and set permissions.
_run_privileged(["chown", "-R", f"{username}:{username}", home_dir])
_run_privileged(["chmod", "2770", home_dir])
# Optionally add the OS user to a shared group
if USER_GROUP:
_run_privileged(["usermod", "-aG", USER_GROUP, username])
# Add the server process user to the new user's group so Python can
# read files natively without subprocess.
server_user = os.getenv("USER", "user")
Expand Down