Merge lp:~twom/lazr.sshserver/python3-turnip into lp:~cjwatson/lazr.sshserver/python3

[Tom Wardill]

Required fixes for turnip

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'src/lazr/sshserver/auth.py'
--- src/lazr/sshserver/auth.py	2018-07-04 11:52:47 +0000
+++ src/lazr/sshserver/auth.py	2018-12-18 11:51:31 +0000
@@ -99,9 +99,9 @@
 
         # Set the only channel as a standard SSH session (with a couple of bug
         # fixes).
-        self.channelLookup = {'session': PatchedSSHSession}
+        self.channelLookup = {b'session': PatchedSSHSession}
         # ...and set the only subsystem to be SFTP.
-        self.subsystemLookup = {'sftp': FileTransferServer}
+        self.subsystemLookup = {b'sftp': FileTransferServer}
 
     def logout(self):
         notify(events.UserLoggedOut(self))
@@ -182,7 +182,7 @@
         self._configured_banner_sent = False
         self._mind = UserDetailsMind()
         self.interfaceToMethod = userauth.SSHUserAuthServer.interfaceToMethod
-        self.interfaceToMethod[ISSHPrivateKeyWithMind] = 'publickey'
+        self.interfaceToMethod[ISSHPrivateKeyWithMind] = b'publickey'
 
     def sendBanner(self, text, language='en'):
         bytes = b'\r\n'.join(text.encode('UTF8').splitlines() + [b''])
@@ -331,13 +331,13 @@
 
     def _checkForAuthorizedKey(self, user_dict, credentials):
         """Check the key data in credentials against the keys found in LP."""
-        if credentials.algName == 'ssh-dss':
+        if credentials.algName == b'ssh-dss':
             wantKeyType = 'DSA'
-        elif credentials.algName == 'ssh-rsa':
+        elif credentials.algName == b'ssh-rsa':
             wantKeyType = 'RSA'
-        elif credentials.algName.startswith('ecdsa-sha2-'):
+        elif credentials.algName.startswith(b'ecdsa-sha2-'):
             wantKeyType = 'ECDSA'
-        elif credentials.algName == 'ssh-ed25519':
+        elif credentials.algName == b'ssh-ed25519':
             wantKeyType = 'ED25519'
         else:
             # unknown key type
 
=== modified file 'src/lazr/sshserver/service.py'
--- src/lazr/sshserver/service.py	2018-12-18 09:46:55 +0000
+++ src/lazr/sshserver/service.py	2018-12-18 11:51:31 +0000
@@ -92,7 +92,7 @@
         # at it. (Look for the beautiful line "self.portal =
         # self.transport.factory.portal").
         self.portal = portal
-        self.services['ssh-userauth'] = self._makeAuthServer
+        self.services[b'ssh-userauth'] = self._makeAuthServer
         self._private_key = private_key
         self._public_key = public_key
         self._banner = banner
 
=== modified file 'src/lazr/sshserver/tests/test_auth.py'
--- src/lazr/sshserver/tests/test_auth.py	2018-07-04 11:53:22 +0000
+++ src/lazr/sshserver/tests/test_auth.py	2018-12-18 11:51:31 +0000
@@ -488,10 +488,10 @@
         # Attempting to log in with a username and key known to the
         # authentication end-point succeeds.
         for key_type, public_key in (
-                ('ssh-rsa', self.authserver.valid_key_rsa),
-                ('ssh-dss', self.authserver.valid_key_dsa),
-                ('ecdsa-sha2-nistp256', self.authserver.valid_key_ecdsa),
-                ('ssh-ed25519', self.authserver.valid_key_ed25519),
+                (b'ssh-rsa', self.authserver.valid_key_rsa),
+                (b'ssh-dss', self.authserver.valid_key_dsa),
+                (b'ecdsa-sha2-nistp256', self.authserver.valid_key_ecdsa),
+                (b'ssh-ed25519', self.authserver.valid_key_ed25519),
                 ):
             creds = self.makeCredentials(
                 self.authserver.valid_user, key_type, public_key)
@@ -550,7 +550,7 @@
         # server informs you that the account has no keys.
         checker = self.makeChecker()
         creds = self.makeCredentials(
-            self.authserver.no_key_user, 'ssh-dss',
+            self.authserver.no_key_user, b'ssh-dss',
             self.authserver.valid_key_dsa)
         return self.assertLoginError(
             checker, creds,
@@ -600,9 +600,9 @@
         checker = self.makeChecker()
         mind = auth.UserDetailsMind()
         wrong_key_creds = self.makeCredentials(
-            self.authserver.valid_user, 'ssh-dss', 'invalid key', mind)
+            self.authserver.valid_user, b'ssh-dss', 'invalid key', mind)
         right_key_creds = self.makeCredentials(
-            self.authserver.valid_user, 'ssh-dss',
+            self.authserver.valid_user, b'ssh-dss',
             self.authserver.valid_key_dsa, mind)
         try:
             username = yield checker.requestAvatarId(wrong_key_creds)