/brz/remove-bazaar

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