Merge lp:~jml/launchpad/codehosting-to-services into lp:launchpad

[Jonathan Lange]

Create a new generic Launchpad SSH server in lp.services.

As best as I can tell, this branch completes the work done in the mega lp:~jml/launchpad/ssh-key-auth branch. It moves all of the generic code out of lp.codehosting.sshserver and into the new lp.services.sshserver.

Most of the changes are simple module moves. There are some exceptions though.

 * PatchedSSHSession is extracted from lp.codehosting.sshserver.session and put into lp.services. It's the only generic chunk from the original module. It's also pretty much necessary for running a production SSH service.

 * Likewise, FileTransferServer is moved out of lp.codehosting.sftp and into lp.services. It is modified slightly so that the SFTPStarted event is generated from it. Behaviour should be equivalent to current behaviour.

 * BazaarSSHStarted and BazaarSSHClosed events are moved to the lp.codehosting session module. Relevant docstrings are updated.

 * I had to copy some keys over for testing.

 * Some tests and docstrings were tweaked to refer to Launchpad SSH server, rather than codehosting.

I look forward to your review.

jml

[Paul Hummer (rockstar)]

<rockstar> jml, all of the codehosting-to-services branch is moves right? No real changes?
<jml> rockstar, pretty much. except for what I mention in my comment.
<rockstar> jml, okay, so basically just docstrings and test comments got changed (outside of imports)
<jml> rockstar, that sounds right.
<rockstar> jml, okay. Looking now.
<rockstar> jml, your comment says you had to copy keys over. Why couldn't you move them?
<jml> rockstar, they are also used by the codehosting acceptance tests.
<rockstar> jml, hm. Do you really think it's wise to duplicate those keys?
<jml> rockstar, why would it be unwise?
<rockstar> jml, duplication. It's not code, this I know. But duplication in general can become unfun.
<jml> rockstar, you want me to generate a new RSA SSH key pair?
<jml> rockstar, it's pretty easy. there's even a cool website that'll do it for you!
<rockstar> jml, no, we can use the same one, but I'm wondering if we could symlink or something.
<rockstar> jml, that sounds like a very silly website. :)
<jml> rockstar, it is – http://sshkeygen.com/
* rockstar groans
<jml> rockstar, anyway, I can make them symlinks if you want. it doesn't matter much either way to me
<rockstar> jml, actually, it doesn't matter much to me either. The question was more or less one of Kiko's "exploratory" questions. If you're okay with it, I am.
<jml> rockstar, cool.

review: Approve (code)

=== modified file 'daemons/sftp.tac'
--- daemons/sftp.tac	2010-04-16 19:01:12 +0000
+++ daemons/sftp.tac	2010-04-16 19:01:18 +0000
@@ -21,7 +21,7 @@
 from lp.codehosting.sshserver.daemon import (
     ACCESS_LOG_NAME, get_key_path, LOG_NAME, make_portal, OOPS_CONFIG_SECTION,
     PRIVATE_KEY_FILE, PUBLIC_KEY_FILE)
-from lp.codehosting.sshserver.service import SSHService
+from lp.services.sshserver.service import SSHService
 
 
 # Construct an Application that has the codehosting SSH server.

=== modified file 'lib/lp/codehosting/sftp.py'
--- lib/lp/codehosting/sftp.py	2010-04-16 19:01:12 +0000
+++ lib/lp/codehosting/sftp.py	2010-04-16 19:01:18 +0000
@@ -15,7 +15,6 @@
 __metaclass__ = type
 __all__ = [
     'avatar_to_sftp_server',
-    'FileTransferServer',
     'TransportSFTPServer',
     ]
 
@@ -34,12 +33,10 @@
 from twisted.internet import defer
 from twisted.python import util
 
-from zope.event import notify
 from zope.interface import implements
 
+from canonical.config import config
 from lp.codehosting.vfs import AsyncLaunchpadTransport, LaunchpadServer
-from lp.codehosting.sshserver import events
-from canonical.config import config
 from lp.services.twistedsupport import gatherResults
 
 
@@ -253,28 +250,9 @@
         avatar.branchfs_proxy, user_id, hosted_transport, mirror_transport)
     server.start_server()
     transport = AsyncLaunchpadTransport(server, server.get_url())
-    notify(events.SFTPStarted(avatar))
     return TransportSFTPServer(transport)
 
 
-class FileTransferServer(filetransfer.FileTransferServer):
-
-    def __init__(self, data=None, avatar=None):
-        filetransfer.FileTransferServer.__init__(self, data, avatar)
-        self.avatar = avatar
-
-    def connectionLost(self, reason):
-        # This method gets called twice: once from `SSHChannel.closeReceived`
-        # when the client closes the channel and once from `SSHSession.closed`
-        # when the server closes the session. We change the avatar attribute
-        # to avoid logging the `SFTPClosed` event twice.
-        filetransfer.FileTransferServer.connectionLost(self, reason)
-        if self.avatar is not None:
-            avatar = self.avatar
-            self.avatar = None
-            notify(events.SFTPClosed(avatar))
-
-
 class TransportSFTPServer:
     """An implementation of `ISFTPServer` that backs onto a Bazaar transport.
 

=== modified file 'lib/lp/codehosting/sshserver/daemon.py'
--- lib/lp/codehosting/sshserver/daemon.py	2010-04-16 19:01:12 +0000
+++ lib/lp/codehosting/sshserver/daemon.py	2010-04-16 19:01:18 +0000
@@ -27,9 +27,9 @@
 
 from canonical.config import config
 from lp.codehosting import sftp
-from lp.codehosting.sshserver.auth import (
+from lp.codehosting.sshserver.session import launch_smart_server
+from lp.services.sshserver.auth import (
     LaunchpadAvatar, PublicKeyFromLaunchpadChecker)
-from lp.codehosting.sshserver.session import launch_smart_server
 
 
 # The names of the key files of the server itself. The directory itself is
@@ -97,7 +97,7 @@
     """Create and return a `Portal` for the SSH service.
 
     This portal accepts SSH credentials and returns our customized SSH
-    avatars (see `lp.codehosting.sshserver.auth.CodehostingAvatar`).
+    avatars (see `CodehostingAvatar`).
     """
     authentication_proxy = Proxy(
         config.codehosting.authentication_endpoint)

=== modified file 'lib/lp/codehosting/sshserver/session.py'
--- lib/lp/codehosting/sshserver/session.py	2010-04-16 19:01:12 +0000
+++ lib/lp/codehosting/sshserver/session.py	2010-04-16 19:01:18 +0000
@@ -6,7 +6,6 @@
 __metaclass__ = type
 __all__ = [
     'launch_smart_server',
-    'PatchedSSHSession',
     ]
 
 import os
@@ -16,81 +15,23 @@
 from zope.interface import implements
 
 from twisted.conch.interfaces import ISession
-from twisted.conch.ssh import channel, connection, session
+from twisted.conch.ssh import connection
 from twisted.internet.process import ProcessExitedAlready
 from twisted.python import log
 
 from canonical.config import config
 from lp.codehosting import get_bzr_path
-from lp.codehosting.sshserver import events
-
-
-class PatchedSSHSession(session.SSHSession, object):
-    """Session adapter that corrects bugs in Conch.
-
-    This object provides no custom logic for Launchpad, it just addresses some
-    simple bugs in the base `session.SSHSession` class that are not yet fixed
-    upstream.
-    """
-
-    def closeReceived(self):
-        # Without this, the client hangs when it's finished transferring.
-        # XXX: JonathanLange 2009-01-05: This does not appear to have a
-        # corresponding bug in Twisted. We should test that the above comment
-        # is indeed correct and then file a bug upstream.
-        self.loseConnection()
-
-    def loseConnection(self):
-        # XXX: JonathanLange 2008-03-31: This deliberately replaces the
-        # implementation of session.SSHSession.loseConnection. The default
-        # implementation will try to call loseConnection on the client
-        # transport even if it's None. I don't know *why* it is None, so this
-        # doesn't necessarily address the root cause.
-        # See http://twistedmatrix.com/trac/ticket/2754.
-        transport = getattr(self.client, 'transport', None)
-        if transport is not None:
-            transport.loseConnection()
-        # This is called by session.SSHSession.loseConnection. SSHChannel is
-        # the base class of SSHSession.
-        channel.SSHChannel.loseConnection(self)
-
-    def stopWriting(self):
-        """See `session.SSHSession.stopWriting`.
-
-        When the client can't keep up with us, we ask the child process to
-        stop giving us data.
-        """
-        # XXX: MichaelHudson 2008-06-27: Being cagey about whether
-        # self.client.transport is entirely paranoia inspired by the comment
-        # in `loseConnection` above. It would be good to know if and why it is
-        # necessary. See http://twistedmatrix.com/trac/ticket/2754.
-        transport = getattr(self.client, 'transport', None)
-        if transport is not None:
-            # For SFTP connections, 'transport' is actually a _DummyTransport
-            # instance. Neither _DummyTransport nor the protocol it wraps
-            # (filetransfer.FileTransferServer) support pausing.
-            pauseProducing = getattr(transport, 'pauseProducing', None)
-            if pauseProducing is not None:
-                pauseProducing()
-
-    def startWriting(self):
-        """See `session.SSHSession.startWriting`.
-
-        The client is ready for data again, so ask the child to start
-        producing data again.
-        """
-        # XXX: MichaelHudson 2008-06-27: Being cagey about whether
-        # self.client.transport is entirely paranoia inspired by the comment
-        # in `loseConnection` above. It would be good to know if and why it is
-        # necessary. See http://twistedmatrix.com/trac/ticket/2754.
-        transport = getattr(self.client, 'transport', None)
-        if transport is not None:
-            # For SFTP connections, 'transport' is actually a _DummyTransport
-            # instance. Neither _DummyTransport nor the protocol it wraps
-            # (filetransfer.FileTransferServer) support pausing.
-            resumeProducing = getattr(transport, 'resumeProducing', None)
-            if resumeProducing is not None:
-                resumeProducing()
+from lp.services.sshserver.events import AvatarEvent
+
+
+class BazaarSSHStarted(AvatarEvent):
+
+    template = '[%(session_id)s] %(username)s started bzr+ssh session.'
+
+
+class BazaarSSHClosed(AvatarEvent):
+
+    template = '[%(session_id)s] %(username)s closed bzr+ssh session.'
 
 
 class ForbiddenCommand(Exception):
@@ -116,7 +57,10 @@
     def closed(self):
         """See ISession."""
         if self._transport is not None:
-            notify(events.BazaarSSHClosed(self.avatar))
+            # XXX: JonathanLange 2010-04-15: This is something of an
+            # abstraction violation. Apart from this line and its twin, this
+            # class knows nothing about Bazaar.
+            notify(BazaarSSHClosed(self.avatar))
             try:
                 self._transport.signalProcess('HUP')
             except (OSError, ProcessExitedAlready):
@@ -154,9 +98,9 @@
                 "ERROR: %r already running a command on transport %r"
                 % (self, self._transport))
         # XXX: JonathanLange 2008-12-23: This is something of an abstraction
-        # violation. Apart from this line, this class knows nothing about
-        # Bazaar.
-        notify(events.BazaarSSHStarted(self.avatar))
+        # violation. Apart from this line and its twin, this class knows
+        # nothing about Bazaar.
+        notify(BazaarSSHStarted(self.avatar))
         self._transport = self.reactor.spawnProcess(
             protocol, executable, arguments, env=self.environment)
 

=== modified file 'lib/lp/codehosting/sshserver/tests/test_daemon.py'
--- lib/lp/codehosting/sshserver/tests/test_daemon.py	2010-04-16 19:01:12 +0000
+++ lib/lp/codehosting/sshserver/tests/test_daemon.py	2010-04-16 19:01:18 +0000
@@ -14,10 +14,10 @@
 
 from canonical.testing.layers import TwistedLayer
 
-from lp.codehosting.sshserver.auth import SSHUserAuthServer
 from lp.codehosting.sshserver.daemon import (
     get_key_path, get_portal, PRIVATE_KEY_FILE, PUBLIC_KEY_FILE)
-from lp.codehosting.sshserver.service import Factory
+from lp.services.sshserver.auth import SSHUserAuthServer
+from lp.services.sshserver.service import Factory
 
 
 class StringTransportWith_setTcpKeepAlive(StringTransport):

=== added directory 'lib/lp/services/sshserver'
=== added file 'lib/lp/services/sshserver/__init__.py'
--- lib/lp/services/sshserver/__init__.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/sshserver/__init__.py	2010-04-16 19:01:18 +0000
@@ -0,0 +1,8 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""The Launchpad SSH server."""
+
+__metaclass__ = type
+__all__ = []
+

=== renamed file 'lib/lp/codehosting/sshserver/accesslog.py' => 'lib/lp/services/sshserver/accesslog.py'
--- lib/lp/codehosting/sshserver/accesslog.py	2010-04-16 19:01:12 +0000
+++ lib/lp/services/sshserver/accesslog.py	2010-04-16 19:01:18 +0000
@@ -17,7 +17,7 @@
 import zope.component.event
 
 from canonical.launchpad.scripts import WatchedFileHandler
-from lp.codehosting.sshserver.events import ILoggingEvent
+from lp.services.sshserver.events import ILoggingEvent
 from lp.services.utils import synchronize
 
 

=== renamed file 'lib/lp/codehosting/sshserver/auth.py' => 'lib/lp/services/sshserver/auth.py'
--- lib/lp/codehosting/sshserver/auth.py	2010-04-16 19:01:12 +0000
+++ lib/lp/services/sshserver/auth.py	2010-04-16 19:01:18 +0000
@@ -38,11 +38,12 @@
 from zope.event import notify
 from zope.interface import implements
 
-from lp.codehosting import sftp
-from lp.codehosting.sshserver import events
-from lp.codehosting.sshserver.session import PatchedSSHSession
+from canonical.launchpad.xmlrpc import faults
+
+from lp.services.sshserver import events
+from lp.services.sshserver.sftp import FileTransferServer
+from lp.services.sshserver.session import PatchedSSHSession
 from lp.services.twistedsupport.xmlrpc import trap_fault
-from canonical.launchpad.xmlrpc import faults
 
 
 class LaunchpadAvatar(avatar.ConchUser):
@@ -68,7 +69,7 @@
         # fixes).
         self.channelLookup = {'session': PatchedSSHSession}
         # ...and set the only subsystem to be SFTP.
-        self.subsystemLookup = {'sftp': sftp.FileTransferServer}
+        self.subsystemLookup = {'sftp': FileTransferServer}
 
     def logout(self):
         notify(events.UserLoggedOut(self))

=== renamed file 'lib/lp/codehosting/sshserver/events.py' => 'lib/lp/services/sshserver/events.py'
--- lib/lp/codehosting/sshserver/events.py	2010-04-16 19:01:12 +0000
+++ lib/lp/services/sshserver/events.py	2010-04-16 19:01:18 +0000
@@ -6,8 +6,7 @@
 __metaclass__ = type
 __all__ = [
     'AuthenticationFailed',
-    'BazaarSSHClosed',
-    'BazaarSSHStarted',
+    'AvatarEvent',
     'ILoggingEvent',
     'LoggingEvent',
     'ServerStarting',
@@ -28,7 +27,7 @@
 class ILoggingEvent(Interface):
     """An event is a logging event if it has a message and a severity level.
 
-    Events that provide this interface will be logged in codehosting access
+    Events that provide this interface will be logged in the SSH server access
     log.
     """
 
@@ -143,13 +142,3 @@
 class SFTPClosed(AvatarEvent):
 
     template = '[%(session_id)s] %(username)s closed SFTP session.'
-
-
-class BazaarSSHStarted(AvatarEvent):
-
-    template = '[%(session_id)s] %(username)s started bzr+ssh session.'
-
-
-class BazaarSSHClosed(AvatarEvent):
-
-    template = '[%(session_id)s] %(username)s closed bzr+ssh session.'

=== renamed file 'lib/lp/codehosting/sshserver/service.py' => 'lib/lp/services/sshserver/service.py'
--- lib/lp/codehosting/sshserver/service.py	2010-04-16 19:01:12 +0000
+++ lib/lp/services/sshserver/service.py	2010-04-16 19:01:18 +0000
@@ -1,7 +1,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Twisted `service.Service` class for the codehosting SSH server.
+"""Twisted `service.Service` class for the Launchpad SSH server.
 
 An `SSHService` object can be used to launch the SSH server.
 """
@@ -24,8 +24,8 @@
 
 from zope.event import notify
 
-from lp.codehosting.sshserver import accesslog, events
-from lp.codehosting.sshserver.auth import SSHUserAuthServer
+from lp.services.sshserver import accesslog, events
+from lp.services.sshserver.auth import SSHUserAuthServer
 from lp.services.twistedsupport import gatherResults
 from lp.services.twistedsupport.loggingsupport import set_up_oops_reporting
 

=== added file 'lib/lp/services/sshserver/session.py'
--- lib/lp/services/sshserver/session.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/sshserver/session.py	2010-04-16 19:01:18 +0000
@@ -0,0 +1,79 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Patched SSH session for the Launchpad server."""
+
+__metaclass__ = type
+__all__ = [
+    'PatchedSSHSession',
+    ]
+
+from twisted.conch.ssh import channel, session
+
+
+class PatchedSSHSession(session.SSHSession, object):
+    """Session adapter that corrects bugs in Conch.
+
+    This object provides no custom logic for Launchpad, it just addresses some
+    simple bugs in the base `session.SSHSession` class that are not yet fixed
+    upstream.
+    """
+
+    def closeReceived(self):
+        # Without this, the client hangs when it's finished transferring.
+        # XXX: JonathanLange 2009-01-05: This does not appear to have a
+        # corresponding bug in Twisted. We should test that the above comment
+        # is indeed correct and then file a bug upstream.
+        self.loseConnection()
+
+    def loseConnection(self):
+        # XXX: JonathanLange 2008-03-31: This deliberately replaces the
+        # implementation of session.SSHSession.loseConnection. The default
+        # implementation will try to call loseConnection on the client
+        # transport even if it's None. I don't know *why* it is None, so this
+        # doesn't necessarily address the root cause.
+        # See http://twistedmatrix.com/trac/ticket/2754.
+        transport = getattr(self.client, 'transport', None)
+        if transport is not None:
+            transport.loseConnection()
+        # This is called by session.SSHSession.loseConnection. SSHChannel is
+        # the base class of SSHSession.
+        channel.SSHChannel.loseConnection(self)
+
+    def stopWriting(self):
+        """See `session.SSHSession.stopWriting`.
+
+        When the client can't keep up with us, we ask the child process to
+        stop giving us data.
+        """
+        # XXX: MichaelHudson 2008-06-27: Being cagey about whether
+        # self.client.transport is entirely paranoia inspired by the comment
+        # in `loseConnection` above. It would be good to know if and why it is
+        # necessary. See http://twistedmatrix.com/trac/ticket/2754.
+        transport = getattr(self.client, 'transport', None)
+        if transport is not None:
+            # For SFTP connections, 'transport' is actually a _DummyTransport
+            # instance. Neither _DummyTransport nor the protocol it wraps
+            # (filetransfer.FileTransferServer) support pausing.
+            pauseProducing = getattr(transport, 'pauseProducing', None)
+            if pauseProducing is not None:
+                pauseProducing()
+
+    def startWriting(self):
+        """See `session.SSHSession.startWriting`.
+
+        The client is ready for data again, so ask the child to start
+        producing data again.
+        """
+        # XXX: MichaelHudson 2008-06-27: Being cagey about whether
+        # self.client.transport is entirely paranoia inspired by the comment
+        # in `loseConnection` above. It would be good to know if and why it is
+        # necessary. See http://twistedmatrix.com/trac/ticket/2754.
+        transport = getattr(self.client, 'transport', None)
+        if transport is not None:
+            # For SFTP connections, 'transport' is actually a _DummyTransport
+            # instance. Neither _DummyTransport nor the protocol it wraps
+            # (filetransfer.FileTransferServer) support pausing.
+            resumeProducing = getattr(transport, 'resumeProducing', None)
+            if resumeProducing is not None:
+                resumeProducing()

=== added file 'lib/lp/services/sshserver/sftp.py'
--- lib/lp/services/sshserver/sftp.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/sshserver/sftp.py	2010-04-16 19:01:18 +0000
@@ -0,0 +1,35 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Generic SFTP server functionality."""
+
+__metaclass__ = type
+__all__ = [
+    'FileTransferServer',
+    ]
+
+from twisted.conch.ssh import filetransfer
+
+from zope.event import notify
+
+from lp.services.sshserver import events
+
+
+class FileTransferServer(filetransfer.FileTransferServer):
+    """SFTP protocol implementation that logs key events."""
+
+    def __init__(self, data=None, avatar=None):
+        filetransfer.FileTransferServer.__init__(self, data, avatar)
+        notify(events.SFTPStarted(avatar))
+        self.avatar = avatar
+
+    def connectionLost(self, reason):
+        # This method gets called twice: once from `SSHChannel.closeReceived`
+        # when the client closes the channel and once from `SSHSession.closed`
+        # when the server closes the session. We change the avatar attribute
+        # to avoid logging the `SFTPClosed` event twice.
+        filetransfer.FileTransferServer.connectionLost(self, reason)
+        if self.avatar is not None:
+            avatar = self.avatar
+            self.avatar = None
+            notify(events.SFTPClosed(avatar))

=== added directory 'lib/lp/services/sshserver/tests'
=== added file 'lib/lp/services/sshserver/tests/__init__.py'
--- lib/lp/services/sshserver/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/sshserver/tests/__init__.py	2010-04-16 19:01:18 +0000
@@ -0,0 +1,8 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the Launchpad SSH server."""
+
+__metaclass__ = type
+__all__ = []
+

=== added directory 'lib/lp/services/sshserver/tests/keys'
=== added file 'lib/lp/services/sshserver/tests/keys/ssh_host_key_rsa'
--- lib/lp/services/sshserver/tests/keys/ssh_host_key_rsa	1970-01-01 00:00:00 +0000
+++ lib/lp/services/sshserver/tests/keys/ssh_host_key_rsa	2010-04-16 19:01:18 +0000
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDSSpVRPhCiU9PPuZN7QyJdMOgTVwPyYpZGOHutR/9kxFvOLa39
+nY0Eqo39OTumfZBMEEVqIPadQanO9LcdTnl9/Z4LcBGn09EFQ2y7VUkC6J2dSQtr
+YMY0tV+C5HGZ2oYBWKBl5PZ1RI4+qrJpAMMmINdnF0uEE/x8B1iMWGB3PwIBIwKB
+gQCcN2ebb+8ZgBmwQLazVnFMirsHDXClbc630i/9EOmbUAmvGp6B4sCHH5ytevkc
+l8pHIget7JnxKXbUQMKKzJTCpPwwEyL3ZVDxYXg37WQU74cVf93CjOjChs+hOeS1
+sW5m9JFr9oomL5JWnGXr+TV/kYBCNVW++J1Bckn6kYpH+wJBAPUw0ZunXlBRuugA
+YTSmXUUX+ALu6maDD1t7gAk37waxNQMaH5DMk5R4IQtoxeQgCLqL2yEJUqK1lxOy
+wlp1k8UCQQDbj+Vr4poE9MpYNtPDiDqv2aXe6CJ3p1qQuNE0rSxk+0G9h3ASISRw
+DDLgcapg2xkOvG3pidfAJG9P827XiVszAkEA4CyiYm0jB5suivkIaqa7rOK23hxE
+BfQrTFOoQvFPkRcL5ZQ6Hfzes6EIRPIUA8WEUskC3GBLjXLTRTW5Aj+dCwJBAMi+
+E5XWfjBqx6EcL1OvwKDG/g2hCZH4GEnNjBLneQveZ/29qEsW/L43CfHHAiyrD5hx
+w5OxOklF4h02VrZu9EsCQBEZcTAQOrWnkmp7uBrz1V8nFLAE6zFh/6Wj1Mn8k08j
+pcsLJAhm+qlV7EtV/5rk+v3WcXrKiRIiiC0Ron96Dx0=
+-----END RSA PRIVATE KEY-----

=== added file 'lib/lp/services/sshserver/tests/keys/ssh_host_key_rsa.pub'
--- lib/lp/services/sshserver/tests/keys/ssh_host_key_rsa.pub	1970-01-01 00:00:00 +0000
+++ lib/lp/services/sshserver/tests/keys/ssh_host_key_rsa.pub	2010-04-16 19:01:18 +0000
@@ -0,0 +1,1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA0kqVUT4QolPTz7mTe0MiXTDoE1cD8mKWRjh7rUf/ZMRbzi2t/Z2NBKqN/Tk7pn2QTBBFaiD2nUGpzvS3HU55ff2eC3ARp9PRBUNsu1VJAuidnUkLa2DGNLVfguRxmdqGAVigZeT2dUSOPqqyaQDDJiDXZxdLhBP8fAdYjFhgdz8= andrew@frobozz

=== renamed file 'lib/lp/codehosting/sshserver/tests/test_logging.py' => 'lib/lp/services/sshserver/tests/test_accesslog.py'
--- lib/lp/codehosting/sshserver/tests/test_logging.py	2010-04-16 19:01:12 +0000
+++ lib/lp/services/sshserver/tests/test_accesslog.py	2010-04-16 19:01:18 +0000
@@ -18,7 +18,7 @@
 import zope.component.event
 
 from canonical.launchpad.scripts import WatchedFileHandler
-from lp.codehosting.sshserver.accesslog import LoggingManager
+from lp.services.sshserver.accesslog import LoggingManager
 from lp.testing import TestCase
 
 
@@ -71,9 +71,9 @@
         self.assertEqual(root_handlers, logging.getLogger('').handlers)
         self.assertEqual(bzr_handlers, logging.getLogger('bzr').handlers)
 
-    def test_codehosting_log_doesnt_go_to_stderr(self):
+    def test_log_doesnt_go_to_stderr(self):
         # Once logging setup is called, any messages logged to the
-        # codehosting logger should *not* be logged to stderr. If they are,
+        # SSH server logger should *not* be logged to stderr. If they are,
         # they will appear on the user's terminal.
         log = self.makeLogger()
         self.installLoggingManager(log)
@@ -136,7 +136,7 @@
 
     def test_access_handlers(self):
         # The logging setup installs a rotatable log handler that logs output
-        # to config.codehosting.access_log.
+        # to the SSH server access log.
         directory = self.makeTemporaryDirectory()
         access_log = self.makeLogger()
         access_log_path = os.path.join(directory, 'access.log')

=== renamed file 'lib/lp/codehosting/sshserver/tests/test_auth.py' => 'lib/lp/services/sshserver/tests/test_auth.py'
--- lib/lp/codehosting/sshserver/tests/test_auth.py	2010-04-16 19:01:12 +0000
+++ lib/lp/services/sshserver/tests/test_auth.py	2010-04-16 19:01:18 +0000
@@ -21,10 +21,9 @@
 
 from twisted.trial.unittest import TestCase as TrialTestCase
 
-from canonical.config import config
 from canonical.launchpad.xmlrpc import faults
 from canonical.testing.layers import TwistedLayer
-from lp.codehosting.sshserver import auth
+from lp.services.sshserver import auth
 from lp.services.twistedsupport import suppress_stderr
 
 
@@ -224,7 +223,7 @@
 
     def test_bannerNotSentOnSuccess(self):
         # No banner is printed when the user authenticates successfully.
-        self.assertEqual(None, config.codehosting.banner)
+        self.user_auth._banner = None
 
         d = self.requestSuccessfulAuthentication()
         def check(ignored):

=== renamed file 'lib/lp/codehosting/sshserver/tests/test_events.py' => 'lib/lp/services/sshserver/tests/test_events.py'
--- lib/lp/codehosting/sshserver/tests/test_events.py	2010-04-16 19:01:12 +0000
+++ lib/lp/services/sshserver/tests/test_events.py	2010-04-16 19:01:18 +0000
@@ -13,7 +13,7 @@
 import zope.component.event
 from zope.event import notify
 
-from lp.codehosting.sshserver.events import ILoggingEvent, LoggingEvent
+from lp.services.sshserver.events import ILoggingEvent, LoggingEvent
 
 from lp.testing import TestCase