Skip to content

fix(runagent): forward runtime agent vars into rootless exec #1253

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

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

fix(runagent): forward runtime agent vars into rootless exec #1253

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
8 changes: 7 additions & 1 deletion core/imageroot/usr/local/bin/runagent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,13 @@ else:

xdg_runtime_dir=f"/run/user/{module_uid}"
if os.path.isdir(xdg_runtime_dir):
os.execvp("/usr/sbin/runuser", ["runuser", "-s", "/usr/bin/env", "-l", mid, "--", f"XDG_RUNTIME_DIR={xdg_runtime_dir}"] + sys.argv)
# "runuser -l" resets the environment, so runtime agent vars (see
# core/agent/README.md) must be forwarded explicitly to survive it.
env_overrides = [f"XDG_RUNTIME_DIR={xdg_runtime_dir}"]
for varname in ['AGENT_COMFD', 'AGENT_TASK_ID', 'AGENT_TASK_ACTION', 'AGENT_TASK_USER']:
if varname in os.environ:
env_overrides.append(f"{varname}={os.environ[varname]}")
os.execvp("/usr/sbin/runuser", ["runuser", "-s", "/usr/bin/env", "-l", mid, "--"] + env_overrides + sys.argv)
else:
print(f"runagent: [FATAL] Cannot find runtime directory for {mid}", file=sys.stderr)
sys.exit(1)
Expand Down
Loading