Merge lp:~jml/launchpad/extract-ssh-server-auth into lp:launchpad

[Jonathan Lange]

Move codehosting-specific stuff into new codehosting-specific module

This is yet another part of the massive branch that splits out the ssh server from codehosting.

This branch takes the codehosting-specific auth stuff and puts it into a new module: lp.codehosting.sshserver.daemon. It also takes the codehosting-specific stuff from the "service" module and puts it in there.

Most of the changes are fairly simple. The only subtlety is that the LaunchpadAvatar class now has a new child class called CodehostingAvatar.

[Eleanor Berger (intellectronica)]

There were a few places where moved legacy code didn't conform to our stringent coding conventions, and you kindly offered to fix them before landing this branch.

review: Approve (code)

=== modified file 'daemons/sftp.tac'
--- daemons/sftp.tac	2010-04-16 19:00:51 +0000
+++ daemons/sftp.tac	2010-04-16 19:00:53 +0000
@@ -18,9 +18,10 @@
 # Construct an Application that has the codehosting SSH server.
 =======
 
-from lp.codehosting.sshserver.service import (
+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, SSHService)
+    PRIVATE_KEY_FILE, PUBLIC_KEY_FILE)
+from lp.codehosting.sshserver.service import SSHService
 
 
 # Construct an Application that has the codehosting SSH server.

=== modified file 'lib/lp/codehosting/sshserver/auth.py'
--- lib/lp/codehosting/sshserver/auth.py	2010-04-16 19:00:51 +0000
+++ lib/lp/codehosting/sshserver/auth.py	2010-04-16 19:00:53 +0000
@@ -13,7 +13,8 @@
 
 __metaclass__ = type
 __all__ = [
-    'get_portal',
+    'LaunchpadAvatar',
+    'PublicKeyFromLaunchpadChecker',
     'SSHUserAuthServer',
     ]
 
@@ -21,48 +22,47 @@
 
 from twisted.conch import avatar
 from twisted.conch.error import ConchError
-from twisted.conch.interfaces import IConchUser, ISession
-from twisted.conch.ssh import filetransfer, keys, userauth
+from twisted.conch.interfaces import IConchUser
+from twisted.conch.ssh import keys, userauth
 from twisted.conch.ssh.common import getNS, NS
 from twisted.conch.checkers import SSHPublicKeyDatabase
 
 from twisted.cred.error import UnauthorizedLogin
 from twisted.cred.checkers import ICredentialsChecker
 from twisted.cred import credentials
-from twisted.cred.portal import IRealm, Portal
 
 from twisted.internet import defer
 
-from twisted.python import components, failure
+from twisted.python import failure
 
 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 (
-    launch_smart_server, PatchedSSHSession)
+from lp.codehosting.sshserver.session import PatchedSSHSession
 from lp.services.twistedsupport.xmlrpc import trap_fault
-from canonical.config import config
 from canonical.launchpad.xmlrpc import faults
 
 
 class LaunchpadAvatar(avatar.ConchUser):
     """An account on the SSH server, corresponding to a Launchpad person.
 
-    :ivar branchfs_proxy: A Twisted XML-RPC client for the authserver. The
-        server must implement `IBranchFileSystem`.
     :ivar channelLookup: See `avatar.ConchUser`.
     :ivar subsystemLookup: See `avatar.ConchUser`.
     :ivar user_id: The Launchpad database ID of the Person for this account.
     :ivar username: The Launchpad username for this account.
     """
 
-    def __init__(self, userDict, branchfs_proxy):
+    def __init__(self, user_dict):
+        """Construct a `LaunchpadAvatar`.
+
+        :param user_dict: The result of a call to
+            `IAuthServer.getUserAndSSHKeys`.
+        """
         avatar.ConchUser.__init__(self)
-        self.branchfs_proxy = branchfs_proxy
-        self.user_id = userDict['id']
-        self.username = userDict['name']
+        self.user_id = user_dict['id']
+        self.username = user_dict['name']
 
         # Set the only channel as a standard SSH session (with a couple of bug
         # fixes).
@@ -74,34 +74,10 @@
         notify(events.UserLoggedOut(self))
 
 
-components.registerAdapter(launch_smart_server, LaunchpadAvatar, ISession)
-
-components.registerAdapter(
-    sftp.avatar_to_sftp_server, LaunchpadAvatar, filetransfer.ISFTPServer)
-
-
 class UserDisplayedUnauthorizedLogin(UnauthorizedLogin):
     """UnauthorizedLogin which should be reported to the user."""
 
 
-class Realm:
-    implements(IRealm)
-
-    def __init__(self, authentication_proxy, branchfs_proxy):
-        self.authentication_proxy = authentication_proxy
-        self.branchfs_proxy = branchfs_proxy
-
-    def requestAvatar(self, avatarId, mind, *interfaces):
-        # Fetch the user's details from the authserver
-        deferred = mind.lookupUserDetails(self.authentication_proxy, avatarId)
-
-        # Once all those details are retrieved, we can construct the avatar.
-        def gotUserDict(userDict):
-            avatar = LaunchpadAvatar(userDict, self.branchfs_proxy)
-            return interfaces[0], avatar, avatar.logout
-        return deferred.addCallback(gotUserDict)
-
-
 class ISSHPrivateKeyWithMind(credentials.ISSHPrivateKey):
     """Marker interface for SSH credentials that reference a Mind."""
 
@@ -303,7 +279,7 @@
         raise UserDisplayedUnauthorizedLogin(
             "No such Launchpad account: %s" % credentials.username)
 
-    def _checkForAuthorizedKey(self, userDict, credentials):
+    def _checkForAuthorizedKey(self, user_dict, credentials):
         """Check the key data in credentials against the keys found in LP."""
         if credentials.algName == 'ssh-dss':
             wantKeyType = 'DSA'
@@ -313,12 +289,12 @@
             # unknown key type
             return False
 
-        if len(userDict['keys']) == 0:
+        if len(user_dict['keys']) == 0:
             raise UserDisplayedUnauthorizedLogin(
                 "Launchpad user %r doesn't have a registered SSH key"
                 % credentials.username)
 
-        for keytype, keytext in userDict['keys']:
+        for keytype, keytext in user_dict['keys']:
             if keytype != wantKeyType:
                 continue
             try:
@@ -330,11 +306,3 @@
         raise UnauthorizedLogin(
             "Your SSH key does not match any key registered for Launchpad "
             "user %s" % credentials.username)
-
-
-def get_portal(authentication_proxy, branchfs_proxy):
-    """Get a portal for connecting to Launchpad codehosting."""
-    portal = Portal(Realm(authentication_proxy, branchfs_proxy))
-    portal.registerChecker(
-        PublicKeyFromLaunchpadChecker(authentication_proxy))
-    return portal

=== added file 'lib/lp/codehosting/sshserver/daemon.py'
--- lib/lp/codehosting/sshserver/daemon.py	1970-01-01 00:00:00 +0000
+++ lib/lp/codehosting/sshserver/daemon.py	2010-04-16 19:00:53 +0000
@@ -0,0 +1,105 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Glues the codehosting SSH daemon together."""
+
+__metaclass__ = type
+__all__ = [
+    'ACCESS_LOG_NAME',
+    'CodehostingAvatar',
+    'get_key_path',
+    'get_portal',
+    'LOG_NAME',
+    'make_portal',
+    'PRIVATE_KEY_FILE',
+    'PUBLIC_KEY_FILE',
+    ]
+
+import os
+
+from twisted.conch.interfaces import ISession
+from twisted.conch.ssh import filetransfer
+from twisted.cred.portal import IRealm, Portal
+from twisted.python import components
+from twisted.web.xmlrpc import Proxy
+
+from zope.interface import implements
+
+from canonical.config import config
+from lp.codehosting import sftp
+from lp.codehosting.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
+# given in config.codehosting.host_key_pair_path.
+PRIVATE_KEY_FILE = 'ssh_host_key_rsa'
+PUBLIC_KEY_FILE = 'ssh_host_key_rsa.pub'
+
+OOPS_CONFIG_SECTION = 'codehosting'
+LOG_NAME = 'codehosting'
+ACCESS_LOG_NAME = 'codehosting.access'
+
+
+class CodehostingAvatar(LaunchpadAvatar):
+    """An SSH avatar specific to codehosting.
+
+    :ivar branchfs_proxy: A Twisted XML-RPC client for the authserver. The
+        server must implement `IBranchFileSystem`.
+    """
+
+    def __init__(self, user_dict, branchfs_proxy):
+        LaunchpadAvatar.__init__(self, user_dict)
+        self.branchfs_proxy = branchfs_proxy
+
+
+components.registerAdapter(launch_smart_server, CodehostingAvatar, ISession)
+
+components.registerAdapter(
+    sftp.avatar_to_sftp_server, CodehostingAvatar, filetransfer.ISFTPServer)
+
+
+class Realm:
+    implements(IRealm)
+
+    def __init__(self, authentication_proxy, branchfs_proxy):
+        self.authentication_proxy = authentication_proxy
+        self.branchfs_proxy = branchfs_proxy
+
+    def requestAvatar(self, avatar_id, mind, *interfaces):
+        # Fetch the user's details from the authserver
+        deferred = mind.lookupUserDetails(
+            self.authentication_proxy, avatar_id)
+
+        # Once all those details are retrieved, we can construct the avatar.
+        def got_user_dict(user_dict):
+            avatar = CodehostingAvatar(user_dict, self.branchfs_proxy)
+            return interfaces[0], avatar, avatar.logout
+
+        return deferred.addCallback(got_user_dict)
+
+
+def get_portal(authentication_proxy, branchfs_proxy):
+    """Get a portal for connecting to Launchpad codehosting."""
+    portal = Portal(Realm(authentication_proxy, branchfs_proxy))
+    portal.registerChecker(
+        PublicKeyFromLaunchpadChecker(authentication_proxy))
+    return portal
+
+
+def get_key_path(key_filename):
+    key_directory = config.codehosting.host_key_pair_path
+    return os.path.join(config.root, key_directory, key_filename)
+
+
+def make_portal():
+    """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`).
+    """
+    authentication_proxy = Proxy(
+        config.codehosting.authentication_endpoint)
+    branchfs_proxy = Proxy(config.codehosting.branchfs_endpoint)
+    return get_portal(authentication_proxy, branchfs_proxy)

=== modified file 'lib/lp/codehosting/sshserver/service.py'
--- lib/lp/codehosting/sshserver/service.py	2010-04-16 19:00:51 +0000
+++ lib/lp/codehosting/sshserver/service.py	2010-04-16 19:00:53 +0000
@@ -8,12 +8,6 @@
 
 __metaclass__ = type
 __all__ = [
-    'ACCESS_LOG_NAME',
-    'get_key_path',
-    'LOG_NAME',
-    'make_portal',
-    'PRIVATE_KEY_FILE',
-    'PUBLIC_KEY_FILE',
     'SSHService',
     ]
 
@@ -27,13 +21,11 @@
 from twisted.conch.ssh.transport import SSHServerTransport
 from twisted.internet import defer
 from twisted.protocols.policies import TimeoutFactory
-from twisted.web.xmlrpc import Proxy
 
 from zope.event import notify
 
-from canonical.config import config
 from lp.codehosting.sshserver import accesslog, events
-from lp.codehosting.sshserver.auth import get_portal, SSHUserAuthServer
+from lp.codehosting.sshserver.auth import SSHUserAuthServer
 from lp.services.twistedsupport import gatherResults
 from lp.services.twistedsupport.loggingsupport import set_up_oops_reporting
 
@@ -43,16 +35,6 @@
 PRIVATE_KEY_FILE = 'ssh_host_key_rsa'
 PUBLIC_KEY_FILE = 'ssh_host_key_rsa.pub'
 
-OOPS_CONFIG_SECTION = 'codehosting'
-LOG_NAME = 'codehosting'
-ACCESS_LOG_NAME = 'codehosting.access'
-
-
-# The names of the key files of the server itself. The directory itself is
-# given in config.codehosting.host_key_pair_path.
-PRIVATE_KEY_FILE = 'ssh_host_key_rsa'
-PUBLIC_KEY_FILE = 'ssh_host_key_rsa.pub'
-
 
 class KeepAliveSettingSSHServerTransport(SSHServerTransport):
 
@@ -61,44 +43,24 @@
         self.transport.setTcpKeepAlive(True)
 
 
-<<<<<<< TREE
-def get_key_path(key_filename):
-    key_directory = config.codehosting.host_key_pair_path
-    return os.path.join(config.root, key_directory, key_filename)
-
-
-def make_portal():
-    """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.LaunchpadAvatar`).
-    """
-    authentication_proxy = Proxy(
-        config.codehosting.authentication_endpoint)
-    branchfs_proxy = Proxy(config.codehosting.branchfs_endpoint)
-    return get_portal(authentication_proxy, branchfs_proxy)
-
-
-
-=======
-def get_key_path(key_filename):
-    key_directory = config.codehosting.host_key_pair_path
-    return os.path.join(config.root, key_directory, key_filename)
-
-
-def make_portal():
-    """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.LaunchpadAvatar`).
-    """
-    authentication_proxy = Proxy(
-        config.codehosting.authentication_endpoint)
-    branchfs_proxy = Proxy(config.codehosting.branchfs_endpoint)
-    return get_portal(authentication_proxy, branchfs_proxy)
-
-
->>>>>>> MERGE-SOURCE
+def get_key_path(key_filename):
+    key_directory = config.codehosting.host_key_pair_path
+    return os.path.join(config.root, key_directory, key_filename)
+
+
+def make_portal():
+    """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.LaunchpadAvatar`).
+    """
+    authentication_proxy = Proxy(
+        config.codehosting.authentication_endpoint)
+    branchfs_proxy = Proxy(config.codehosting.branchfs_endpoint)
+    return get_portal(authentication_proxy, branchfs_proxy)
+
+
+
 class Factory(SSHFactory):
     """SSH factory that uses Launchpad's custom authentication.
 

=== modified file 'lib/lp/codehosting/sshserver/tests/test_auth.py'
--- lib/lp/codehosting/sshserver/tests/test_auth.py	2010-04-13 18:32:15 +0000
+++ lib/lp/codehosting/sshserver/tests/test_auth.py	2010-04-16 19:00:53 +0000
@@ -18,14 +18,13 @@
 from twisted.internet import defer
 from twisted.python import failure
 from twisted.python.util import sibpath
-from twisted.test.proto_helpers import StringTransport
 
 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, service
+from lp.codehosting.sshserver import auth
 from lp.services.twistedsupport import suppress_stderr
 
 
@@ -38,14 +37,12 @@
 
     implements(IRealm)
 
-    def requestAvatar(self, avatarId, mind, *interfaces):
+    def requestAvatar(self, avatar_id, mind, *interfaces):
         user_dict = {
-            'id': avatarId, 'name': avatarId, 'teams': [],
+            'id': avatar_id, 'name': avatar_id, 'teams': [],
             'initialBranches': []}
         return (
-            interfaces[0],
-            auth.LaunchpadAvatar(user_dict, None),
-            lambda: None)
+            interfaces[0], auth.LaunchpadAvatar(user_dict), lambda: None)
 
 
 class MockSSHTransport(SSHServerTransport):
@@ -501,6 +498,7 @@
         return d
 
 
+<<<<<<< TREE
 class StringTransportWith_setTcpKeepAlive(StringTransport):
     def __init__(self, hostAddress=None, peerAddress=None):
         StringTransport.__init__(self, hostAddress, peerAddress)
@@ -569,5 +567,7 @@
 
         self.assertNotIdentical(mind1.cache, mind2.cache)
 
+=======
+>>>>>>> MERGE-SOURCE
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== added file 'lib/lp/codehosting/sshserver/tests/test_daemon.py'
--- lib/lp/codehosting/sshserver/tests/test_daemon.py	1970-01-01 00:00:00 +0000
+++ lib/lp/codehosting/sshserver/tests/test_daemon.py	2010-04-16 19:00:53 +0000
@@ -0,0 +1,93 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the codehosting SSH server glue."""
+
+__metaclass__ = type
+
+import unittest
+
+from twisted.conch.ssh.common import NS
+from twisted.conch.ssh.keys import Key
+from twisted.test.proto_helpers import StringTransport
+from twisted.trial.unittest import TestCase as TrialTestCase
+
+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
+
+
+class StringTransportWith_setTcpKeepAlive(StringTransport):
+    def __init__(self, hostAddress=None, peerAddress=None):
+        StringTransport.__init__(self, hostAddress, peerAddress)
+        self._keepAlive = False
+
+    def setTcpKeepAlive(self, flag):
+        self._keepAlive = flag
+
+
+class TestFactory(TrialTestCase):
+    """Tests for our SSH factory."""
+
+    layer = TwistedLayer
+
+    def makeFactory(self):
+        """Create and start the factory that our SSH server uses."""
+        factory = Factory(
+            get_portal(None, None),
+            private_key=Key.fromFile(
+                get_key_path(PRIVATE_KEY_FILE)),
+            public_key=Key.fromFile(
+                get_key_path(PUBLIC_KEY_FILE)))
+        factory.startFactory()
+        return factory
+
+    def startConnecting(self, factory):
+        """Connect to the `factory`."""
+        server_transport = factory.buildProtocol(None)
+        server_transport.makeConnection(StringTransportWith_setTcpKeepAlive())
+        return server_transport
+
+    def test_set_keepalive_on_connection(self):
+        # The server transport sets TCP keep alives on the underlying
+        # transport.
+        factory = self.makeFactory()
+        server_transport = self.startConnecting(factory)
+        self.assertTrue(server_transport.transport._keepAlive)
+
+    def beginAuthentication(self, factory):
+        """Connect to `factory` and begin authentication on this connection.
+
+        :return: The `SSHServerTransport` after the process of authentication
+            has begun.
+        """
+        server_transport = self.startConnecting(factory)
+        server_transport.ssh_SERVICE_REQUEST(NS('ssh-userauth'))
+        self.addCleanup(server_transport.service.serviceStopped)
+        return server_transport
+
+    def test_authentication_uses_our_userauth_service(self):
+        # The service of a SSHServerTransport after authentication has started
+        # is an instance of our SSHUserAuthServer class.
+        factory = self.makeFactory()
+        transport = self.beginAuthentication(factory)
+        self.assertIsInstance(transport.service, SSHUserAuthServer)
+
+    def test_two_connections_two_minds(self):
+        # Two attempts to authenticate do not share the user-details cache.
+        factory = self.makeFactory()
+
+        server_transport1 = self.beginAuthentication(factory)
+        server_transport2 = self.beginAuthentication(factory)
+
+        mind1 = server_transport1.service.getMind()
+        mind2 = server_transport2.service.getMind()
+
+        self.assertNotIdentical(mind1.cache, mind2.cache)
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/codehosting/sshserver/tests/test_session.py'
--- lib/lp/codehosting/sshserver/tests/test_session.py	2010-03-15 06:42:34 +0000
+++ lib/lp/codehosting/sshserver/tests/test_session.py	2010-04-16 19:00:53 +0000
@@ -14,7 +14,7 @@
 
 from canonical.config import config
 from lp.codehosting import get_bzr_path, get_BZR_PLUGIN_PATH_for_subprocess
-from lp.codehosting.sshserver.auth import LaunchpadAvatar
+from lp.codehosting.sshserver.daemon import CodehostingAvatar
 from lp.codehosting.sshserver.session import (
     ExecOnlySession, ForbiddenCommand, RestrictedExecOnlySession)
 from lp.codehosting.tests.helpers import AvatarTestCase
@@ -83,7 +83,7 @@
 
     def setUp(self):
         AvatarTestCase.setUp(self)
-        self.avatar = LaunchpadAvatar(self.aliceUserDict, None)
+        self.avatar = CodehostingAvatar(self.aliceUserDict, None)
         # The logging system will try to get the id of avatar.transport, so
         # let's give it something to take the id of.
         self.avatar.transport = object()
@@ -239,7 +239,7 @@
 
     def setUp(self):
         AvatarTestCase.setUp(self)
-        self.avatar = LaunchpadAvatar(self.aliceUserDict, None)
+        self.avatar = CodehostingAvatar(self.aliceUserDict, None)
         self.reactor = MockReactor()
         self.session = RestrictedExecOnlySession(
             self.avatar, self.reactor, 'foo', 'bar baz %(user_id)s')
@@ -305,7 +305,7 @@
 
     def setUp(self):
         AvatarTestCase.setUp(self)
-        self.avatar = LaunchpadAvatar(self.aliceUserDict, None)
+        self.avatar = CodehostingAvatar(self.aliceUserDict, None)
 
     def test_avatarAdaptsToRestrictedExecOnlySession(self):
         # When Conch tries to adapt the SSH server avatar to ISession, it

=== modified file 'lib/lp/codehosting/tests/helpers.py'
--- lib/lp/codehosting/tests/helpers.py	2009-06-25 04:06:00 +0000
+++ lib/lp/codehosting/tests/helpers.py	2010-04-16 19:00:53 +0000
@@ -7,9 +7,7 @@
 __all__ = [
     'AvatarTestCase',
     'adapt_suite',
-    'BranchTestCase',
     'CodeHostingTestProviderAdapter',
-    'CodeHostingRepositoryTestProviderAdapter',
     'create_branch_with_one_revision',
     'deferToThread',
     'LoomTestMixin',

=== modified file 'lib/lp/codehosting/tests/test_sftp.py'
--- lib/lp/codehosting/tests/test_sftp.py	2010-02-01 04:33:22 +0000
+++ lib/lp/codehosting/tests/test_sftp.py	2010-04-16 19:00:53 +0000
@@ -25,7 +25,7 @@
 from lp.codehosting.inmemory import InMemoryFrontend, XMLRPCWrapper
 from lp.codehosting.sftp import (
     FatLocalTransport, TransportSFTPServer, FileIsADirectory)
-from lp.codehosting.sshserver.auth import LaunchpadAvatar
+from lp.codehosting.sshserver.daemon import CodehostingAvatar
 from lp.testing.factory import LaunchpadObjectFactory
 from canonical.testing.layers import TwistedLayer
 
@@ -110,13 +110,13 @@
         self.branchfs_endpoint = XMLRPCWrapper(
             frontend.getFilesystemEndpoint())
 
-    def makeLaunchpadAvatar(self):
+    def makeCodehostingAvatar(self):
         user = self.factory.makePerson()
         user_dict = dict(id=user.id, name=user.name)
-        return LaunchpadAvatar(user_dict, self.branchfs_endpoint)
+        return CodehostingAvatar(user_dict, self.branchfs_endpoint)
 
     def test_canAdaptToSFTPServer(self):
-        avatar = self.makeLaunchpadAvatar()
+        avatar = self.makeCodehostingAvatar()
         # The adapter logs the SFTPStarted event, which gets the id of the
         # transport attribute of 'avatar'. Here we set transport to an
         # arbitrary object that can have its id taken.