Skip to content

πŸ™Œ OpenHands: AI-Driven Development

Add username parameter to AsyncBashSession (#8746)

Robert Brennan82657b7ba12a
diff --git a/openhands/runtime/action_execution_server.py b/openhands/runtime/action_execution_server.py
index 30a48df1a5..4e1f5b96aa 100644
--- a/openhands/runtime/action_execution_server.py
+++ b/openhands/runtime/action_execution_server.py
@@ -390,7 +390,9 @@ class ActionExecutor:
try:
if action.is_static:
path = action.cwd or self._initial_cwd
- result = await AsyncBashSession.execute(action.command, path)
+ result = await AsyncBashSession.execute(
+ action.command, path, self.username
+ )
obs = CmdOutputObservation(
content=result.content,
exit_code=result.exit_code,
diff --git a/openhands/runtime/base.py b/openhands/runtime/base.py
index 92a3a707a8..a7950d4c08 100644
--- a/openhands/runtime/base.py
+++ b/openhands/runtime/base.py
@@ -346,7 +346,7 @@ class Runtime(FileEditRuntimeMixin):
'No repository selected. Initializing a new git repository in the workspace.'
)
action = CmdRunAction(
- command='git init',
+ command=f'git init && git config --global --add safe.directory {self.workspace_root}'
)
self.run_action(action)
else:
diff --git a/openhands/runtime/utils/async_bash.py b/openhands/runtime/utils/async_bash.py
index b7ac3823e5..3df675d610 100644
--- a/openhands/runtime/utils/async_bash.py
+++ b/openhands/runtime/utils/async_bash.py
@@ -1,12 +1,15 @@
import asyncio
import os
+import pwd
from openhands.runtime.base import CommandResult
class AsyncBashSession:
@staticmethod
- async def execute(command: str, work_dir: str) -> CommandResult:
+ async def execute(
+ command: str, work_dir: str, username: str | None = None
+ ) -> CommandResult:
"""Execute a command in the bash session asynchronously."""
work_dir = os.path.abspath(work_dir)
@@ -17,12 +20,24 @@ class AsyncBashSession:
if not command:
return CommandResult(content='', exit_code=0)
+ env = {}
+ if username:
+ try:
+ user_info = pwd.getpwnam(username)
+ env['HOME'] = user_info.pw_dir
+ env['USER'] = username
+ env['LOGNAME'] = username
+ except KeyError:
+ raise ValueError(f'User {username} does not exist.')
+ # Prepare to run the command
try:
process = await asyncio.subprocess.create_subprocess_shell(
command,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE,
cwd=work_dir,
+ user=username,
+ env=env,
)
try:
diff --git a/tests/unit/test_runtime_git_tokens.py b/tests/unit/test_runtime_git_tokens.py
index 8a3f6f4c26..7bf7ac0996 100644
--- a/tests/unit/test_runtime_git_tokens.py
+++ b/tests/unit/test_runtime_git_tokens.py
@@ -234,7 +234,10 @@ async def test_clone_or_init_repo_no_repo_with_user_id(temp_dir):
# Verify that git init was called
assert len(runtime.run_action_calls) == 1
assert isinstance(runtime.run_action_calls[0], CmdRunAction)
- assert runtime.run_action_calls[0].command == 'git init'
+ assert (
+ runtime.run_action_calls[0].command
+ == f'git init && git config --global --add safe.directory {runtime.workspace_root}'
+ )
assert result == ''
@@ -255,7 +258,10 @@ async def test_clone_or_init_repo_no_repo_no_user_id_no_workspace_base(temp_dir)
# Verify that git init was called
assert len(runtime.run_action_calls) == 1
assert isinstance(runtime.run_action_calls[0], CmdRunAction)
- assert runtime.run_action_calls[0].command == 'git init'
+ assert (
+ runtime.run_action_calls[0].command
+ == f'git init && git config --global --add safe.directory {runtime.workspace_root}'
+ )
assert result == ''