diff --git a/src/prompt_toolkit/contrib/telnet/server.py b/src/prompt_toolkit/contrib/telnet/server.py index 5347a3f98..8c2589578 100644 --- a/src/prompt_toolkit/contrib/telnet/server.py +++ b/src/prompt_toolkit/contrib/telnet/server.py @@ -90,7 +90,10 @@ def __init__(self, connection: socket.socket, encoding: str) -> None: def write(self, data: str) -> None: data = data.replace("\n", "\r\n") - self._buffer.append(data.encode(self._encoding, errors=self._errors)) + # A literal 0xFF byte has to be sent as IAC IAC, otherwise the client + # interprets it (and the bytes after it) as a telnet command. + encoded = data.encode(self._encoding, errors=self._errors) + self._buffer.append(encoded.replace(IAC, IAC + IAC)) self.flush() def isatty(self) -> bool: diff --git a/tests/test_telnet.py b/tests/test_telnet.py new file mode 100644 index 000000000..605e15af2 --- /dev/null +++ b/tests/test_telnet.py @@ -0,0 +1,29 @@ +from __future__ import annotations + +import socket + +from prompt_toolkit.contrib.telnet.protocol import TelnetProtocolParser +from prompt_toolkit.contrib.telnet.server import _ConnectionStdout + + +def test_connection_stdout_escapes_iac(): + a, b = socket.socketpair() + try: + stdout = _ConnectionStdout(a, encoding="latin-1") + # "\xff\xfc\x01" is IAC WONT ECHO when sent unescaped. + stdout.write("a\xff\xfc\x01b\n") + wire = b.recv(1024) + finally: + a.close() + b.close() + + assert wire == b"a\xff\xff\xfc\x01b\r\n" + + data: list[bytes] = [] + commands: list[tuple[bytes, bytes]] = [] + parser = TelnetProtocolParser(data.append, lambda rows, columns: None, print) + parser.command_received = lambda command, d: commands.append((command, d)) + parser.feed(wire) + + assert b"".join(data) == "a\xff\xfc\x01b\r\n".encode("latin-1") + assert commands == []