~bzr-pqm/bzr/bzr.dev

1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
1
# Copyright (C) 2005 Robey Pointer <robey@lag.net>
2221.5.1 by Dmitry Vasiliev
Added support for Putty's SSH implementation
2
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
3
#
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
8
#
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
13
#
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
"""Implementation of Transport over SFTP, using paramiko."""
19
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
20
# TODO: Remove the transport-based lock_read and lock_write methods.  They'll
21
# then raise TransportNotPossible, which will break remote access to any
22
# formats which rely on OS-level locks.  That should be fine as those formats
23
# are pretty old, but these combinations may have to be removed from the test
1910.7.19 by Andrew Bennetts
Expand comment about lock_read/lock_write.
24
# suite.  Those formats all date back to 0.7; so we should be able to remove
25
# these methods when we officially drop support for those formats.
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
26
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
27
import errno
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
28
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
29
import random
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
30
import select
1806.1.1 by Robey Pointer
absorb a broken-pipe exception from paramiko when running the unit tests. it's okay for the client to vanish abruptly and paramiko really ought to mask the exception itself.
31
import socket
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
32
import stat
33
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
34
import time
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
35
import urllib
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
36
import urlparse
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
37
import warnings
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
38
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
39
from bzrlib import (
40
    errors,
41
    urlutils,
42
    )
1996.2.1 by Andrew Bennetts
Fix NameError reported by Alexander Belchenko.
43
from bzrlib.errors import (FileExists,
1951.1.6 by Andrew Bennetts
Tidy up some unused imports.
44
                           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
45
                           TransportError,
1996.2.1 by Andrew Bennetts
Fix NameError reported by Alexander Belchenko.
46
                           LockError,
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
47
                           PathError,
48
                           ParamikoNotPresent,
1530.1.3 by Robert Collins
transport implementations now tested consistently.
49
                           )
1711.5.1 by John Arbash Meinel
Get most SFTP tests to pass. StubSFTPServer now talks the same path protocol that SFTPTransport talks. on win32
50
from bzrlib.osutils import pathjoin, fancy_rename, getcwd
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
51
from bzrlib.symbol_versioning import (
52
        deprecated_function,
53
        )
1951.1.6 by Andrew Bennetts
Tidy up some unused imports.
54
from bzrlib.trace import mutter, warning
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
55
from bzrlib.transport import (
2671.3.6 by Robert Collins
Review feedback.
56
    FileFileStream,
2671.3.2 by Robert Collins
Start open_file_stream logic.
57
    _file_streams,
2018.5.114 by Robert Collins
Commit current test pass improvements.
58
    local,
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
59
    Server,
1951.1.4 by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py
60
    ssh,
2485.8.16 by Vincent Ladeuil
Create a new, empty, ConnectedTransport class.
61
    ConnectedTransport,
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
62
    )
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
63
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
64
# Disable one particular warning that comes from paramiko in Python2.5; if
65
# this is emitted at the wrong time it tends to cause spurious test failures
66
# or at least noise in the test case::
67
#
68
# [1770/7639 in 86s, 1 known failures, 50 skipped, 2 missing features]
69
# test_permissions.TestSftpPermissions.test_new_files
70
# /var/lib/python-support/python2.5/paramiko/message.py:226: DeprecationWarning: integer argument expected, got float
71
#  self.packet.write(struct.pack('>I', n))
72
warnings.filterwarnings('ignore',
73
        'integer argument expected, got float',
74
        category=DeprecationWarning,
75
        module='paramiko.message')
76
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
77
try:
78
    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.
79
except ImportError, e:
80
    raise ParamikoNotPresent(e)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
81
else:
82
    from paramiko.sftp import (SFTP_FLAG_WRITE, SFTP_FLAG_CREATE,
83
                               SFTP_FLAG_EXCL, SFTP_FLAG_TRUNC,
84
                               CMD_HANDLE, CMD_OPEN)
85
    from paramiko.sftp_attr import SFTPAttributes
86
    from paramiko.sftp_file import SFTPFile
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
87
1883.1.3 by Stefan (metze) Metzmacher
- fix typo
88
1711.6.2 by John Arbash Meinel
Clean up paramiko agent support.
89
_paramiko_version = getattr(paramiko, '__version_info__', (0, 0, 0))
90
# don't use prefetch unless paramiko version >= 1.5.5 (there were bugs earlier)
91
_default_do_prefetch = (_paramiko_version >= (1, 5, 5))
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.
92
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
93
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
94
class SFTPLock(object):
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
95
    """This fakes a lock in a remote location.
96
    
97
    A present lock is indicated just by the existence of a file.  This
98
    doesn't work well on all transports and they are only used in 
99
    deprecated storage formats.
100
    """
101
    
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
102
    __slots__ = ['path', 'lock_path', 'lock_file', 'transport']
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
103
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
104
    def __init__(self, path, transport):
105
        self.lock_file = None
106
        self.path = path
107
        self.lock_path = path + '.write-lock'
108
        self.transport = transport
109
        try:
1530.1.7 by Robert Collins
merge integration.
110
            # RBC 20060103 FIXME should we be using private methods here ?
111
            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.
112
            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
113
        except FileExists:
114
            raise LockError('File %r already locked' % (self.path,))
115
116
    def __del__(self):
117
        """Should this warn, or actually try to cleanup?"""
118
        if self.lock_file:
1547.1.3 by Robey Pointer
spell warning correctly :) and move recv_ready close to recv for readability
119
            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
120
            self.unlock()
121
122
    def unlock(self):
123
        if not self.lock_file:
124
            return
125
        self.lock_file.close()
126
        self.lock_file = None
127
        try:
128
            self.transport.delete(self.lock_path)
129
        except (NoSuchFile,):
130
            # What specific errors should we catch here?
131
            pass
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
132
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
133
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
134
class SFTPTransport(ConnectedTransport):
1752.2.40 by Andrew Bennetts
Merge from bzr.dev.
135
    """Transport implementation for SFTP access."""
1864.5.2 by John Arbash Meinel
always read in sorted order, and return in requested order, but only cache what is currently out of order
136
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.
137
    _do_prefetch = _default_do_prefetch
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
138
    # TODO: jam 20060717 Conceivably these could be configurable, either
139
    #       by auto-tuning at run-time, or by a configuration (per host??)
140
    #       but the performance curve is pretty flat, so just going with
141
    #       reasonable defaults.
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
142
    _max_readv_combine = 200
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
143
    # Having to round trip to the server means waiting for a response,
144
    # so it is better to download extra bytes.
145
    # 8KiB had good performance for both local and remote network operations
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
146
    _bytes_to_read_before_seek = 8192
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
147
1864.5.20 by John Arbash Meinel
Some small cleanups.
148
    # The sftp spec says that implementations SHOULD allow reads
149
    # to be at least 32K. paramiko.readv() does an async request
150
    # for the chunks. So we need to keep it within a single request
151
    # size for paramiko <= 1.6.1. paramiko 1.6.2 will probably chop
152
    # up the request itself, rather than us having to worry about it
153
    _max_request_size = 32768
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
154
2485.8.59 by Vincent Ladeuil
Update from review comments.
155
    def __init__(self, base, _from_transport=None):
156
        super(SFTPTransport, self).__init__(base,
157
                                            _from_transport=_from_transport)
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
158
159
    def _remote_path(self, relpath):
160
        """Return the path to be passed along the sftp protocol for relpath.
161
        
162
        :param relpath: is a urlencoded string.
163
        """
164
        relative = urlutils.unescape(relpath).encode('utf-8')
165
        remote_path = self._combine_paths(self._path, relative)
166
        # the initial slash should be removed from the path, and treated as a
167
        # homedir relative path (the path begins with a double slash if it is
168
        # absolute).  see draft-ietf-secsh-scp-sftp-ssh-uri-03.txt
169
        # RBC 20060118 we are not using this as its too user hostile. instead
170
        # we are following lftp and using /~/foo to mean '~/foo'
171
        # vila--20070602 and leave absolute paths begin with a single slash.
172
        if remote_path.startswith('/~/'):
173
            remote_path = remote_path[3:]
174
        elif remote_path == '/~':
175
            remote_path = ''
176
        return remote_path
177
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
178
    def _create_connection(self, credentials=None):
179
        """Create a new connection with the provided credentials.
180
181
        :param credentials: The credentials needed to establish the connection.
182
183
        :return: The created connection and its associated credentials.
184
185
        The credentials are only the password as it may have been entered
186
        interactively by the user and may be different from the one provided
187
        in base url at transport creation time.
188
        """
189
        if credentials is None:
190
            password = self._password
191
        else:
192
            password = credentials
193
194
        vendor = ssh._get_ssh_vendor()
195
        connection = vendor.connect_sftp(self._user, password,
196
                                         self._host, self._port)
197
        return connection, password
198
199
    def _get_sftp(self):
200
        """Ensures that a connection is established"""
201
        connection = self._get_connection()
202
        if connection is None:
203
            # First connection ever
204
            connection, credentials = self._create_connection()
205
            self._set_connection(connection, credentials)
206
        return connection
207
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
208
    def has(self, relpath):
209
        """
210
        Does the target location exist?
211
        """
212
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
213
            self._get_sftp().stat(self._remote_path(relpath))
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
214
            return True
215
        except IOError:
216
            return False
217
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
218
    def get(self, relpath):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
219
        """
220
        Get the file at the given relative path.
221
222
        :param relpath: The relative path to the file
223
        """
224
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
225
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
226
            f = self._get_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.
227
            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
228
                f.prefetch()
229
            return f
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
230
        except (IOError, paramiko.SSHException), e:
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
231
            self._translate_io_exception(e, path, ': error retrieving',
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
232
                failure_exc=errors.ReadError)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
233
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
234
    def _readv(self, relpath, offsets):
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
235
        """See Transport.readv()"""
236
        # We overload the default readv() because we want to use a file
237
        # that does not have prefetch enabled.
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
238
        # Also, if we have a new paramiko, it implements an async readv()
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
239
        if not offsets:
240
            return
241
242
        try:
243
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
244
            fp = self._get_sftp().file(path, mode='rb')
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
245
            readv = getattr(fp, 'readv', None)
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
246
            if readv:
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
247
                return self._sftp_readv(fp, offsets, relpath)
1864.5.16 by John Arbash Meinel
instrument to enable/disable readv support for testing
248
            mutter('seek and read %s offsets', len(offsets))
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
249
            return self._seek_and_read(fp, offsets, relpath)
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
250
        except (IOError, paramiko.SSHException), e:
251
            self._translate_io_exception(e, path, ': error retrieving')
252
2671.3.1 by Robert Collins
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
253
    def recommended_page_size(self):
254
        """See Transport.recommended_page_size().
255
256
        For SFTP we suggest a large page size to reduce the overhead
257
        introduced by latency.
258
        """
259
        return 64 * 1024
260
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
261
    def _sftp_readv(self, fp, offsets, relpath='<unknown>'):
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
262
        """Use the readv() member of fp to do async readv.
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
263
264
        And then read them using paramiko.readv(). paramiko.readv()
265
        does not support ranges > 64K, so it caps the request size, and
266
        just reads until it gets all the stuff it wants
267
        """
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
268
        offsets = list(offsets)
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
269
        sorted_offsets = sorted(offsets)
270
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
271
        # The algorithm works as follows:
272
        # 1) Coalesce nearby reads into a single chunk
273
        #    This generates a list of combined regions, the total size
274
        #    and the size of the sub regions. This coalescing step is limited
275
        #    in the number of nearby chunks to combine, and is allowed to
276
        #    skip small breaks in the requests. Limiting it makes sure that
277
        #    we can start yielding some data earlier, and skipping means we
278
        #    make fewer requests. (Beneficial even when using async)
279
        # 2) Break up this combined regions into chunks that are smaller
280
        #    than 64KiB. Technically the limit is 65536, but we are a
281
        #    little bit conservative. This is because sftp has a maximum
282
        #    return chunk size of 64KiB (max size of an unsigned short)
283
        # 3) Issue a readv() to paramiko to create an async request for
284
        #    all of this data
285
        # 4) Read in the data as it comes back, until we've read one
286
        #    continuous section as determined in step 1
287
        # 5) Break up the full sections into hunks for the original requested
288
        #    offsets. And put them in a cache
289
        # 6) Check if the next request is in the cache, and if it is, remove
290
        #    it from the cache, and yield its data. Continue until no more
291
        #    entries are in the cache.
292
        # 7) loop back to step 4 until all data has been read
1864.5.16 by John Arbash Meinel
instrument to enable/disable readv support for testing
293
        #
294
        # TODO: jam 20060725 This could be optimized one step further, by
295
        #       attempting to yield whatever data we have read, even before
1864.5.20 by John Arbash Meinel
Some small cleanups.
296
        #       the first coallesced section has been fully processed.
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
297
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
298
        # When coalescing for use with readv(), we don't really need to
299
        # use any fudge factor, because the requests are made asynchronously
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
300
        coalesced = list(self._coalesce_offsets(sorted_offsets,
301
                               limit=self._max_readv_combine,
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
302
                               fudge_factor=0,
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
303
                               ))
304
        requests = []
305
        for c_offset in coalesced:
306
            start = c_offset.start
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
307
            size = c_offset.length
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
308
309
            # We need to break this up into multiple requests
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
310
            while size > 0:
1864.5.20 by John Arbash Meinel
Some small cleanups.
311
                next_size = min(size, self._max_request_size)
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
312
                requests.append((start, next_size))
313
                size -= next_size
314
                start += next_size
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
315
1864.5.16 by John Arbash Meinel
instrument to enable/disable readv support for testing
316
        mutter('SFTP.readv() %s offsets => %s coalesced => %s requests',
317
                len(offsets), len(coalesced), len(requests))
318
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
319
        # Queue the current read until we have read the full coalesced section
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
320
        cur_data = []
321
        cur_data_len = 0
322
        cur_coalesced_stack = iter(coalesced)
323
        cur_coalesced = cur_coalesced_stack.next()
324
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
325
        # Cache the results, but only until they have been fulfilled
326
        data_map = {}
327
        # turn the list of offsets into a stack
328
        offset_stack = iter(offsets)
329
        cur_offset_and_size = offset_stack.next()
330
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
331
        for data in fp.readv(requests):
3688.1.1 by John Arbash Meinel
Properly append the data to the list buffer.
332
            cur_data.append(data)
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
333
            cur_data_len += len(data)
334
335
            if cur_data_len < cur_coalesced.length:
336
                continue
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
337
            if cur_data_len != cur_coalesced.length:
338
                raise AssertionError(
339
                    "Somehow we read too much: %s != %s" 
340
                    % (cur_data_len, cur_coalesced.length))
1864.5.20 by John Arbash Meinel
Some small cleanups.
341
            all_data = ''.join(cur_data)
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
342
            cur_data = []
343
            cur_data_len = 0
344
345
            for suboffset, subsize in cur_coalesced.ranges:
346
                key = (cur_coalesced.start+suboffset, subsize)
1864.5.20 by John Arbash Meinel
Some small cleanups.
347
                data_map[key] = all_data[suboffset:suboffset+subsize]
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
348
349
            # Now that we've read some data, see if we can yield anything back
350
            while cur_offset_and_size in data_map:
351
                this_data = data_map.pop(cur_offset_and_size)
352
                yield cur_offset_and_size[0], this_data
353
                cur_offset_and_size = offset_stack.next()
354
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
355
            # We read a coalesced entry, so mark it as done
356
            cur_coalesced = None
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
357
            # Now that we've read all of the data for this coalesced section
358
            # on to the next
359
            cur_coalesced = cur_coalesced_stack.next()
1864.5.12 by John Arbash Meinel
Using a simple sftp_file.readv() request if possible.
360
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
361
        if cur_coalesced is not None:
362
            raise errors.ShortReadvError(relpath, cur_coalesced.start,
2001.3.3 by John Arbash Meinel
review feedback: add the actual count written to ShortReadvError
363
                cur_coalesced.length, len(data))
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
364
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
365
    def put_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
366
        """
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
367
        Copy the file-like object into the location.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
368
369
        :param relpath: Location to put the contents, relative to base.
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
370
        :param f:       File-like object.
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
371
        :param mode: The final mode for the file
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
372
        """
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
373
        final_path = self._remote_path(relpath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
374
        return self._put(final_path, f, mode=mode)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
375
376
    def _put(self, abspath, f, mode=None):
377
        """Helper function so both put() and copy_abspaths can reuse the code"""
378
        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
379
                        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.
380
        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.
381
        closed = False
1185.41.6 by Robey Pointer
modified version of john's patch to add atomic put and locking to the sftp transport
382
        try:
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
383
            try:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
384
                fout.set_pipelined(True)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
385
                length = self._pump(f, fout)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
386
            except (IOError, paramiko.SSHException), e:
387
                self._translate_io_exception(e, tmp_abspath)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
388
            # XXX: This doesn't truly help like we would like it to.
389
            #      The problem is that openssh strips sticky bits. So while we
390
            #      can properly set group write permission, we lose the group
391
            #      sticky bit. So it is probably best to stop chmodding, and
392
            #      just tell users that they need to set the umask correctly.
393
            #      The attr.st_mode = mode, in _sftp_open_exclusive
394
            #      will handle when the user wants the final mode to be more 
395
            #      restrictive. And then we avoid a round trip. Unless 
396
            #      paramiko decides to expose an async chmod()
397
398
            # This is designed to chmod() right before we close.
399
            # Because we set_pipelined() earlier, theoretically we might 
400
            # avoid the round trip for fout.close()
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.
401
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
402
                self._get_sftp().chmod(tmp_abspath, mode)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
403
            fout.close()
404
            closed = True
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
405
            self._rename_and_overwrite(tmp_abspath, abspath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
406
            return length
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
407
        except Exception, e:
408
            # If we fail, try to clean up the temporary file
409
            # before we throw the exception
410
            # 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.
411
            # Write out the traceback, because otherwise
412
            # 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.
413
            import traceback
414
            mutter(traceback.format_exc())
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
415
            try:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
416
                if not closed:
417
                    fout.close()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
418
                self._get_sftp().remove(tmp_abspath)
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
419
            except:
1532 by Robert Collins
Merge in John Meinels integration branch.
420
                # raise the saved except
421
                raise e
422
            # raise the original with its traceback if we can.
423
            raise
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
424
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
425
    def _put_non_atomic_helper(self, relpath, writer, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
426
                               create_parent_dir=False,
427
                               dir_mode=None):
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
428
        abspath = self._remote_path(relpath)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
429
430
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
431
        #       set the file mode at create time. If it does, use it.
432
        #       But for now, we just chmod later anyway.
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
433
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
434
        def _open_and_write_file():
435
            """Try to open the target file, raise error on failure"""
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
436
            fout = None
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
437
            try:
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
438
                try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
439
                    fout = self._get_sftp().file(abspath, mode='wb')
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
440
                    fout.set_pipelined(True)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
441
                    writer(fout)
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
442
                except (paramiko.SSHException, IOError), e:
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
443
                    self._translate_io_exception(e, abspath,
444
                                                 ': unable to open')
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
445
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
446
                # This is designed to chmod() right before we close.
447
                # Because we set_pipelined() earlier, theoretically we might 
448
                # avoid the round trip for fout.close()
449
                if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
450
                    self._get_sftp().chmod(abspath, mode)
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
451
            finally:
452
                if fout is not None:
453
                    fout.close()
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
454
455
        if not create_parent_dir:
456
            _open_and_write_file()
457
            return
458
459
        # Try error handling to create the parent directory if we need to
460
        try:
461
            _open_and_write_file()
462
        except NoSuchFile:
463
            # Try to create the parent directory, and then go back to
464
            # writing the file
465
            parent_dir = os.path.dirname(abspath)
1946.2.15 by John Arbash Meinel
Fix the sftp mkdir mode code
466
            self._mkdir(parent_dir, dir_mode)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
467
            _open_and_write_file()
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
468
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
469
    def put_file_non_atomic(self, relpath, f, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
470
                            create_parent_dir=False,
471
                            dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
472
        """Copy the file-like object into the target location.
473
474
        This function is not strictly safe to use. It is only meant to
475
        be used when you already know that the target does not exist.
476
        It is not safe, because it will open and truncate the remote
477
        file. So there may be a time when the file has invalid contents.
478
479
        :param relpath: The remote location to put the contents.
480
        :param f:       File-like object.
481
        :param mode:    Possible access permissions for new file.
482
                        None means do not set remote permissions.
483
        :param create_parent_dir: If we cannot create the target file because
484
                        the parent directory does not exist, go ahead and
485
                        create it, and then try again.
486
        """
487
        def writer(fout):
488
            self._pump(f, fout)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
489
        self._put_non_atomic_helper(relpath, writer, mode=mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
490
                                    create_parent_dir=create_parent_dir,
491
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
492
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
493
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
494
                             create_parent_dir=False,
495
                             dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
496
        def writer(fout):
497
            fout.write(bytes)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
498
        self._put_non_atomic_helper(relpath, writer, mode=mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
499
                                    create_parent_dir=create_parent_dir,
500
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
501
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
502
    def iter_files_recursive(self):
503
        """Walk the relative paths of all files in this transport."""
504
        queue = list(self.list_dir('.'))
505
        while queue:
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
506
            relpath = queue.pop(0)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
507
            st = self.stat(relpath)
508
            if stat.S_ISDIR(st.st_mode):
509
                for i, basename in enumerate(self.list_dir(relpath)):
510
                    queue.insert(i, relpath+'/'+basename)
511
            else:
512
                yield relpath
513
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
514
    def _mkdir(self, abspath, mode=None):
515
        if mode is None:
516
            local_mode = 0777
517
        else:
518
            local_mode = mode
519
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
520
            self._get_sftp().mkdir(abspath, local_mode)
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
521
            if mode is not None:
3526.4.1 by Christophe Troestler
sftp transport: do not chmod a dir when unecessary (fix suid and sgid problems).
522
                # chmod a dir through sftp will erase any sgid bit set
523
                # on the server side.  So, if the bit mode are already
524
                # set, avoid the chmod.  If the mode is not fine but
525
                # the sgid bit is set, report a warning to the user
526
                # with the umask fix.
527
                stat = self._get_sftp().lstat(abspath)
528
                mode = mode & 0777 # can't set special bits anyway
529
                if mode != stat.st_mode & 0777:
3526.4.2 by Christophe Troestler
sftp: More informative warning message for chmod and suid/sgid bits problems.
530
                    if stat.st_mode & 06000:
531
                        warning('About to chmod %s over sftp, which will result'
532
                                ' in its suid or sgid bits being cleared.  If'
533
                                ' you want to preserve those bits, change your '
534
                                ' environment on the server to use umask 0%03o.'
3526.4.1 by Christophe Troestler
sftp transport: do not chmod a dir when unecessary (fix suid and sgid problems).
535
                                % (abspath, 0777 - mode))
536
                    self._get_sftp().chmod(abspath, mode=mode)
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
537
        except (paramiko.SSHException, IOError), e:
538
            self._translate_io_exception(e, abspath, ': unable to mkdir',
539
                failure_exc=FileExists)
540
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
541
    def mkdir(self, relpath, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
542
        """Create a directory at the given path."""
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
543
        self._mkdir(self._remote_path(relpath), mode=mode)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
544
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
545
    def open_write_stream(self, relpath, mode=None):
546
        """See Transport.open_write_stream."""
2671.3.2 by Robert Collins
Start open_file_stream logic.
547
        # initialise the file to zero-length
548
        # this is three round trips, but we don't use this 
549
        # api more than once per write_group at the moment so 
550
        # it is a tolerable overhead. Better would be to truncate
551
        # the file after opening. RBC 20070805
2671.3.3 by Robert Collins
Add mode parameter to Transport.open_file_stream.
552
        self.put_bytes_non_atomic(relpath, "", mode)
2671.3.2 by Robert Collins
Start open_file_stream logic.
553
        abspath = self._remote_path(relpath)
554
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
555
        #       set the file mode at create time. If it does, use it.
556
        #       But for now, we just chmod later anyway.
557
        handle = None
558
        try:
559
            handle = self._get_sftp().file(abspath, mode='wb')
560
            handle.set_pipelined(True)
561
        except (paramiko.SSHException, IOError), e:
562
            self._translate_io_exception(e, abspath,
563
                                         ': unable to open')
564
        _file_streams[self.abspath(relpath)] = handle
2671.3.6 by Robert Collins
Review feedback.
565
        return FileFileStream(self, relpath, handle)
2671.3.2 by Robert Collins
Start open_file_stream logic.
566
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
567
    def _translate_io_exception(self, e, path, more_info='',
568
                                failure_exc=PathError):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
569
        """Translate a paramiko or IOError into a friendlier exception.
570
571
        :param e: The original exception
572
        :param path: The path in question when the error is raised
573
        :param more_info: Extra information that can be included,
574
                          such as what was going on
575
        :param failure_exc: Paramiko has the super fun ability to raise completely
576
                           opaque errors that just set "e.args = ('Failure',)" with
577
                           no more information.
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
578
                           If this parameter is set, it defines the exception 
579
                           to raise in these cases.
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
580
        """
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
581
        # 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.
582
        self._translate_error(e, path, raise_generic=False)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
583
        if getattr(e, 'args', None) is not None:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
584
            if (e.args == ('No such file or directory',) or
585
                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.
586
                raise NoSuchFile(path, str(e) + more_info)
3565.4.1 by Christophe Troestler
[Bug #123475] SFTPTransport._translate_io_exception: better detection
587
            if (e.args == ('mkdir failed',) or
588
                e.args[0].startswith('syserr: File exists')):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
589
                raise FileExists(path, str(e) + more_info)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
590
            # strange but true, for the paramiko server.
591
            if (e.args == ('Failure',)):
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
592
                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.
593
            mutter('Raising exception with args %s', e.args)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
594
        if getattr(e, 'errno', None) is not None:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
595
            mutter('Raising exception with errno %s', e.errno)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
596
        raise e
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
597
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
598
    def append_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
599
        """
600
        Append the text in the file-like object into the final
601
        location.
602
        """
603
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
604
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
605
            fout = self._get_sftp().file(path, 'ab')
1666.1.6 by Robert Collins
Make knit the default format.
606
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
607
                self._get_sftp().chmod(path, mode)
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.
608
            result = fout.tell()
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
609
            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.
610
            return result
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
611
        except (IOError, paramiko.SSHException), e:
612
            self._translate_io_exception(e, relpath, ': unable to append')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
613
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
614
    def rename(self, rel_from, rel_to):
615
        """Rename without special overwriting"""
616
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
617
            self._get_sftp().rename(self._remote_path(rel_from),
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
618
                              self._remote_path(rel_to))
619
        except (IOError, paramiko.SSHException), e:
620
            self._translate_io_exception(e, rel_from,
621
                    ': unable to rename to %r' % (rel_to))
622
623
    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.
624
        """Do a fancy rename on the remote server.
625
        
626
        Using the implementation provided by osutils.
627
        """
628
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
629
            sftp = self._get_sftp()
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
630
            fancy_rename(abs_from, abs_to,
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
631
                         rename_func=sftp.rename,
632
                         unlink_func=sftp.remove)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
633
        except (IOError, paramiko.SSHException), e:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
634
            self._translate_io_exception(e, abs_from,
635
                                         ': unable to rename to %r' % (abs_to))
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
636
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
637
    def move(self, rel_from, rel_to):
638
        """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
639
        path_from = self._remote_path(rel_from)
640
        path_to = self._remote_path(rel_to)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
641
        self._rename_and_overwrite(path_from, path_to)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
642
643
    def delete(self, relpath):
644
        """Delete the item at relpath"""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
645
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
646
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
647
            self._get_sftp().remove(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
648
        except (IOError, paramiko.SSHException), e:
649
            self._translate_io_exception(e, path, ': unable to delete')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
650
            
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
651
    def external_url(self):
652
        """See bzrlib.transport.Transport.external_url."""
653
        # the external path for SFTP is the base
654
        return self.base
655
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
656
    def listable(self):
657
        """Return True if this store supports listing."""
658
        return True
659
660
    def list_dir(self, relpath):
661
        """
662
        Return a list of all files at the given location.
663
        """
664
        # does anything actually use this?
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
665
        # -- Unknown
666
        # This is at least used by copy_tree for remote upgrades.
667
        # -- David Allouche 2006-08-11
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
668
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
669
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
670
            entries = self._get_sftp().listdir(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
671
        except (IOError, paramiko.SSHException), e:
672
            self._translate_io_exception(e, path, ': failed to list_dir')
1959.2.2 by John Arbash Meinel
Apply Andrew Bennetts list_dir fixes
673
        return [urlutils.escape(entry) for entry in entries]
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
674
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
675
    def rmdir(self, relpath):
676
        """See Transport.rmdir."""
677
        path = self._remote_path(relpath)
678
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
679
            return self._get_sftp().rmdir(path)
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
680
        except (IOError, paramiko.SSHException), e:
681
            self._translate_io_exception(e, path, ': failed to rmdir')
682
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
683
    def stat(self, relpath):
684
        """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
685
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
686
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
687
            return self._get_sftp().stat(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
688
        except (IOError, paramiko.SSHException), e:
689
            self._translate_io_exception(e, path, ': unable to stat')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
690
691
    def lock_read(self, relpath):
692
        """
693
        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
694
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
695
        """
696
        # FIXME: there should be something clever i can do here...
697
        class BogusLock(object):
698
            def __init__(self, path):
699
                self.path = path
700
            def unlock(self):
701
                pass
702
        return BogusLock(relpath)
703
704
    def lock_write(self, relpath):
705
        """
706
        Lock the given file for exclusive (write) access.
707
        WARNING: many transports do not support this, so trying avoid using it
708
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
709
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
710
        """
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
711
        # This is a little bit bogus, but basically, we create a file
712
        # which should not already exist, and if it does, we assume
713
        # that there is a lock, and if it doesn't, the we assume
714
        # 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
715
        return SFTPLock(relpath, self)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
716
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
717
    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
718
        """Open a remote path exclusively.
719
720
        SFTP supports O_EXCL (SFTP_FLAG_EXCL), which fails if
721
        the file already exists. However it does not expose this
722
        at the higher level of SFTPClient.open(), so we have to
723
        sneak away with it.
724
725
        WARNING: This breaks the SFTPClient abstraction, so it
726
        could easily break against an updated version of paramiko.
727
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
728
        :param abspath: The remote absolute path where the file should be opened
729
        :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
730
        """
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
731
        # TODO: jam 20060816 Paramiko >= 1.6.2 (probably earlier) supports
732
        #       using the 'x' flag to indicate SFTP_FLAG_EXCL.
733
        #       However, there is no way to set the permission mode at open 
734
        #       time using the sftp_client.file() functionality.
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
735
        path = self._get_sftp()._adjust_cwd(abspath)
1711.5.1 by John Arbash Meinel
Get most SFTP tests to pass. StubSFTPServer now talks the same path protocol that SFTPTransport talks. on win32
736
        # mutter('sftp abspath %s => %s', abspath, path)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
737
        attr = SFTPAttributes()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
738
        if mode is not None:
739
            attr.st_mode = mode
740
        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
741
                | SFTP_FLAG_TRUNC | SFTP_FLAG_EXCL)
742
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
743
            t, msg = self._get_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
744
            if t != CMD_HANDLE:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
745
                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
746
            handle = msg.get_string()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
747
            return SFTPFile(self._get_sftp(), handle, 'wb', -1)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
748
        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.
749
            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.
750
                failure_exc=FileExists)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
751
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
752
    def _can_roundtrip_unix_modebits(self):
753
        if sys.platform == 'win32':
754
            # anyone else?
755
            return False
756
        else:
757
            return True
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
758
1530.1.3 by Robert Collins
transport implementations now tested consistently.
759
# ------------- server test implementation --------------
760
import threading
761
762
from bzrlib.tests.stub_sftp import StubServer, StubSFTPServer
763
764
STUB_SERVER_KEY = """
765
-----BEGIN RSA PRIVATE KEY-----
766
MIICWgIBAAKBgQDTj1bqB4WmayWNPB+8jVSYpZYk80Ujvj680pOTh2bORBjbIAyz
767
oWGW+GUjzKxTiiPvVmxFgx5wdsFvF03v34lEVVhMpouqPAYQ15N37K/ir5XY+9m/
768
d8ufMCkjeXsQkKqFbAlQcnWMCRnOoPHS3I4vi6hmnDDeeYTSRvfLbW0fhwIBIwKB
769
gBIiOqZYaoqbeD9OS9z2K9KR2atlTxGxOJPXiP4ESqP3NVScWNwyZ3NXHpyrJLa0
770
EbVtzsQhLn6rF+TzXnOlcipFvjsem3iYzCpuChfGQ6SovTcOjHV9z+hnpXvQ/fon
771
soVRZY65wKnF7IAoUwTmJS9opqgrN6kRgCd3DASAMd1bAkEA96SBVWFt/fJBNJ9H
772
tYnBKZGw0VeHOYmVYbvMSstssn8un+pQpUm9vlG/bp7Oxd/m+b9KWEh2xPfv6zqU
773
avNwHwJBANqzGZa/EpzF4J8pGti7oIAPUIDGMtfIcmqNXVMckrmzQ2vTfqtkEZsA
774
4rE1IERRyiJQx6EJsz21wJmGV9WJQ5kCQQDwkS0uXqVdFzgHO6S++tjmjYcxwr3g
775
H0CoFYSgbddOT6miqRskOQF3DZVkJT3kyuBgU2zKygz52ukQZMqxCb1fAkASvuTv
776
qfpH87Qq5kQhNKdbbwbmd2NxlNabazPijWuphGTdW0VfJdWfklyS2Kr+iqrs/5wV
777
HhathJt636Eg7oIjAkA8ht3MQ+XSl9yIJIS8gVpbPxSw5OMfw0PjVE7tBdQruiSc
778
nvuQES5C9BMHjF39LZiGH1iLQy7FgdHyoP+eodI7
779
-----END RSA PRIVATE KEY-----
780
"""
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
781
782
783
class SocketListener(threading.Thread):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
784
785
    def __init__(self, callback):
786
        threading.Thread.__init__(self)
787
        self._callback = callback
788
        self._socket = socket.socket()
789
        self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
790
        self._socket.bind(('localhost', 0))
791
        self._socket.listen(1)
792
        self.port = self._socket.getsockname()[1]
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
793
        self._stop_event = threading.Event()
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
794
1530.1.3 by Robert Collins
transport implementations now tested consistently.
795
    def stop(self):
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
796
        # called from outside this thread
797
        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
798
        # use a timeout here, because if the test fails, the server thread may
799
        # never notice the stop_event.
800
        self.join(5.0)
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
801
        self._socket.close()
802
803
    def run(self):
804
        while True:
1551.6.40 by Aaron Bentley
Wrapped long lines in Robey's patch
805
            readable, writable_unused, exception_unused = \
806
                select.select([self._socket], [], [], 0.1)
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
807
            if self._stop_event.isSet():
808
                return
809
            if len(readable) == 0:
810
                continue
811
            try:
812
                s, addr_unused = self._socket.accept()
813
                # because the loopback socket is inline, and transports are
814
                # never explicitly closed, best to launch a new thread.
815
                threading.Thread(target=self._callback, args=(s,)).start()
816
            except socket.error, x:
817
                sys.excepthook(*sys.exc_info())
1551.6.40 by Aaron Bentley
Wrapped long lines in Robey's patch
818
                warning('Socket error during accept() within unit test server'
819
                        ' thread: %r' % x)
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
820
            except Exception, x:
1551.6.40 by Aaron Bentley
Wrapped long lines in Robey's patch
821
                # probably a failed test; unit test thread will log the
822
                # failure/error
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
823
                sys.excepthook(*sys.exc_info())
1551.6.40 by Aaron Bentley
Wrapped long lines in Robey's patch
824
                warning('Exception from within unit test server thread: %r' % 
825
                        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
826
827
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
828
class SocketDelay(object):
829
    """A socket decorator to make TCP appear slower.
830
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
831
    This changes recv, send, and sendall to add a fixed latency to each python
832
    call if a new roundtrip is detected. That is, when a recv is called and the
833
    flag new_roundtrip is set, latency is charged. Every send and send_all
834
    sets this flag.
835
836
    In addition every send, sendall and recv sleeps a bit per character send to
837
    simulate bandwidth.
838
839
    Not all methods are implemented, this is deliberate as this class is not a
840
    replacement for the builtin sockets layer. fileno is not implemented to
841
    prevent the proxy being bypassed. 
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
842
    """
843
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
844
    simulated_time = 0
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
845
    _proxied_arguments = dict.fromkeys([
846
        "close", "getpeername", "getsockname", "getsockopt", "gettimeout",
847
        "setblocking", "setsockopt", "settimeout", "shutdown"])
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
848
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
849
    def __init__(self, sock, latency, bandwidth=1.0, 
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
850
                 really_sleep=True):
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
851
        """ 
852
        :param bandwith: simulated bandwith (MegaBit)
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
853
        :param really_sleep: If set to false, the SocketDelay will just
854
        increase a counter, instead of calling time.sleep. This is useful for
855
        unittesting the SocketDelay.
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
856
        """
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
857
        self.sock = sock
858
        self.latency = latency
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
859
        self.really_sleep = really_sleep
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
860
        self.time_per_byte = 1 / (bandwidth / 8.0 * 1024 * 1024) 
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
861
        self.new_roundtrip = False
862
863
    def sleep(self, s):
864
        if self.really_sleep:
865
            time.sleep(s)
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
866
        else:
867
            SocketDelay.simulated_time += s
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
868
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
869
    def __getattr__(self, attr):
870
        if attr in SocketDelay._proxied_arguments:
871
            return getattr(self.sock, attr)
872
        raise AttributeError("'SocketDelay' object has no attribute %r" %
873
                             attr)
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
874
875
    def dup(self):
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
876
        return SocketDelay(self.sock.dup(), self.latency, self.time_per_byte,
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
877
                           self._sleep)
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
878
879
    def recv(self, *args):
880
        data = self.sock.recv(*args)
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
881
        if data and self.new_roundtrip:
882
            self.new_roundtrip = False
883
            self.sleep(self.latency)
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
884
        self.sleep(len(data) * self.time_per_byte)
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
885
        return data
886
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
887
    def sendall(self, data, flags=0):
888
        if not self.new_roundtrip:
889
            self.new_roundtrip = True
890
            self.sleep(self.latency)
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
891
        self.sleep(len(data) * self.time_per_byte)
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
892
        return self.sock.sendall(data, flags)
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
893
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
894
    def send(self, data, flags=0):
895
        if not self.new_roundtrip:
896
            self.new_roundtrip = True
897
            self.sleep(self.latency)
898
        bytes_sent = self.sock.send(data, flags)
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
899
        self.sleep(bytes_sent * self.time_per_byte)
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
900
        return bytes_sent
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
901
902
1530.1.3 by Robert Collins
transport implementations now tested consistently.
903
class SFTPServer(Server):
904
    """Common code for SFTP server facilities."""
905
2018.1.1 by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths).
906
    def __init__(self, server_interface=StubServer):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
907
        self._original_vendor = None
908
        self._homedir = None
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
909
        self._server_homedir = None
1530.1.3 by Robert Collins
transport implementations now tested consistently.
910
        self._listener = None
911
        self._root = None
1951.1.8 by Andrew Bennetts
Make _get_ssh_vendor return the vendor object, rather than just a string.
912
        self._vendor = ssh.ParamikoVendor()
2018.1.1 by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths).
913
        self._server_interface = server_interface
1530.1.6 by Robert Collins
Trim duplicate sftp tests.
914
        # sftp server logs
915
        self.logs = []
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
916
        self.add_latency = 0
1530.1.3 by Robert Collins
transport implementations now tested consistently.
917
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
918
    def _get_sftp_url(self, path):
919
        """Calculate an sftp url to this server for path."""
920
        return 'sftp://foo:bar@localhost:%d/%s' % (self._listener.port, path)
921
1530.1.6 by Robert Collins
Trim duplicate sftp tests.
922
    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
923
        """StubServer uses this to log when a new server is created."""
1530.1.6 by Robert Collins
Trim duplicate sftp tests.
924
        self.logs.append(message)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
925
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
926
    def _run_server_entry(self, sock):
927
        """Entry point for all implementations of _run_server.
928
        
929
        If self.add_latency is > 0.000001 then sock is given a latency adding
930
        decorator.
931
        """
932
        if self.add_latency > 0.000001:
933
            sock = SocketDelay(sock, self.add_latency)
934
        return self._run_server(sock)
935
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
936
    def _run_server(self, s):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
937
        ssh_server = paramiko.Transport(s)
1711.5.1 by John Arbash Meinel
Get most SFTP tests to pass. StubSFTPServer now talks the same path protocol that SFTPTransport talks. on win32
938
        key_file = pathjoin(self._homedir, 'test_rsa.key')
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
939
        f = open(key_file, 'w')
940
        f.write(STUB_SERVER_KEY)
941
        f.close()
1530.1.3 by Robert Collins
transport implementations now tested consistently.
942
        host_key = paramiko.RSAKey.from_private_key_file(key_file)
943
        ssh_server.add_server_key(host_key)
2018.1.1 by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths).
944
        server = self._server_interface(self)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
945
        ssh_server.set_subsystem_handler('sftp', paramiko.SFTPServer,
946
                                         StubSFTPServer, root=self._root,
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
947
                                         home=self._server_homedir)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
948
        event = threading.Event()
949
        ssh_server.start_server(event, server)
950
        event.wait(5.0)
2221.5.21 by Dmitry Vasiliev
Reverted trailing whitespace removal
951
    
2018.5.114 by Robert Collins
Commit current test pass improvements.
952
    def setUp(self, backing_server=None):
953
        # XXX: TODO: make sftpserver back onto backing_server rather than local
954
        # disk.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
955
        if not (backing_server is None or
956
                isinstance(backing_server, local.LocalURLServer)):
957
            raise AssertionError(
958
                "backing_server should not be %r, because this can only serve the "
959
                "local current working directory." % (backing_server,))
2221.5.18 by Dmitry Vasiliev
Fixed variable name
960
        self._original_vendor = ssh._ssh_vendor_manager._cached_ssh_vendor
961
        ssh._ssh_vendor_manager._cached_ssh_vendor = self._vendor
1711.6.3 by John Arbash Meinel
Fix regression on unicode tests for SFTP under Linux
962
        if sys.platform == 'win32':
963
            # Win32 needs to use the UNICODE api
964
            self._homedir = getcwd()
965
        else:
966
            # But Linux SFTP servers should just deal in bytestreams
967
            self._homedir = os.getcwd()
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
968
        if self._server_homedir is None:
969
            self._server_homedir = self._homedir
1530.1.3 by Robert Collins
transport implementations now tested consistently.
970
        self._root = '/'
1711.5.1 by John Arbash Meinel
Get most SFTP tests to pass. StubSFTPServer now talks the same path protocol that SFTPTransport talks. on win32
971
        if sys.platform == 'win32':
972
            self._root = ''
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
973
        self._listener = SocketListener(self._run_server_entry)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
974
        self._listener.setDaemon(True)
975
        self._listener.start()
976
977
    def tearDown(self):
978
        """See bzrlib.transport.Server.tearDown."""
979
        self._listener.stop()
2221.5.18 by Dmitry Vasiliev
Fixed variable name
980
        ssh._ssh_vendor_manager._cached_ssh_vendor = self._original_vendor
1530.1.3 by Robert Collins
transport implementations now tested consistently.
981
1711.2.42 by John Arbash Meinel
enable bogus_url support for SFTP tests
982
    def get_bogus_url(self):
983
        """See bzrlib.transport.Server.get_bogus_url."""
1185.49.35 by John Arbash Meinel
Update tests to use a truly unused port
984
        # this is chosen to try to prevent trouble with proxies, wierd dns, etc
985
        # we bind a random socket, so that we get a guaranteed unused port
986
        # we just never listen on that port
987
        s = socket.socket()
988
        s.bind(('localhost', 0))
989
        return 'sftp://%s:%s/' % s.getsockname()
1711.2.42 by John Arbash Meinel
enable bogus_url support for SFTP tests
990
991
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.
992
class SFTPFullAbsoluteServer(SFTPServer):
993
    """A test server for sftp transports, using absolute urls and ssh."""
994
995
    def get_url(self):
996
        """See bzrlib.transport.Server.get_url."""
2321.3.7 by Alexander Belchenko
fixes for passing test_sftp_transport on win32 (thankyou John)
997
        homedir = self._homedir
998
        if sys.platform != 'win32':
999
            # Remove the initial '/' on all platforms but win32
1000
            homedir = homedir[1:]
1001
        return self._get_sftp_url(urlutils.escape(homedir))
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.
1002
1003
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
1004
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.
1005
    """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
1006
1007
    def __init__(self):
1008
        super(SFTPServerWithoutSSH, self).__init__()
1951.1.8 by Andrew Bennetts
Make _get_ssh_vendor return the vendor object, rather than just a string.
1009
        self._vendor = ssh.LoopbackVendor()
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
1010
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
1011
    def _run_server(self, sock):
1951.1.10 by Andrew Bennetts
Move register_ssh_vendor, _ssh_vendor and _get_ssh_vendor into ssh.py
1012
        # Re-import these as locals, so that they're still accessible during
1013
        # interpreter shutdown (when all module globals get set to None, leading
1014
        # to confusing errors like "'NoneType' object has no attribute 'error'".
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
1015
        class FakeChannel(object):
1016
            def get_transport(self):
1017
                return self
1018
            def get_log_channel(self):
1019
                return 'paramiko'
1020
            def get_name(self):
1021
                return '1'
1022
            def get_hexdump(self):
1023
                return False
1711.2.1 by John Arbash Meinel
[patch] Marien Zwart: paramiko-1.6 compatibility fix
1024
            def close(self):
1025
                pass
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
1026
3353.1.1 by Andrew Bennetts
Stop the test suite hanging with current paramiko. (It doesn't pass yet, though.)
1027
        server = paramiko.SFTPServer(
1028
            FakeChannel(), 'sftp', StubServer(self), StubSFTPServer,
1029
            root=self._root, home=self._server_homedir)
1806.1.1 by Robey Pointer
absorb a broken-pipe exception from paramiko when running the unit tests. it's okay for the client to vanish abruptly and paramiko really ought to mask the exception itself.
1030
        try:
3353.1.3 by Andrew Bennetts
Always adapt sockets to look like paramiko Channels before passing them to paramiko's SFTPClient.
1031
            server.start_subsystem(
1032
                'sftp', None, ssh.SocketAsChannelAdapter(sock))
1806.1.1 by Robey Pointer
absorb a broken-pipe exception from paramiko when running the unit tests. it's okay for the client to vanish abruptly and paramiko really ought to mask the exception itself.
1033
        except socket.error, e:
1034
            if (len(e.args) > 0) and (e.args[0] == errno.EPIPE):
1035
                # it's okay for the client to disconnect abruptly
1036
                # (bug in paramiko 1.6: it should absorb this exception)
1037
                pass
1038
            else:
1039
                raise
1040
        except Exception, e:
2018.11.2 by Andrew Bennetts
Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests.
1041
            # This typically seems to happen during interpreter shutdown, so
1042
            # most of the useful ways to report this error are won't work.
1043
            # Writing the exception type, and then the text of the exception,
1044
            # seems to be the best we can do.
1045
            import sys
1046
            sys.stderr.write('\nEXCEPTION %r: ' % (e.__class__,))
1047
            sys.stderr.write('%s\n\n' % (e,))
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
1048
        server.finish_subsystem()
1049
1050
1051
class SFTPAbsoluteServer(SFTPServerWithoutSSH):
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
1052
    """A test server for sftp transports, using absolute urls."""
1053
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1054
    def get_url(self):
1055
        """See bzrlib.transport.Server.get_url."""
2321.3.7 by Alexander Belchenko
fixes for passing test_sftp_transport on win32 (thankyou John)
1056
        homedir = self._homedir
1057
        if sys.platform != 'win32':
1058
            # Remove the initial '/' on all platforms but win32
1059
            homedir = homedir[1:]
1060
        return self._get_sftp_url(urlutils.escape(homedir))
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1061
1062
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
1063
class SFTPHomeDirServer(SFTPServerWithoutSSH):
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
1064
    """A test server for sftp transports, using homedir relative urls."""
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1065
1066
    def get_url(self):
1067
        """See bzrlib.transport.Server.get_url."""
1534.1.8 by Robert Collins
Update SFTP Urls as per mailing list thread.
1068
        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.
1069
1070
1071
class SFTPSiblingAbsoluteServer(SFTPAbsoluteServer):
2018.5.114 by Robert Collins
Commit current test pass improvements.
1072
    """A test server for sftp transports where only absolute paths will work.
1073
1074
    It does this by serving from a deeply-nested directory that doesn't exist.
1075
    """
1076
1077
    def setUp(self, backing_server=None):
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
1078
        self._server_homedir = '/dev/noone/runs/tests/here'
2018.5.114 by Robert Collins
Commit current test pass improvements.
1079
        super(SFTPSiblingAbsoluteServer, self).setUp(backing_server)
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.
1080
1081
1082
def get_test_permutations():
1083
    """Return the permutations to be used in testing."""
1084
    return [(SFTPTransport, SFTPAbsoluteServer),
1085
            (SFTPTransport, SFTPHomeDirServer),
1086
            (SFTPTransport, SFTPSiblingAbsoluteServer),
1087
            ]