~bzr-pqm/bzr/bzr.dev

1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
1
# Copyright (C) 2005 Robey Pointer <robey@lag.net>, Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Implementation of Transport over SFTP, using paramiko."""
18
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
19
import errno
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
20
import getpass
21
import os
1540.2.2 by Röbey Pointer
allow forcing the use of paramiko via environ var; use prefetch on paramiko >= 1.5.2
22
import random
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
23
import re
24
import stat
1540.2.2 by Röbey Pointer
allow forcing the use of paramiko via environ var; use prefetch on paramiko >= 1.5.2
25
import subprocess
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
26
import sys
1540.2.2 by Röbey Pointer
allow forcing the use of paramiko via environ var; use prefetch on paramiko >= 1.5.2
27
import time
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
28
import urllib
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
29
import urlparse
1185.49.10 by John Arbash Meinel
Use a weakref dictionary to enable re-use of a connection (for sftp).
30
import weakref
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
31
1530.1.7 by Robert Collins
merge integration.
32
from bzrlib.config import config_dir, ensure_config_dir_exists
1530.1.3 by Robert Collins
transport implementations now tested consistently.
33
from bzrlib.errors import (ConnectionError,
34
                           FileExists, 
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
35
                           TransportNotPossible, NoSuchFile, PathNotChild,
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
36
                           TransportError,
1185.62.24 by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it.
37
                           LockError, ParamikoNotPresent
1530.1.3 by Robert Collins
transport implementations now tested consistently.
38
                           )
1530.1.7 by Robert Collins
merge integration.
39
from bzrlib.osutils import pathjoin, fancy_rename
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
40
from bzrlib.trace import mutter, warning, error
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
41
from bzrlib.transport import (
42
    register_urlparse_netloc_protocol,
43
    Server,
44
    Transport,
45
    urlescape,
46
    )
1185.50.10 by John Arbash Meinel
Don't import ui_factory directly, in case it gets changed later.
47
import bzrlib.ui
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
48
49
try:
50
    import paramiko
1185.62.24 by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it.
51
except ImportError, e:
52
    raise ParamikoNotPresent(e)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
53
else:
54
    from paramiko.sftp import (SFTP_FLAG_WRITE, SFTP_FLAG_CREATE,
55
                               SFTP_FLAG_EXCL, SFTP_FLAG_TRUNC,
56
                               CMD_HANDLE, CMD_OPEN)
57
    from paramiko.sftp_attr import SFTPAttributes
58
    from paramiko.sftp_file import SFTPFile
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
59
    from paramiko.sftp_client import SFTPClient
60
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
61
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
62
register_urlparse_netloc_protocol('sftp')
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
63
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
64
1540.2.3 by Robey Pointer
move the paramiko version check up to the top and use getattr instead of hasattr. use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
65
# don't use prefetch unless paramiko version >= 1.5.2 (there were bugs earlier)
66
_default_do_prefetch = False
1540.2.4 by Robey Pointer
patch from robert collins to simplify the paramiko version test
67
if getattr(paramiko, '__version_info__', (0, 0, 0)) >= (1, 5, 2):
1540.2.3 by Robey Pointer
move the paramiko version check up to the top and use getattr instead of hasattr. use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
68
    _default_do_prefetch = True
69
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
70
1185.50.2 by John Arbash Meinel
From Matt Lavin: close_fds is not supported on Windows platforms
71
_close_fds = True
72
if sys.platform == 'win32':
73
    # close_fds not supported on win32
74
    _close_fds = False
75
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
76
_ssh_vendor = None
1540.2.2 by Röbey Pointer
allow forcing the use of paramiko via environ var; use prefetch on paramiko >= 1.5.2
77
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
78
def _get_ssh_vendor():
79
    """Find out what version of SSH is on the system."""
1185.48.2 by James Henstridge
Fix some bugs so it actually works
80
    global _ssh_vendor
81
    if _ssh_vendor is not None:
82
        return _ssh_vendor
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
83
1185.48.2 by James Henstridge
Fix some bugs so it actually works
84
    _ssh_vendor = 'none'
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
85
1540.2.3 by Robey Pointer
move the paramiko version check up to the top and use getattr instead of hasattr. use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
86
    if 'BZR_SSH' in os.environ:
87
        _ssh_vendor = os.environ['BZR_SSH']
88
        if _ssh_vendor == 'paramiko':
89
            _ssh_vendor = 'none'
90
        return _ssh_vendor
91
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
92
    try:
93
        p = subprocess.Popen(['ssh', '-V'],
1185.50.2 by John Arbash Meinel
From Matt Lavin: close_fds is not supported on Windows platforms
94
                             close_fds=_close_fds,
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
95
                             stdin=subprocess.PIPE,
96
                             stdout=subprocess.PIPE,
97
                             stderr=subprocess.PIPE)
98
        returncode = p.returncode
99
        stdout, stderr = p.communicate()
100
    except OSError:
101
        returncode = -1
102
        stdout = stderr = ''
103
    if 'OpenSSH' in stderr:
1185.48.2 by James Henstridge
Fix some bugs so it actually works
104
        mutter('ssh implementation is OpenSSH')
105
        _ssh_vendor = 'openssh'
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
106
    elif 'SSH Secure Shell' in stderr:
1185.48.2 by James Henstridge
Fix some bugs so it actually works
107
        mutter('ssh implementation is SSH Corp.')
108
        _ssh_vendor = 'ssh'
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
109
1185.48.2 by James Henstridge
Fix some bugs so it actually works
110
    if _ssh_vendor != 'none':
111
        return _ssh_vendor
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
112
113
    # XXX: 20051123 jamesh
114
    # A check for putty's plink or lsh would go here.
115
1185.48.2 by James Henstridge
Fix some bugs so it actually works
116
    mutter('falling back to paramiko implementation')
117
    return _ssh_vendor
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
118
119
120
class SFTPSubprocess:
121
    """A socket-like object that talks to an ssh subprocess via pipes."""
1530.1.3 by Robert Collins
transport implementations now tested consistently.
122
    def __init__(self, hostname, vendor, port=None, user=None):
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
123
        assert vendor in ['openssh', 'ssh']
124
        if vendor == 'openssh':
125
            args = ['ssh',
126
                    '-oForwardX11=no', '-oForwardAgent=no',
127
                    '-oClearAllForwardings=yes', '-oProtocol=2',
128
                    '-oNoHostAuthenticationForLocalhost=yes']
129
            if port is not None:
130
                args.extend(['-p', str(port)])
131
            if user is not None:
132
                args.extend(['-l', user])
133
            args.extend(['-s', hostname, 'sftp'])
134
        elif vendor == 'ssh':
135
            args = ['ssh', '-x']
136
            if port is not None:
137
                args.extend(['-p', str(port)])
138
            if user is not None:
139
                args.extend(['-l', user])
140
            args.extend(['-s', 'sftp', hostname])
141
1185.50.2 by John Arbash Meinel
From Matt Lavin: close_fds is not supported on Windows platforms
142
        self.proc = subprocess.Popen(args, close_fds=_close_fds,
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
143
                                     stdin=subprocess.PIPE,
144
                                     stdout=subprocess.PIPE)
145
146
    def send(self, data):
147
        return os.write(self.proc.stdin.fileno(), data)
148
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
149
    def recv_ready(self):
150
        # TODO: jam 20051215 this function is necessary to support the
151
        # pipelined() function. In reality, it probably should use
152
        # poll() or select() to actually return if there is data
153
        # available, otherwise we probably don't get any benefit
154
        return True
155
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
156
    def recv(self, count):
157
        return os.read(self.proc.stdout.fileno(), count)
158
159
    def close(self):
160
        self.proc.stdin.close()
161
        self.proc.stdout.close()
162
        self.proc.wait()
163
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
164
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
165
class LoopbackSFTP(object):
166
    """Simple wrapper for a socket that pretends to be a paramiko Channel."""
167
168
    def __init__(self, sock):
169
        self.__socket = sock
170
 
171
    def send(self, data):
172
        return self.__socket.send(data)
173
174
    def recv(self, n):
175
        return self.__socket.recv(n)
176
1547.1.3 by Robey Pointer
spell warning correctly :) and move recv_ready close to recv for readability
177
    def recv_ready(self):
178
        return True
179
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
180
    def close(self):
181
        self.__socket.close()
182
183
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
184
SYSTEM_HOSTKEYS = {}
185
BZR_HOSTKEYS = {}
186
1185.49.10 by John Arbash Meinel
Use a weakref dictionary to enable re-use of a connection (for sftp).
187
# This is a weakref dictionary, so that we can reuse connections
188
# that are still active. Long term, it might be nice to have some
189
# sort of expiration policy, such as disconnect if inactive for
190
# X seconds. But that requires a lot more fanciness.
191
_connected_hosts = weakref.WeakValueDictionary()
192
1607.1.13 by Robert Collins
Add a clear_connection_cache to the SFTP transport and use it in fixing the bound branch test speed performance problem which was cause by the server thread timing out - it was blocked on a read and closing the client side causes the server to unblock and exit.
193
def clear_connection_cache():
194
    """Remove all hosts from the SFTP connection cache.
195
196
    Primarily useful for test cases wanting to force garbage collection.
197
    """
1607.1.16 by Robert Collins
Review feedback on sftp.clear_connection_cache
198
    _connected_hosts.clear()
1607.1.13 by Robert Collins
Add a clear_connection_cache to the SFTP transport and use it in fixing the bound branch test speed performance problem which was cause by the server thread timing out - it was blocked on a read and closing the client side causes the server to unblock and exit.
199
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
200
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
201
def load_host_keys():
202
    """
203
    Load system host keys (probably doesn't work on windows) and any
204
    "discovered" keys from previous sessions.
205
    """
206
    global SYSTEM_HOSTKEYS, BZR_HOSTKEYS
207
    try:
208
        SYSTEM_HOSTKEYS = paramiko.util.load_host_keys(os.path.expanduser('~/.ssh/known_hosts'))
209
    except Exception, e:
210
        mutter('failed to load system host keys: ' + str(e))
1185.31.33 by John Arbash Meinel
A couple more path.join statements needed changing.
211
    bzr_hostkey_path = pathjoin(config_dir(), 'ssh_host_keys')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
212
    try:
213
        BZR_HOSTKEYS = paramiko.util.load_host_keys(bzr_hostkey_path)
214
    except Exception, e:
215
        mutter('failed to load bzr host keys: ' + str(e))
216
        save_host_keys()
217
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
218
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
219
def save_host_keys():
220
    """
221
    Save "discovered" host keys in $(config)/ssh_host_keys/.
222
    """
223
    global SYSTEM_HOSTKEYS, BZR_HOSTKEYS
1185.31.33 by John Arbash Meinel
A couple more path.join statements needed changing.
224
    bzr_hostkey_path = pathjoin(config_dir(), 'ssh_host_keys')
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
225
    ensure_config_dir_exists()
226
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
227
    try:
228
        f = open(bzr_hostkey_path, 'w')
229
        f.write('# SSH host keys collected by bzr\n')
230
        for hostname, keys in BZR_HOSTKEYS.iteritems():
231
            for keytype, key in keys.iteritems():
232
                f.write('%s %s %s\n' % (hostname, keytype, key.get_base64()))
233
        f.close()
234
    except IOError, e:
235
        mutter('failed to save bzr host keys: ' + str(e))
236
237
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
238
class SFTPLock(object):
239
    """This fakes a lock in a remote location."""
240
    __slots__ = ['path', 'lock_path', 'lock_file', 'transport']
241
    def __init__(self, path, transport):
242
        assert isinstance(transport, SFTPTransport)
243
244
        self.lock_file = None
245
        self.path = path
246
        self.lock_path = path + '.write-lock'
247
        self.transport = transport
248
        try:
1530.1.7 by Robert Collins
merge integration.
249
            # RBC 20060103 FIXME should we be using private methods here ?
250
            abspath = transport._remote_path(self.lock_path)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
251
            self.lock_file = transport._sftp_open_exclusive(abspath)
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
252
        except FileExists:
253
            raise LockError('File %r already locked' % (self.path,))
254
255
    def __del__(self):
256
        """Should this warn, or actually try to cleanup?"""
257
        if self.lock_file:
1547.1.3 by Robey Pointer
spell warning correctly :) and move recv_ready close to recv for readability
258
            warning("SFTPLock %r not explicitly unlocked" % (self.path,))
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
259
            self.unlock()
260
261
    def unlock(self):
262
        if not self.lock_file:
263
            return
264
        self.lock_file.close()
265
        self.lock_file = None
266
        try:
267
            self.transport.delete(self.lock_path)
268
        except (NoSuchFile,):
269
            # What specific errors should we catch here?
270
            pass
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
271
272
class SFTPTransport (Transport):
273
    """
274
    Transport implementation for SFTP access.
275
    """
1540.2.3 by Robey Pointer
move the paramiko version check up to the top and use getattr instead of hasattr. use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
276
    _do_prefetch = _default_do_prefetch
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
277
278
    def __init__(self, base, clone_from=None):
279
        assert base.startswith('sftp://')
1185.49.6 by John Arbash Meinel
Fixed the double rename, to rename the safety in case of problem.
280
        self._parse_url(base)
281
        base = self._unparse_url()
1530.1.3 by Robert Collins
transport implementations now tested consistently.
282
        if base[-1] != '/':
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
283
            base += '/'
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
284
        super(SFTPTransport, self).__init__(base)
285
        if clone_from is None:
286
            self._sftp_connect()
287
        else:
288
            # use the same ssh connection, etc
289
            self._sftp = clone_from._sftp
290
        # super saves 'self.base'
291
    
292
    def should_cache(self):
293
        """
294
        Return True if the data pulled across should be cached locally.
295
        """
296
        return True
297
298
    def clone(self, offset=None):
299
        """
300
        Return a new SFTPTransport with root at self.base + offset.
301
        We share the same SFTP session between such transports, because it's
302
        fairly expensive to set them up.
303
        """
304
        if offset is None:
305
            return SFTPTransport(self.base, self)
306
        else:
307
            return SFTPTransport(self.abspath(offset), self)
308
309
    def abspath(self, relpath):
310
        """
311
        Return the full url to the given relative path.
312
        
313
        @param relpath: the relative path or path components
314
        @type relpath: str or list
315
        """
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
316
        return self._unparse_url(self._remote_path(relpath))
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
317
    
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
318
    def _remote_path(self, relpath):
319
        """Return the path to be passed along the sftp protocol for relpath.
320
        
321
        relpath is a urlencoded string.
322
        """
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
323
        # FIXME: share the common code across transports
324
        assert isinstance(relpath, basestring)
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
325
        relpath = urllib.unquote(relpath).split('/')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
326
        basepath = self._path.split('/')
327
        if len(basepath) > 0 and basepath[-1] == '':
328
            basepath = basepath[:-1]
329
330
        for p in relpath:
331
            if p == '..':
332
                if len(basepath) == 0:
333
                    # In most filesystems, a request for the parent
334
                    # of root, just returns root.
335
                    continue
336
                basepath.pop()
337
            elif p == '.':
338
                continue # No-op
339
            else:
340
                basepath.append(p)
341
342
        path = '/'.join(basepath)
343
        return path
344
345
    def relpath(self, abspath):
1185.48.8 by James Henstridge
More URL handling fixes
346
        username, password, host, port, path = self._split_url(abspath)
1185.49.23 by John Arbash Meinel
bugreport from Matthieu Moy: relpath was failing, but throwing an unhelpful exception.
347
        error = []
348
        if (username != self._username):
349
            error.append('username mismatch')
350
        if (host != self._host):
351
            error.append('host mismatch')
352
        if (port != self._port):
353
            error.append('port mismatch')
354
        if (not path.startswith(self._path)):
355
            error.append('path mismatch')
356
        if error:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
357
            extra = ': ' + ', '.join(error)
358
            raise PathNotChild(abspath, self.base, extra=extra)
1185.48.8 by James Henstridge
More URL handling fixes
359
        pl = len(self._path)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
360
        return path[pl:].strip('/')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
361
362
    def has(self, relpath):
363
        """
364
        Does the target location exist?
365
        """
366
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
367
            self._sftp.stat(self._remote_path(relpath))
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
368
            return True
369
        except IOError:
370
            return False
371
1540.3.2 by Martin Pool
Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
372
    def get(self, relpath):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
373
        """
374
        Get the file at the given relative path.
375
376
        :param relpath: The relative path to the file
377
        """
378
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
379
            path = self._remote_path(relpath)
1185.31.51 by John Arbash Meinel
Setting binary flags for sftp.
380
            f = self._sftp.file(path, mode='rb')
1540.2.3 by Robey Pointer
move the paramiko version check up to the top and use getattr instead of hasattr. use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
381
            if self._do_prefetch and (getattr(f, 'prefetch', None) is not None):
1185.40.1 by Robey Pointer
prefetch files under paramiko 1.5.1 for improved speed
382
                f.prefetch()
383
            return f
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
384
        except (IOError, paramiko.SSHException), e:
385
            self._translate_io_exception(e, path, ': error retrieving')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
386
387
    def get_partial(self, relpath, start, length=None):
388
        """
389
        Get just part of a file.
390
391
        :param relpath: Path to the file, relative to base
392
        :param start: The starting position to read from
393
        :param length: The length to read. A length of None indicates
394
                       read to the end of the file.
395
        :return: A file-like object containing at least the specified bytes.
396
                 Some implementations may return objects which can be read
397
                 past this length, but this is not guaranteed.
398
        """
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
399
        # TODO: implement get_partial_multi to help with knit support
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
400
        f = self.get(relpath)
401
        f.seek(start)
1185.49.16 by John Arbash Meinel
Disabling prefetch
402
        if self._do_prefetch and hasattr(f, 'prefetch'):
1185.40.1 by Robey Pointer
prefetch files under paramiko 1.5.1 for improved speed
403
            f.prefetch()
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
404
        return f
405
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
406
    def put(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
407
        """
408
        Copy the file-like or string object into the location.
409
410
        :param relpath: Location to put the contents, relative to base.
411
        :param f:       File-like or string object.
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
412
        :param mode: The final mode for the file
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
413
        """
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
414
        final_path = self._remote_path(relpath)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
415
        self._put(final_path, f, mode=mode)
416
417
    def _put(self, abspath, f, mode=None):
418
        """Helper function so both put() and copy_abspaths can reuse the code"""
419
        tmp_abspath = '%s.tmp.%.9f.%d.%d' % (abspath, time.time(),
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
420
                        os.getpid(), random.randint(0,0x7FFFFFFF))
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
421
        fout = self._sftp_open_exclusive(tmp_abspath, mode=mode)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
422
        closed = False
1185.41.6 by Robey Pointer
modified version of john's patch to add atomic put and locking to the sftp transport
423
        try:
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
424
            try:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
425
                fout.set_pipelined(True)
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
426
                self._pump(f, fout)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
427
            except (IOError, paramiko.SSHException), e:
428
                self._translate_io_exception(e, tmp_abspath)
1185.50.20 by John Arbash Meinel
merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.
429
            if mode is not None:
430
                self._sftp.chmod(tmp_abspath, mode)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
431
            fout.close()
432
            closed = True
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
433
            self._rename_and_overwrite(tmp_abspath, abspath)
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
434
        except Exception, e:
435
            # If we fail, try to clean up the temporary file
436
            # before we throw the exception
437
            # but don't let another exception mess things up
1185.50.20 by John Arbash Meinel
merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.
438
            # Write out the traceback, because otherwise
439
            # the catch and throw destroys it
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
440
            import traceback
441
            mutter(traceback.format_exc())
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
442
            try:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
443
                if not closed:
444
                    fout.close()
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
445
                self._sftp.remove(tmp_abspath)
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
446
            except:
1532 by Robert Collins
Merge in John Meinels integration branch.
447
                # raise the saved except
448
                raise e
449
            # raise the original with its traceback if we can.
450
            raise
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
451
452
    def iter_files_recursive(self):
453
        """Walk the relative paths of all files in this transport."""
454
        queue = list(self.list_dir('.'))
455
        while queue:
1185.12.96 by Aaron Bentley
Merge from mpool
456
            relpath = urllib.quote(queue.pop(0))
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
457
            st = self.stat(relpath)
458
            if stat.S_ISDIR(st.st_mode):
459
                for i, basename in enumerate(self.list_dir(relpath)):
460
                    queue.insert(i, relpath+'/'+basename)
461
            else:
462
                yield relpath
463
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
464
    def mkdir(self, relpath, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
465
        """Create a directory at the given path."""
466
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
467
            path = self._remote_path(relpath)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
468
            # In the paramiko documentation, it says that passing a mode flag 
469
            # will filtered against the server umask.
470
            # StubSFTPServer does not do this, which would be nice, because it is
471
            # what we really want :)
472
            # However, real servers do use umask, so we really should do it that way
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
473
            self._sftp.mkdir(path)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
474
            if mode is not None:
475
                self._sftp.chmod(path, mode=mode)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
476
        except (paramiko.SSHException, IOError), e:
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
477
            self._translate_io_exception(e, path, ': unable to mkdir',
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
478
                failure_exc=FileExists)
479
480
    def _translate_io_exception(self, e, path, more_info='', failure_exc=NoSuchFile):
481
        """Translate a paramiko or IOError into a friendlier exception.
482
483
        :param e: The original exception
484
        :param path: The path in question when the error is raised
485
        :param more_info: Extra information that can be included,
486
                          such as what was going on
487
        :param failure_exc: Paramiko has the super fun ability to raise completely
488
                           opaque errors that just set "e.args = ('Failure',)" with
489
                           no more information.
490
                           This sometimes means FileExists, but it also sometimes
491
                           means NoSuchFile
492
        """
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
493
        # paramiko seems to generate detailless errors.
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
494
        self._translate_error(e, path, raise_generic=False)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
495
        if hasattr(e, 'args'):
496
            if (e.args == ('No such file or directory',) or
497
                e.args == ('No such file',)):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
498
                raise NoSuchFile(path, str(e) + more_info)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
499
            if (e.args == ('mkdir failed',)):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
500
                raise FileExists(path, str(e) + more_info)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
501
            # strange but true, for the paramiko server.
502
            if (e.args == ('Failure',)):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
503
                raise failure_exc(path, str(e) + more_info)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
504
            mutter('Raising exception with args %s', e.args)
505
        if hasattr(e, 'errno'):
506
            mutter('Raising exception with errno %s', e.errno)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
507
        raise e
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
508
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
509
    def append(self, relpath, f):
510
        """
511
        Append the text in the file-like object into the final
512
        location.
513
        """
514
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
515
            path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
516
            fout = self._sftp.file(path, 'ab')
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
517
            result = fout.tell()
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
518
            self._pump(f, fout)
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
519
            return result
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
520
        except (IOError, paramiko.SSHException), e:
521
            self._translate_io_exception(e, relpath, ': unable to append')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
522
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
523
    def rename(self, rel_from, rel_to):
524
        """Rename without special overwriting"""
525
        try:
526
            self._sftp.rename(self._remote_path(rel_from),
527
                              self._remote_path(rel_to))
528
        except (IOError, paramiko.SSHException), e:
529
            self._translate_io_exception(e, rel_from,
530
                    ': unable to rename to %r' % (rel_to))
531
532
    def _rename_and_overwrite(self, abs_from, abs_to):
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
533
        """Do a fancy rename on the remote server.
534
        
535
        Using the implementation provided by osutils.
536
        """
537
        try:
538
            fancy_rename(abs_from, abs_to,
539
                    rename_func=self._sftp.rename,
540
                    unlink_func=self._sftp.remove)
541
        except (IOError, paramiko.SSHException), e:
542
            self._translate_io_exception(e, abs_from, ': unable to rename to %r' % (abs_to))
543
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
544
    def move(self, rel_from, rel_to):
545
        """Move the item at rel_from to the location at rel_to"""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
546
        path_from = self._remote_path(rel_from)
547
        path_to = self._remote_path(rel_to)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
548
        self._rename_and_overwrite(path_from, path_to)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
549
550
    def delete(self, relpath):
551
        """Delete the item at relpath"""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
552
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
553
        try:
554
            self._sftp.remove(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
555
        except (IOError, paramiko.SSHException), e:
556
            self._translate_io_exception(e, path, ': unable to delete')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
557
            
558
    def listable(self):
559
        """Return True if this store supports listing."""
560
        return True
561
562
    def list_dir(self, relpath):
563
        """
564
        Return a list of all files at the given location.
565
        """
566
        # does anything actually use this?
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
567
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
568
        try:
569
            return self._sftp.listdir(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
570
        except (IOError, paramiko.SSHException), e:
571
            self._translate_io_exception(e, path, ': failed to list_dir')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
572
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
573
    def rmdir(self, relpath):
574
        """See Transport.rmdir."""
575
        path = self._remote_path(relpath)
576
        try:
577
            return self._sftp.rmdir(path)
578
        except (IOError, paramiko.SSHException), e:
579
            self._translate_io_exception(e, path, ': failed to rmdir')
580
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
581
    def stat(self, relpath):
582
        """Return the stat information for a file."""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
583
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
584
        try:
585
            return self._sftp.stat(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
586
        except (IOError, paramiko.SSHException), e:
587
            self._translate_io_exception(e, path, ': unable to stat')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
588
589
    def lock_read(self, relpath):
590
        """
591
        Lock the given file for shared (read) access.
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
592
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
593
        """
594
        # FIXME: there should be something clever i can do here...
595
        class BogusLock(object):
596
            def __init__(self, path):
597
                self.path = path
598
            def unlock(self):
599
                pass
600
        return BogusLock(relpath)
601
602
    def lock_write(self, relpath):
603
        """
604
        Lock the given file for exclusive (write) access.
605
        WARNING: many transports do not support this, so trying avoid using it
606
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
607
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
608
        """
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
609
        # This is a little bit bogus, but basically, we create a file
610
        # which should not already exist, and if it does, we assume
611
        # that there is a lock, and if it doesn't, the we assume
612
        # that we have taken the lock.
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
613
        return SFTPLock(relpath, self)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
614
615
    def _unparse_url(self, path=None):
616
        if path is None:
1185.48.5 by James Henstridge
Change SFTP url parsing back to treat the path in sftp://host/path as
617
            path = self._path
618
        path = urllib.quote(path)
1534.1.8 by Robert Collins
Update SFTP Urls as per mailing list thread.
619
        # handle homedir paths
620
        if not path.startswith('/'):
621
            path = "/~/" + path
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
622
        netloc = urllib.quote(self._host)
623
        if self._username is not None:
624
            netloc = '%s@%s' % (urllib.quote(self._username), netloc)
1185.49.23 by John Arbash Meinel
bugreport from Matthieu Moy: relpath was failing, but throwing an unhelpful exception.
625
        if self._port is not None:
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
626
            netloc = '%s:%d' % (netloc, self._port)
627
        return urlparse.urlunparse(('sftp', netloc, path, '', '', ''))
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
628
1185.48.8 by James Henstridge
More URL handling fixes
629
    def _split_url(self, url):
1185.48.3 by James Henstridge
More fixes
630
        if isinstance(url, unicode):
631
            url = url.encode('utf-8')
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
632
        (scheme, netloc, path, params,
633
         query, fragment) = urlparse.urlparse(url, allow_fragments=False)
634
        assert scheme == 'sftp'
1185.48.8 by James Henstridge
More URL handling fixes
635
        username = password = host = port = None
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
636
        if '@' in netloc:
1185.48.8 by James Henstridge
More URL handling fixes
637
            username, host = netloc.split('@', 1)
638
            if ':' in username:
639
                username, password = username.split(':', 1)
640
                password = urllib.unquote(password)
641
            username = urllib.unquote(username)
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
642
        else:
1185.48.8 by James Henstridge
More URL handling fixes
643
            host = netloc
644
645
        if ':' in host:
646
            host, port = host.rsplit(':', 1)
1185.33.67 by Martin Pool
[merge] use /usr/bin/ssh if we can (jamesh)
647
            try:
648
                port = int(port)
649
            except ValueError:
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
650
                # TODO: Should this be ConnectionError?
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
651
                raise TransportError('%s: invalid port number' % port)
1185.48.8 by James Henstridge
More URL handling fixes
652
        host = urllib.unquote(host)
653
654
        path = urllib.unquote(path)
1185.48.5 by James Henstridge
Change SFTP url parsing back to treat the path in sftp://host/path as
655
656
        # the initial slash should be removed from the path, and treated
657
        # as a homedir relative path (the path begins with a double slash
658
        # if it is absolute).
659
        # see draft-ietf-secsh-scp-sftp-ssh-uri-03.txt
1534.1.8 by Robert Collins
Update SFTP Urls as per mailing list thread.
660
        # RBC 20060118 we are not using this as its too user hostile. instead
661
        # we are following lftp and using /~/foo to mean '~/foo'.
662
        # handle homedir paths
663
        if path.startswith('/~/'):
664
            path = path[3:]
665
        elif path == '/~':
666
            path = ''
1185.48.8 by James Henstridge
More URL handling fixes
667
        return (username, password, host, port, path)
668
669
    def _parse_url(self, url):
670
        (self._username, self._password,
671
         self._host, self._port, self._path) = self._split_url(url)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
672
673
    def _sftp_connect(self):
1185.49.14 by John Arbash Meinel
[merge] bzr.dev
674
        """Connect to the remote sftp server.
675
        After this, self._sftp should have a valid connection (or
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
676
        we raise an TransportError 'could not connect').
1185.49.14 by John Arbash Meinel
[merge] bzr.dev
677
678
        TODO: Raise a more reasonable ConnectionFailed exception
679
        """
680
        global _connected_hosts
1185.49.10 by John Arbash Meinel
Use a weakref dictionary to enable re-use of a connection (for sftp).
681
682
        idx = (self._host, self._port, self._username)
683
        try:
684
            self._sftp = _connected_hosts[idx]
685
            return
686
        except KeyError:
687
            pass
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
688
        
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
689
        vendor = _get_ssh_vendor()
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
690
        if vendor == 'loopback':
691
            sock = socket.socket()
692
            sock.connect((self._host, self._port))
693
            self._sftp = SFTPClient(LoopbackSFTP(sock))
694
        elif vendor != 'none':
1530.1.3 by Robert Collins
transport implementations now tested consistently.
695
            sock = SFTPSubprocess(self._host, vendor, self._port,
696
                                  self._username)
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
697
            self._sftp = SFTPClient(sock)
698
        else:
699
            self._paramiko_connect()
700
1185.49.14 by John Arbash Meinel
[merge] bzr.dev
701
        _connected_hosts[idx] = self._sftp
702
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
703
    def _paramiko_connect(self):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
704
        global SYSTEM_HOSTKEYS, BZR_HOSTKEYS
705
        
706
        load_host_keys()
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
707
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
708
        try:
1185.49.27 by John Arbash Meinel
James Henstridge confirmed that sftp.py needs self._port or 22
709
            t = paramiko.Transport((self._host, self._port or 22))
1547.1.2 by Robey Pointer
ask paramiko to log into the bzr logging tree during unit tests, and log a warning when the server thread exits due to exception
710
            t.set_log_channel('bzr.paramiko')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
711
            t.start_client()
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
712
        except paramiko.SSHException, e:
713
            raise ConnectionError('Unable to reach SSH host %s:%d' %
714
                                  (self._host, self._port), e)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
715
            
716
        server_key = t.get_remote_server_key()
717
        server_key_hex = paramiko.util.hexify(server_key.get_fingerprint())
718
        keytype = server_key.get_name()
719
        if SYSTEM_HOSTKEYS.has_key(self._host) and SYSTEM_HOSTKEYS[self._host].has_key(keytype):
720
            our_server_key = SYSTEM_HOSTKEYS[self._host][keytype]
721
            our_server_key_hex = paramiko.util.hexify(our_server_key.get_fingerprint())
722
        elif BZR_HOSTKEYS.has_key(self._host) and BZR_HOSTKEYS[self._host].has_key(keytype):
723
            our_server_key = BZR_HOSTKEYS[self._host][keytype]
724
            our_server_key_hex = paramiko.util.hexify(our_server_key.get_fingerprint())
725
        else:
726
            warning('Adding %s host key for %s: %s' % (keytype, self._host, server_key_hex))
727
            if not BZR_HOSTKEYS.has_key(self._host):
728
                BZR_HOSTKEYS[self._host] = {}
729
            BZR_HOSTKEYS[self._host][keytype] = server_key
730
            our_server_key = server_key
731
            our_server_key_hex = paramiko.util.hexify(our_server_key.get_fingerprint())
732
            save_host_keys()
733
        if server_key != our_server_key:
734
            filename1 = os.path.expanduser('~/.ssh/known_hosts')
1185.31.33 by John Arbash Meinel
A couple more path.join statements needed changing.
735
            filename2 = pathjoin(config_dir(), 'ssh_host_keys')
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
736
            raise TransportError('Host keys for %s do not match!  %s != %s' % \
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
737
                (self._host, our_server_key_hex, server_key_hex),
738
                ['Try editing %s or %s' % (filename1, filename2)])
739
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
740
        self._sftp_auth(t)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
741
        
742
        try:
743
            self._sftp = t.open_sftp_client()
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
744
        except paramiko.SSHException, e:
745
            raise ConnectionError('Unable to start sftp client %s:%d' %
746
                                  (self._host, self._port), e)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
747
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
748
    def _sftp_auth(self, transport):
749
        # paramiko requires a username, but it might be none if nothing was supplied
750
        # use the local username, just in case.
751
        # We don't override self._username, because if we aren't using paramiko,
752
        # the username might be specified in ~/.ssh/config and we don't want to
753
        # force it to something else
754
        # Also, it would mess up the self.relpath() functionality
755
        username = self._username or getpass.getuser()
756
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
757
        # Paramiko tries to open a socket.AF_UNIX in order to connect
758
        # to ssh-agent. That attribute doesn't exist on win32 (it does in cygwin)
759
        # so we get an AttributeError exception. For now, just don't try to
760
        # connect to an agent if we are on win32
761
        if sys.platform != 'win32':
762
            agent = paramiko.Agent()
763
            for key in agent.get_keys():
764
                mutter('Trying SSH agent key %s' % paramiko.util.hexify(key.get_fingerprint()))
765
                try:
766
                    transport.auth_publickey(username, key)
767
                    return
768
                except paramiko.SSHException, e:
769
                    pass
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
770
        
771
        # okay, try finding id_rsa or id_dss?  (posix only)
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
772
        if self._try_pkey_auth(transport, paramiko.RSAKey, username, 'id_rsa'):
773
            return
774
        if self._try_pkey_auth(transport, paramiko.DSSKey, username, 'id_dsa'):
775
            return
776
1185.27.1 by Jelmer Vernooij
Parse passwords in sftp URLs (sftp://foo:bar@localhost/).
777
        if self._password:
778
            try:
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
779
                transport.auth_password(username, self._password)
1185.27.1 by Jelmer Vernooij
Parse passwords in sftp URLs (sftp://foo:bar@localhost/).
780
                return
781
            except paramiko.SSHException, e:
782
                pass
783
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
784
            # FIXME: Don't keep a password held in memory if you can help it
785
            #self._password = None
786
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
787
        # give up and ask for a password
1185.50.10 by John Arbash Meinel
Don't import ui_factory directly, in case it gets changed later.
788
        password = bzrlib.ui.ui_factory.get_password(
789
                prompt='SSH %(user)s@%(host)s password',
790
                user=username, host=self._host)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
791
        try:
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
792
            transport.auth_password(username, password)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
793
        except paramiko.SSHException, e:
794
            raise ConnectionError('Unable to authenticate to SSH host as %s@%s' %
795
                                  (username, self._host), e)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
796
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
797
    def _try_pkey_auth(self, transport, pkey_class, username, filename):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
798
        filename = os.path.expanduser('~/.ssh/' + filename)
799
        try:
800
            key = pkey_class.from_private_key_file(filename)
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
801
            transport.auth_publickey(username, key)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
802
            return True
803
        except paramiko.PasswordRequiredException:
1185.50.10 by John Arbash Meinel
Don't import ui_factory directly, in case it gets changed later.
804
            password = bzrlib.ui.ui_factory.get_password(
805
                    prompt='SSH %(filename)s password',
806
                    filename=filename)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
807
            try:
808
                key = pkey_class.from_private_key_file(filename, password)
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
809
                transport.auth_publickey(username, key)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
810
                return True
811
            except paramiko.SSHException:
812
                mutter('SSH authentication via %s key failed.' % (os.path.basename(filename),))
813
        except paramiko.SSHException:
814
            mutter('SSH authentication via %s key failed.' % (os.path.basename(filename),))
815
        except IOError:
816
            pass
817
        return False
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
818
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
819
    def _sftp_open_exclusive(self, abspath, mode=None):
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
820
        """Open a remote path exclusively.
821
822
        SFTP supports O_EXCL (SFTP_FLAG_EXCL), which fails if
823
        the file already exists. However it does not expose this
824
        at the higher level of SFTPClient.open(), so we have to
825
        sneak away with it.
826
827
        WARNING: This breaks the SFTPClient abstraction, so it
828
        could easily break against an updated version of paramiko.
829
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
830
        :param abspath: The remote absolute path where the file should be opened
831
        :param mode: The mode permissions bits for the new file
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
832
        """
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
833
        path = self._sftp._adjust_cwd(abspath)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
834
        attr = SFTPAttributes()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
835
        if mode is not None:
836
            attr.st_mode = mode
837
        omode = (SFTP_FLAG_WRITE | SFTP_FLAG_CREATE 
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
838
                | SFTP_FLAG_TRUNC | SFTP_FLAG_EXCL)
839
        try:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
840
            t, msg = self._sftp._request(CMD_OPEN, path, omode, attr)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
841
            if t != CMD_HANDLE:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
842
                raise TransportError('Expected an SFTP handle')
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
843
            handle = msg.get_string()
1185.31.51 by John Arbash Meinel
Setting binary flags for sftp.
844
            return SFTPFile(self._sftp, handle, 'wb', -1)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
845
        except (paramiko.SSHException, IOError), e:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
846
            self._translate_io_exception(e, abspath, ': unable to open',
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
847
                failure_exc=FileExists)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
848
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
849
1530.1.3 by Robert Collins
transport implementations now tested consistently.
850
# ------------- server test implementation --------------
851
import socket
852
import threading
853
854
from bzrlib.tests.stub_sftp import StubServer, StubSFTPServer
855
856
STUB_SERVER_KEY = """
857
-----BEGIN RSA PRIVATE KEY-----
858
MIICWgIBAAKBgQDTj1bqB4WmayWNPB+8jVSYpZYk80Ujvj680pOTh2bORBjbIAyz
859
oWGW+GUjzKxTiiPvVmxFgx5wdsFvF03v34lEVVhMpouqPAYQ15N37K/ir5XY+9m/
860
d8ufMCkjeXsQkKqFbAlQcnWMCRnOoPHS3I4vi6hmnDDeeYTSRvfLbW0fhwIBIwKB
861
gBIiOqZYaoqbeD9OS9z2K9KR2atlTxGxOJPXiP4ESqP3NVScWNwyZ3NXHpyrJLa0
862
EbVtzsQhLn6rF+TzXnOlcipFvjsem3iYzCpuChfGQ6SovTcOjHV9z+hnpXvQ/fon
863
soVRZY65wKnF7IAoUwTmJS9opqgrN6kRgCd3DASAMd1bAkEA96SBVWFt/fJBNJ9H
864
tYnBKZGw0VeHOYmVYbvMSstssn8un+pQpUm9vlG/bp7Oxd/m+b9KWEh2xPfv6zqU
865
avNwHwJBANqzGZa/EpzF4J8pGti7oIAPUIDGMtfIcmqNXVMckrmzQ2vTfqtkEZsA
866
4rE1IERRyiJQx6EJsz21wJmGV9WJQ5kCQQDwkS0uXqVdFzgHO6S++tjmjYcxwr3g
867
H0CoFYSgbddOT6miqRskOQF3DZVkJT3kyuBgU2zKygz52ukQZMqxCb1fAkASvuTv
868
qfpH87Qq5kQhNKdbbwbmd2NxlNabazPijWuphGTdW0VfJdWfklyS2Kr+iqrs/5wV
869
HhathJt636Eg7oIjAkA8ht3MQ+XSl9yIJIS8gVpbPxSw5OMfw0PjVE7tBdQruiSc
870
nvuQES5C9BMHjF39LZiGH1iLQy7FgdHyoP+eodI7
871
-----END RSA PRIVATE KEY-----
872
"""
873
    
874
875
class SingleListener(threading.Thread):
876
877
    def __init__(self, callback):
878
        threading.Thread.__init__(self)
879
        self._callback = callback
880
        self._socket = socket.socket()
881
        self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
882
        self._socket.bind(('localhost', 0))
883
        self._socket.listen(1)
884
        self.port = self._socket.getsockname()[1]
885
        self.stop_event = threading.Event()
886
887
    def run(self):
888
        s, _ = self._socket.accept()
889
        # now close the listen socket
890
        self._socket.close()
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
891
        try:
892
            self._callback(s, self.stop_event)
1185.50.56 by John Arbash Meinel
[patch] Robey Pointer: squelch the socket.error messages.
893
        except socket.error:
894
            pass #Ignore socket errors
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
895
        except Exception, x:
1547.1.2 by Robey Pointer
ask paramiko to log into the bzr logging tree during unit tests, and log a warning when the server thread exits due to exception
896
            # probably a failed test
1547.1.7 by Robey Pointer
correct another misspelling of warning
897
            warning('Exception from within unit test server thread: %r' % x)
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
898
1530.1.3 by Robert Collins
transport implementations now tested consistently.
899
    def stop(self):
900
        self.stop_event.set()
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
901
        # use a timeout here, because if the test fails, the server thread may
902
        # never notice the stop_event.
903
        self.join(5.0)
904
905
1530.1.3 by Robert Collins
transport implementations now tested consistently.
906
class SFTPServer(Server):
907
    """Common code for SFTP server facilities."""
908
909
    def __init__(self):
910
        self._original_vendor = None
911
        self._homedir = None
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
912
        self._server_homedir = None
1530.1.3 by Robert Collins
transport implementations now tested consistently.
913
        self._listener = None
914
        self._root = None
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
915
        self._vendor = 'none'
1530.1.6 by Robert Collins
Trim duplicate sftp tests.
916
        # sftp server logs
917
        self.logs = []
1530.1.3 by Robert Collins
transport implementations now tested consistently.
918
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
919
    def _get_sftp_url(self, path):
920
        """Calculate an sftp url to this server for path."""
921
        return 'sftp://foo:bar@localhost:%d/%s' % (self._listener.port, path)
922
1530.1.6 by Robert Collins
Trim duplicate sftp tests.
923
    def log(self, message):
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
924
        """StubServer uses this to log when a new server is created."""
1530.1.6 by Robert Collins
Trim duplicate sftp tests.
925
        self.logs.append(message)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
926
927
    def _run_server(self, s, stop_event):
928
        ssh_server = paramiko.Transport(s)
929
        key_file = os.path.join(self._homedir, 'test_rsa.key')
930
        file(key_file, 'w').write(STUB_SERVER_KEY)
931
        host_key = paramiko.RSAKey.from_private_key_file(key_file)
932
        ssh_server.add_server_key(host_key)
933
        server = StubServer(self)
934
        ssh_server.set_subsystem_handler('sftp', paramiko.SFTPServer,
935
                                         StubSFTPServer, root=self._root,
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
936
                                         home=self._server_homedir)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
937
        event = threading.Event()
938
        ssh_server.start_server(event, server)
939
        event.wait(5.0)
940
        stop_event.wait(30.0)
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
941
    
1530.1.3 by Robert Collins
transport implementations now tested consistently.
942
    def setUp(self):
943
        global _ssh_vendor
944
        self._original_vendor = _ssh_vendor
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
945
        _ssh_vendor = self._vendor
1530.1.3 by Robert Collins
transport implementations now tested consistently.
946
        self._homedir = os.getcwdu()
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
947
        if self._server_homedir is None:
948
            self._server_homedir = self._homedir
1530.1.3 by Robert Collins
transport implementations now tested consistently.
949
        self._root = '/'
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
950
        # FIXME WINDOWS: _root should be _server_homedir[0]:/
1530.1.3 by Robert Collins
transport implementations now tested consistently.
951
        self._listener = SingleListener(self._run_server)
952
        self._listener.setDaemon(True)
953
        self._listener.start()
954
955
    def tearDown(self):
956
        """See bzrlib.transport.Server.tearDown."""
957
        global _ssh_vendor
958
        self._listener.stop()
959
        _ssh_vendor = self._original_vendor
960
961
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
962
class SFTPFullAbsoluteServer(SFTPServer):
963
    """A test server for sftp transports, using absolute urls and ssh."""
964
965
    def get_url(self):
966
        """See bzrlib.transport.Server.get_url."""
967
        return self._get_sftp_url(urlescape(self._homedir[1:]))
968
969
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
970
class SFTPServerWithoutSSH(SFTPServer):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
971
    """An SFTP server that uses a simple TCP socket pair rather than SSH."""
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
972
973
    def __init__(self):
974
        super(SFTPServerWithoutSSH, self).__init__()
975
        self._vendor = 'loopback'
976
977
    def _run_server(self, sock, stop_event):
978
        class FakeChannel(object):
979
            def get_transport(self):
980
                return self
981
            def get_log_channel(self):
982
                return 'paramiko'
983
            def get_name(self):
984
                return '1'
985
            def get_hexdump(self):
986
                return False
987
988
        server = paramiko.SFTPServer(FakeChannel(), 'sftp', StubServer(self), StubSFTPServer,
989
                                     root=self._root, home=self._server_homedir)
990
        server.start_subsystem('sftp', None, sock)
991
        server.finish_subsystem()
992
993
994
class SFTPAbsoluteServer(SFTPServerWithoutSSH):
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
995
    """A test server for sftp transports, using absolute urls."""
996
1530.1.3 by Robert Collins
transport implementations now tested consistently.
997
    def get_url(self):
998
        """See bzrlib.transport.Server.get_url."""
1534.1.8 by Robert Collins
Update SFTP Urls as per mailing list thread.
999
        return self._get_sftp_url(urlescape(self._homedir[1:]))
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1000
1001
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1002
class SFTPHomeDirServer(SFTPServerWithoutSSH):
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
1003
    """A test server for sftp transports, using homedir relative urls."""
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1004
1005
    def get_url(self):
1006
        """See bzrlib.transport.Server.get_url."""
1534.1.8 by Robert Collins
Update SFTP Urls as per mailing list thread.
1007
        return self._get_sftp_url("~/")
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
1008
1009
1010
class SFTPSiblingAbsoluteServer(SFTPAbsoluteServer):
1011
    """A test servere for sftp transports, using absolute urls to non-home."""
1012
1013
    def setUp(self):
1014
        self._server_homedir = '/dev/noone/runs/tests/here'
1015
        super(SFTPSiblingAbsoluteServer, self).setUp()
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
1016
1017
1018
def get_test_permutations():
1019
    """Return the permutations to be used in testing."""
1020
    return [(SFTPTransport, SFTPAbsoluteServer),
1021
            (SFTPTransport, SFTPHomeDirServer),
1022
            (SFTPTransport, SFTPSiblingAbsoluteServer),
1023
            ]