diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-25 15:25:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-25 15:25:31 +0100 |
| commit | b94a43d5b5a949fbd67109b34cfcec925fa82fe4 (patch) | |
| tree | 1e427071264b9cd23233175b3cff4684d93d6e36 /synapse/util/manhole.py | |
| parent | Use allow/deny (diff) | |
| parent | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin (diff) | |
| download | synapse-b94a43d5b5a949fbd67109b34cfcec925fa82fe4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list
Diffstat (limited to 'synapse/util/manhole.py')
| -rw-r--r-- | synapse/util/manhole.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/util/manhole.py b/synapse/util/manhole.py index 8d0f2a8918..9cb7e9c9ab 100644 --- a/synapse/util/manhole.py +++ b/synapse/util/manhole.py @@ -70,6 +70,8 @@ def manhole(username, password, globals): Returns: twisted.internet.protocol.Factory: A factory to pass to ``listenTCP`` """ + if not isinstance(password, bytes): + password = password.encode('ascii') checker = checkers.InMemoryUsernamePasswordDatabaseDontUse( **{username: password} @@ -82,7 +84,7 @@ def manhole(username, password, globals): ) factory = manhole_ssh.ConchFactory(portal.Portal(rlm, [checker])) - factory.publicKeys['ssh-rsa'] = Key.fromString(PUBLIC_KEY) - factory.privateKeys['ssh-rsa'] = Key.fromString(PRIVATE_KEY) + factory.publicKeys[b'ssh-rsa'] = Key.fromString(PUBLIC_KEY) + factory.privateKeys[b'ssh-rsa'] = Key.fromString(PRIVATE_KEY) return factory |