Update app.py

app.py

@@ -249,46 +249,47 @@ async def execute_get(command: str, files=None):
                         with open(file_path, 'wb') as f:
                             f.write(content)
 
-                with tempfile.NamedTemporaryFile(mode='w', suffix='.sh', delete=False, dir=temp_dir) as script_file:
+                temp_user = f"forge_temp_{container_id}"
+                user_created = False
+                try:
+                    subprocess.run(['useradd', '--no-create-home', '--shell', '/bin/bash', temp_user],
+                                 check=True, capture_output=True)
+                    user_created = True
+
+                    subprocess.run(['chown', '-R', temp_user, workspace_dir],
+                                 check=True, capture_output=True)
+
+                    script_path = os.path.join(temp_dir, 'script.sh')
                     script_content = f"""#!/bin/bash
-cd /workspace
+cd {workspace_dir}
 {command}
 """
-                    script_file.write(script_content)
-                    script_path = script_file.name
-
-                os.chmod(script_path, 0o755)
-
-                docker_cmd = [
-                    'docker', 'run',
-                    '--rm',
-                    '--name', f'forge-exec-{container_id}',
-                    '--cpus', '0.25',
-                    '--memory', '1g',
-                    '--memory-swap', '1g',
-                    '--network', 'none',
-                    '--read-only',
-                    '--tmpfs', '/tmp:rw,noexec,nosuid,size=100m',
-                    '--env', 'PYTHONUNBUFFERED=1',
-                    '--volume', f'{workspace_dir}:/workspace:rw',
-                    '--volume', f'{script_path}:/script.sh:ro',
-                    '--workdir', '/workspace',
-                    'python:3.11-slim',
-                    'bash', '/script.sh'
-                ]
-
-                process = subprocess.Popen(
-                    docker_cmd,
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT,
-                    text=True,
-                    bufsize=1
-                )
+                    with open(script_path, 'w') as f:
+                        f.write(script_content)
+                    os.chmod(script_path, 0o755)
+
+                    subprocess.run(['chown', temp_user, script_path],
+                                 check=True, capture_output=True)
+
+                    cmd = ['sudo', '-u', temp_user, 'bash', script_path]
+
+                    process = subprocess.Popen(
+                        cmd,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.STDOUT,
+                        text=True,
+                        bufsize=1,
+                        cwd=workspace_dir,
+                        env={'PYTHONUNBUFFERED': '1', 'PATH': '/usr/local/bin:/usr/bin:/bin'}
+                    )
+                except subprocess.CalledProcessError as e:
+                    yield f"data: Failed to setup execution environment: {e}\n\n"
+                    return
 
                 while True:
                     if time.time() - start_time > timeout_seconds:
                         try:
-                            subprocess.run(['docker', 'kill', f'forge-exec-{container_id}'], timeout=5)
+                            process.kill()
                         except:
                             pass
                         yield f"data: Command timed out after 30 seconds\n\n"
@@ -315,7 +316,8 @@ cd /workspace
             yield f"data: Error: {str(e)}\n\n"
         finally:
             try:
-                subprocess.run(['docker', 'rm', '-f', f'forge-exec-{container_id}'], timeout=5, capture_output=True)
+                if user_created:
+                    subprocess.run(['userdel', '-r', temp_user], timeout=5, capture_output=True)
             except:
                 pass