Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix TTYPE error on malformed TTYPE from client

Browse source 
Resolves #1848.
This commit is contained in:
Griatch 2019-05-28 23:13:48 +02:00
parent d242537d80
commit 7a47c569eb
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
evennia/server/portal/ttype.py
View file

@ -104,23 +104,28 @@ class Ttype(object):
# this is supposed to be the name of the client/terminal. # this is supposed to be the name of the client/terminal.
# For clients not supporting the extended TTYPE # For clients not supporting the extended TTYPE
# definition, subsequent calls will just repeat-return this. # definition, subsequent calls will just repeat-return this.
try:
clientname = option.upper() clientname = option.upper()
except AttributeError:
# malformed option (not a string)
clientname = "UNKNOWN"
# use name to identify support for xterm256. Many of these # use name to identify support for xterm256. Many of these
# only support after a certain version, but all support # only support after a certain version, but all support
# it since at least 4 years. We assume recent client here for now. # it since at least 4 years. We assume recent client here for now.
cupper = clientname.upper()
xterm256 = False xterm256 = False
if cupper.startswith("MUDLET"): if clientname.startswith("MUDLET"):
# supports xterm256 stably since 1.1 (2010?) # supports xterm256 stably since 1.1 (2010?)
xterm256 = cupper.split("MUDLET", 1)[1].strip() >= "1.1" xterm256 = clientname.split("MUDLET", 1)[1].strip() >= "1.1"
self.protocol.protocol_flags["FORCEDENDLINE"] = False self.protocol.protocol_flags["FORCEDENDLINE"] = False
if cupper.startswith("TINTIN++"): if clientname.startswith("TINTIN++"):
self.protocol.protocol_flags["FORCEDENDLINE"] = True self.protocol.protocol_flags["FORCEDENDLINE"] = True
if (cupper.startswith("XTERM") or if (clientname.startswith("XTERM") or
cupper.endswith("-256COLOR") or clientname.endswith("-256COLOR") or
cupper in ("ATLANTIS", # > 0.9.9.0 (aug 2009) clientname in (
"ATLANTIS", # > 0.9.9.0 (aug 2009)
"CMUD", # > 3.04 (mar 2009) "CMUD", # > 3.04 (mar 2009)
"KILDCLIENT", # > 2.2.0 (sep 2005) "KILDCLIENT", # > 2.2.0 (sep 2005)
"MUDLET", # > beta 15 (sep 2009) "MUDLET", # > beta 15 (sep 2009)