Merge lp:~cjwatson/lazr.sshserver/moduli into lp:lazr.sshserver

[Colin Watson]

Add moduli file handling to lazr.sshserver.service, needed to support the diffie-hellman-group-exchange-* key exchange algorithms.

Add moduli file handling to lazr.sshserver.service, needed to support the diffie-hellman-group-exchange-* key exchange algorithms. This is most useful with an upgrade to Twisted 15.5.0 (once released), but doesn't require it.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'src/lazr/sshserver/NEWS.txt'
--- src/lazr/sshserver/NEWS.txt	2015-01-21 13:33:30 +0000
+++ src/lazr/sshserver/NEWS.txt	2015-11-17 01:36:44 +0000
@@ -2,6 +2,12 @@
 NEWS for lazr.sshserver
 =======================
 
+0.1.2 (2015-XX-XX)
+==================
+
+- Add moduli file handling to lazr.sshserver.service, needed to support the
+  diffie-hellman-group-exchange-* key exchange algorithms.
+
 0.1.1 (2015-01-21)
 ==================
 

=== modified file 'src/lazr/sshserver/service.py'
--- src/lazr/sshserver/service.py	2015-01-12 18:49:43 +0000
+++ src/lazr/sshserver/service.py	2015-11-17 01:36:44 +0000
@@ -19,6 +19,7 @@
     service,
     strports,
     )
+from twisted.conch.openssh_compat import primes
 from twisted.conch.ssh.factory import SSHFactory
 from twisted.conch.ssh.keys import Key
 from twisted.conch.ssh.transport import SSHServerTransport
@@ -72,7 +73,8 @@
 
     protocol = KeepAliveSettingSSHServerTransport
 
-    def __init__(self, portal, private_key, public_key, banner=None):
+    def __init__(self, portal, private_key, public_key, banner=None,
+                 moduli_path=None):
         """Construct an SSH factory.
 
         :param portal: The portal used to turn credentials into users.
@@ -81,6 +83,7 @@
         :param public_key: The public key of the server, must be an RSA
             key, given as a `twisted.conch.ssh.keys.Key` object.
         :param banner: The text to display when users successfully log in.
+        :param moduli_path: The path to the OpenSSH moduli file to read.
         """
         # Although 'portal' isn't part of the defined interface for
         # `SSHFactory`, defining it here is how the `SSHUserAuthServer` gets
@@ -91,6 +94,7 @@
         self._private_key = private_key
         self._public_key = public_key
         self._banner = banner
+        self._moduli_path = moduli_path
 
     def _makeAuthServer(self, *args, **kwargs):
         kwargs['banner'] = self._banner
@@ -142,13 +146,19 @@
         """
         return {'ssh-rsa': self._private_key}
 
+    def getPrimes(self):
+        try:
+            return primes.parseModuliFile(self._moduli_path)
+        except IOError:
+            return None
+
 
 class SSHService(service.Service):
     """A Twisted service for the SSH server."""
 
     def __init__(self, portal, private_key_path, public_key_path,
                  main_log, access_log, access_log_path, strport='tcp:22',
-                 factory_decorator=None, banner=None):
+                 factory_decorator=None, banner=None, moduli_path=None):
         """Construct an SSH service.
 
         :param portal: The `twisted.cred.portal.Portal` that turns
@@ -168,12 +178,14 @@
             argument, a factory, and must return a factory.
         :param banner: An announcement printed to users when they connect.
             By default, announce nothing.
+        :param moduli_path: The path to the OpenSSH moduli file to read.
         """
         ssh_factory = Factory(
             portal,
             private_key=Key.fromFile(private_key_path),
             public_key=Key.fromFile(public_key_path),
-            banner=banner)
+            banner=banner,
+            moduli_path=moduli_path)
         if factory_decorator is not None:
             ssh_factory = factory_decorator(ssh_factory)
         self.service = strports.service(strport, ssh_factory)

=== modified file 'src/lazr/sshserver/version.txt'
--- src/lazr/sshserver/version.txt	2015-01-21 04:17:35 +0000
+++ src/lazr/sshserver/version.txt	2015-11-17 01:36:44 +0000
@@ -1,1 +1,1 @@
-0.1.1
+0.1.2