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

Added better error handling if SSH keypair fail to generate (issue 167)

Browse source
This commit is contained in:
Griatch 2011-05-31 19:16:03 +00:00
parent 790f840715
commit 88c1002fde
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/default/building.py
View file

@ -669,7 +669,7 @@ class CmdDig(ObjManipCommand):
class CmdTunnel(MuxCommand): class CmdTunnel(MuxCommand):
""" """
tunnel in often-used directions dig in often-used directions
Usage: Usage:
@tunnel[/switch] <direction> [= roomname[;alias;alias;...][:typeclass]] @tunnel[/switch] <direction> [= roomname[;alias;alias;...][:typeclass]]

30
src/server/ssh.py
View file

@ -276,15 +276,15 @@ class TerminalSessionTransport_getPeer:
self.chainedProtocol.terminalProtocol.terminalSize(width, height) self.chainedProtocol.terminalProtocol.terminalSize(width, height)
def getKeyPair(): def getKeyPair(pubkeyfile, privkeyfile):
""" """
This function looks for RSA keypair files in the current directory. If they This function looks for RSA keypair files in the current directory. If they
do not exist, the keypair is created. do not exist, the keypair is created.
""" """
if not (os.path.exists('ssh-public.key') and os.path.exists('ssh-private.key')): if not (os.path.exists(pubkeyfile) and os.path.exists(privkeyfile)):
# No keypair exists. Generate a new RSA keypair # No keypair exists. Generate a new RSA keypair
print " Generating SSH RSA keypair (only done once) ...", print " Generating SSH RSA keypair ...",
from Crypto.PublicKey import RSA from Crypto.PublicKey import RSA
KEY_LENGTH = 1024 KEY_LENGTH = 1024
@ -293,12 +293,12 @@ def getKeyPair():
privateKeyString = rsaKey.toString(type="OPENSSH") privateKeyString = rsaKey.toString(type="OPENSSH")
# save keys for the future. # save keys for the future.
file('ssh-public.key', 'w+b').write(publicKeyString) file(pubkeyfile, 'w+b').write(publicKeyString)
file('ssh-private.key', 'w+b').write(privateKeyString) file(privkeyfile, 'w+b').write(privateKeyString)
print " done." print " done."
else: else:
publicKeyString = file('ssh-public.key').read() publicKeyString = file(pubkeyfile).read()
privateKeyString = file('ssh-private.key').read() privateKeyString = file(privkeyfile).read()
return Key.fromString(publicKeyString), Key.fromString(privateKeyString) return Key.fromString(publicKeyString), Key.fromString(privateKeyString)
@ -307,6 +307,9 @@ def makeFactory(configdict):
Creates the ssh server factory. Creates the ssh server factory.
""" """
pubkeyfile = "ssh-public.key"
privkeyfile = "ssh-private.key"
def chainProtocolFactory(): def chainProtocolFactory():
return insults.ServerProtocol( return insults.ServerProtocol(
configdict['protocolFactory'], configdict['protocolFactory'],
@ -318,11 +321,14 @@ def makeFactory(configdict):
rlm.chainedProtocolFactory = chainProtocolFactory rlm.chainedProtocolFactory = chainProtocolFactory
factory = ConchFactory(Portal(rlm)) factory = ConchFactory(Portal(rlm))
# create/get RSA keypair try:
publicKey, privateKey = getKeyPair() # create/get RSA keypair
publicKey, privateKey = getKeyPair(pubkeyfile, privkeyfile)
factory.publicKeys = {'ssh-rsa': publicKey} factory.publicKeys = {'ssh-rsa': publicKey}
factory.privateKeys = {'ssh-rsa': privateKey} factory.privateKeys = {'ssh-rsa': privateKey}
except Exception, e:
print " getKeyPair error: %s\n WARNING: Evennia could not auto-generate SSH keypair. Using conch default keys instead." % e
print " If this error persists, create game/%s and game/%s yourself using third-party tools." % (pubkeyfile, privkeyfile)
factory.services = factory.services.copy() factory.services = factory.services.copy()
factory.services['ssh-userauth'] = ExtraInfoAuthServer factory.services['ssh-userauth'] = ExtraInfoAuthServer