Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix TypeError in telnet HTTP check when command stacking sends bytes data

Browse source
This commit is contained in:
Wendy 2026-03-02 01:00:43 +01:00
parent 3761a7cb21
commit b1f647bf6d
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/server/portal/telnet.py
View file

@ -44,7 +44,7 @@ _IDLE_COMMAND = str.encode(settings.IDLE_COMMAND + "\n")
# identify HTTP indata
_HTTP_REGEX = re.compile(
r"(GET|HEAD|POST|PUT|DELETE|TRACE|OPTIONS|CONNECT|PATCH) (.*? HTTP/[0-9]\.[0-9])", re.I
rb"(GET|HEAD|POST|PUT|DELETE|TRACE|OPTIONS|CONNECT|PATCH) (.*? HTTP/[0-9]\.[0-9])", re.I
)
_HTTP_WARNING = bytes(
@ -330,8 +330,10 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, _BASE_SESSION_CLASS):
data = [_IDLE_COMMAND]
else:
data = _RE_LINEBREAK.split(data)
if len(data) > 2 and _HTTP_REGEX.match(data[0]):
# Normalize to bytes for regex match if needed.
if len(data) > 2 and _HTTP_REGEX.match(
data[0].encode("utf-8", errors="replace") if isinstance(data[0], str) else data[0]
):
# guard against HTTP request on the Telnet port; we
# block and kill the connection.
self.transport.write(_HTTP_WARNING)

16
evennia/server/portal/tests.py
View file

@ -236,6 +236,22 @@ class TestTelnet(TwistedTestCase):
self.transport = proto_helpers.StringTransport()
self.addCleanup(factory.sessionhandler.disconnect_all)
@mock.patch("evennia.server.portal.portalsessionhandler.reactor", new=MagicMock())
def test_command_stacking_no_type_error(self):
self.transport.client = ["localhost"]
self.transport.setTcpKeepAlive = Mock()
d = self.proto.makeConnection(self.transport)
# Mudlet sends multiple commands in one packet when command stacking
data = b"wave\r\nsay hi\r\n"
try:
self.proto.dataReceived(data)
except TypeError:
self.fail("dataReceived raised TypeError on stacked commands")
# clean up to prevent Unclean reactor
self.proto.nop_keep_alive.stop()
self.proto._handshake_delay.cancel()
return d
@mock.patch("evennia.server.portal.portalsessionhandler.reactor", new=MagicMock())
def test_mudlet_ttype(self):
self.transport.client = ["localhost"]