Skip to content
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

Jump to bottom

[WIP]Try to get password prompts from sudo command with pty. #1264

Closed
wants to merge 1 commit into from
Closed

[WIP]Try to get password prompts from sudo command with pty. #1264

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions interpreter/core/computer/terminal/languages/shell.py
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interpreter/core/computer/terminal/languages/shell.py### [``]([url](url
Duplicate of #))

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ def __init__(
self.start_cmd = [os.environ.get("SHELL", "bash")]

def preprocess_code(self, code):
# Check if running sudo command
self.is_sudo = "sudo" in code
return preprocess_shell(code)

def line_postprocessor(self, line):
Expand Down
145 changes: 118 additions & 27 deletions interpreter/core/computer/terminal/languages/subprocess_language.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import pty
import queue
import re
import subprocess
Expand All @@ -16,6 +17,8 @@ def __init__(self):
self.verbose = False
self.output_queue = queue.Queue()
self.done = threading.Event()
self.slave_fd = None
self.is_sudo = False

def detect_active_line(self, line):
return None
Expand All @@ -38,37 +41,64 @@ def preprocess_code(self, code):
def terminate(self):
if self.process:
self.process.terminate()
self.process.stdin.close()
self.process.stdout.close()
if self.is_sudo:
os.close(self.slave_fd)
else:
self.process.stdin.close()
self.process.stdout.close()

def start_process(self):
if self.process:
self.terminate()

my_env = os.environ.copy()
my_env["PYTHONIOENCODING"] = "utf-8"
self.process = subprocess.Popen(
self.start_cmd,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
bufsize=0,
universal_newlines=True,
env=my_env,
encoding="utf-8",
errors="replace",
)
threading.Thread(
target=self.handle_stream_output,
args=(self.process.stdout, False),
daemon=True,
).start()
threading.Thread(
target=self.handle_stream_output,
args=(self.process.stderr, True),
daemon=True,
).start()
if self.is_sudo:
# Create a pseudo-terminal to get prompts of sudo command
master_fd, slave_fd = pty.openpty()
self.slave_fd = slave_fd
self.process = subprocess.Popen(
self.start_cmd,
stdin=slave_fd,
stdout=slave_fd,
stderr=slave_fd,
text=True,
bufsize=0,
universal_newlines=True,
env=my_env,
encoding="utf-8",
errors="replace",
)

# Handle output from the pseudo-terminal
threading.Thread(
target=self.handle_sudo_output,
args=(master_fd,),
daemon=True
).start()
else:
self.process = subprocess.Popen(
self.start_cmd,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
bufsize=0,
universal_newlines=True,
env=my_env,
encoding="utf-8",
errors="replace",
)
threading.Thread(
target=self.handle_stream_output,
args=(self.process.stdout, False),
daemon=True,
).start()
threading.Thread(
target=self.handle_stream_output,
args=(self.process.stderr, True),
daemon=True,
).start()

def run(self, code):
retry_count = 0
Expand All @@ -94,9 +124,13 @@ def run(self, code):
self.done.clear()

try:
self.process.stdin.write(code + "\n")
self.process.stdin.flush()
break
if self.is_sudo:
os.write(self.slave_fd, (code + "\n").encode('utf-8')) # 修改这里，使用os.write
break
else:
self.process.stdin.write(code + "\n")
self.process.stdin.flush()
break
except:
if retry_count != 0:
# For UX, I like to hide this if it happens once. Obviously feels better to not see errors
Expand Down Expand Up @@ -191,3 +225,60 @@ def handle_stream_output(self, stream, is_error_stream):
print("Stream closed while reading.")
else:
raise e

def handle_sudo_output(self, fd):
with os.fdopen(fd, 'r') as stream:
try:
for line in iter(stream.readline, ""):
# print(f"Received output line:\n{line}\n---")
if self.verbose:
print(f"Received output line:\n{line}\n---")

line = self.line_postprocessor(line)

if line is None:
continue # `line = None` is the postprocessor's signal to discard completely

if self.detect_active_line(line):
active_line = self.detect_active_line(line)
self.output_queue.put(
{
"type": "console",
"format": "active_line",
"content": active_line,
}
)
# Sometimes there's a little extra on the same line, so be sure to send that out
line = re.sub(r"##active_line\d+##", "", line)
if line:
self.output_queue.put(
{"type": "console", "format": "output", "content": line}
)
elif self.detect_end_of_execution(line):
# Sometimes there's a little extra on the same line, so be sure to send that out
line = line.replace("##end_of_execution##", "").strip()
if line:
self.output_queue.put(
{"type": "console", "format": "output", "content": line}
)
self.done.set()
elif "KeyboardInterrupt" in line:
self.output_queue.put(
{
"type": "console",
"format": "output",
"content": "KeyboardInterrupt",
}
)
time.sleep(0.1)
self.done.set()
else:
self.output_queue.put(
{"type": "console", "format": "output", "content": line}
)
except ValueError as e:
if "operation on closed file" in str(e):
if self.verbose:
print("Stream closed while reading.")
else:
raise e