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