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

Markup change, whitespace and comment edits

Browse source
This commit is contained in:
BlauFeuer 2017-02-20 22:01:50 -05:00 • committed by GitHub
parent f14667cdd6
commit 9be2db3f93
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
evennia/server/portal/ssh.py
View file

@ -32,7 +32,7 @@ packages).
try: try:
from twisted.conch.ssh.keys import Key from twisted.conch.ssh.keys import Key
except ImportError: except ImportError:
raise ImportError (_SSH_IMPORT_ERROR) raise ImportError(_SSH_IMPORT_ERROR)
from twisted.conch.ssh.userauth import SSHUserAuthServer from twisted.conch.ssh.userauth import SSHUserAuthServer
from twisted.conch.ssh import common from twisted.conch.ssh import common
@ -49,7 +49,7 @@ from evennia.players.models import PlayerDB
from evennia.utils import ansi from evennia.utils import ansi
from evennia.utils.utils import to_str from evennia.utils.utils import to_str
_RE_N = re.compile(r"\{n$") _RE_N = re.compile(r"\|n$")
_RE_SCREENREADER_REGEX = re.compile(r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE) _RE_SCREENREADER_REGEX = re.compile(r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE)
_GAME_DIR = settings.GAME_DIR _GAME_DIR = settings.GAME_DIR
@ -206,7 +206,7 @@ class SshProtocol(Manhole, session.Session):
""" """
for line in string.split('\n'): for line in string.split('\n'):
#this is the telnet-specific method for sending # the telnet-specific method for sending
self.terminal.write(line) self.terminal.write(line)
self.terminal.nextLine() self.terminal.nextLine()
@ -255,7 +255,7 @@ class SshProtocol(Manhole, session.Session):
Note that it must be actively turned back on again! Note that it must be actively turned back on again!
""" """
#print "telnet.send_text", args,kwargs # print "telnet.send_text", args,kwargs # DEBUG
text = args[0] if args else "" text = args[0] if args else ""
if text is None: if text is None:
return return
@ -268,8 +268,8 @@ class SshProtocol(Manhole, session.Session):
useansi = options.get("ansi", flags.get('ANSI', True)) useansi = options.get("ansi", flags.get('ANSI', True))
raw = options.get("raw", flags.get("RAW", False)) raw = options.get("raw", flags.get("RAW", False))
nocolor = options.get("nocolor", flags.get("NOCOLOR") or not (xterm256 or useansi)) nocolor = options.get("nocolor", flags.get("NOCOLOR") or not (xterm256 or useansi))
#echo = options.get("echo", None) # echo = options.get("echo", None) # DEBUG
screenreader = options.get("screenreader", flags.get("SCREENREADER", False)) screenreader = options.get("screenreader", flags.get("SCREENREADER", False))
if screenreader: if screenreader:
# screenreader mode cleans up output # screenreader mode cleans up output
@ -283,7 +283,7 @@ class SshProtocol(Manhole, session.Session):
else: else:
# we need to make sure to kill the color at the end in order # we need to make sure to kill the color at the end in order
# to match the webclient output. # to match the webclient output.
linetosend = ansi.parse_ansi(_RE_N.sub("", text) + "{n", strip_ansi=nocolor, xterm256=xterm256, mxp=False) linetosend = ansi.parse_ansi(_RE_N.sub("", text) + "|n", strip_ansi=nocolor, xterm256=xterm256, mxp=False)
self.sendLine(linetosend) self.sendLine(linetosend)
def send_prompt(self, *args, **kwargs): def send_prompt(self, *args, **kwargs):
@ -453,11 +453,10 @@ def makeFactory(configdict):
factory.publicKeys = {'ssh-rsa': publicKey} factory.publicKeys = {'ssh-rsa': publicKey}
factory.privateKeys = {'ssh-rsa': privateKey} factory.privateKeys = {'ssh-rsa': privateKey}
except Exception as err: except Exception as err:
print ( "getKeyPair error: {err}\n WARNING: Evennia could not " \ print("getKeyPair error: {err}\n WARNING: Evennia could not "
"auto-generate SSH keypair. Using conch default keys instead.\n" \ "auto-generate SSH keypair. Using conch default keys instead.\n"
"If this error persists, create {pub} and " \ "If this error persists, create {pub} and "
"{priv} yourself using third-party tools.".format( "{priv} yourself using third-party tools.".format(err=err, pub=pubkeyfile, priv=privkeyfile))
err=err, pub=pubkeyfile, priv=privkeyfile))
factory.services = factory.services.copy() factory.services = factory.services.copy()
factory.services['ssh-userauth'] = ExtraInfoAuthServer factory.services['ssh-userauth'] = ExtraInfoAuthServer