diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-10-19 10:23:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 10:23:44 +0100 |
| commit | 6a4d01ee94838b0f76c73311693be92394629306 (patch) | |
| tree | 361050ae75d4c9d4d6bfce15f9bd4f3b6138788f | |
| parent | Merge pull request #4057 from matrix-org/rav/use_correct_python (diff) | |
| parent | changelog (diff) | |
| download | synapse-6a4d01ee94838b0f76c73311693be92394629306.tar.xz | |
Merge pull request #4060 from matrix-org/hawkowl/ssh-key-py3
Make manhole work on Python 3 again
| -rw-r--r-- | changelog.d/4060.bugfix | 1 | ||||
| -rw-r--r-- | synapse/util/manhole.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/4060.bugfix b/changelog.d/4060.bugfix new file mode 100644 index 0000000000..78d69a8819 --- /dev/null +++ b/changelog.d/4060.bugfix @@ -0,0 +1 @@ +Manhole now works again on Python 3, instead of failing with a "couldn't match all kex parts" when connecting. diff --git a/synapse/util/manhole.py b/synapse/util/manhole.py index 8d0f2a8918..cf43ab6a19 100644 --- a/synapse/util/manhole.py +++ b/synapse/util/manhole.py @@ -82,7 +82,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 |