Skip to content

[Container] az container exec: Fix exception when stdin is not a tty #30397

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

Merged
zhoxing-ms merged 1 commit into from
Jan 7, 2025
Merged

[Container] az container exec: Fix exception when stdin is not a tty #30397

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
15 changes: 11 additions & 4 deletions src/azure-cli/azure/cli/command_modules/container/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,10 +1003,16 @@ def _on_ws_open_windows(ws):

def _start_exec_pipe_linux(web_socket_uri, password):
stdin_fd = sys.stdin.fileno()
old_tty = termios.tcgetattr(stdin_fd)
try:
old_tty = termios.tcgetattr(stdin_fd)
has_tty = True
except termios.error:
old_tty = None
has_tty = False
old_winch_handler = signal.getsignal(signal.SIGWINCH)
tty.setraw(stdin_fd)
tty.setcbreak(stdin_fd)
if has_tty:
tty.setraw(stdin_fd)
tty.setcbreak(stdin_fd)
buff = bytearray()
lock = threading.Lock()

Expand All @@ -1018,7 +1024,8 @@ def _on_ws_open_linux(ws):
flushKeyboard.start()
ws = websocket.WebSocketApp(web_socket_uri, on_open=_on_ws_open_linux, on_message=_on_ws_msg)
ws.run_forever()
termios.tcsetattr(stdin_fd, termios.TCSADRAIN, old_tty)
if has_tty:
termios.tcsetattr(stdin_fd, termios.TCSADRAIN, old_tty)
signal.signal(signal.SIGWINCH, old_winch_handler)


Expand Down
Loading