/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6619.1.1 by Vincent Ladeuil
Merge 2.7, resolving conflicts
1
# Copyright (C) 2005-2011, 2016, 2017 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
16
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""Implementation of Transport over SFTP, using paramiko."""
18
6379.6.3 by Jelmer Vernooij
Use absolute_import.
19
from __future__ import absolute_import
20
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
21
# TODO: Remove the transport-based lock_read and lock_write methods.  They'll
22
# then raise TransportNotPossible, which will break remote access to any
23
# formats which rely on OS-level locks.  That should be fine as those formats
24
# 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.
25
# suite.  Those formats all date back to 0.7; so we should be able to remove
26
# these methods when we officially drop support for those formats.
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
27
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
28
import bisect
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
29
import errno
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
30
import itertools
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
31
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
32
import random
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
33
import stat
34
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
35
import time
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
36
import warnings
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
37
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
38
from .. import (
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
39
    config,
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
40
    debug,
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
41
    errors,
42
    urlutils,
43
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
44
from ..errors import (FileExists,
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
45
                           NoSuchFile,
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
46
                           TransportError,
1996.2.1 by Andrew Bennetts
Fix NameError reported by Alexander Belchenko.
47
                           LockError,
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
48
                           PathError,
49
                           ParamikoNotPresent,
1530.1.3 by Robert Collins
transport implementations now tested consistently.
50
                           )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
51
from ..osutils import fancy_rename
6631.2.3 by Martin
Fix per_versionedfile test failures and rethink future_builtins
52
from ..sixish import (
53
    zip,
54
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
55
from ..trace import mutter, warning
56
from ..transport import (
2671.3.6 by Robert Collins
Review feedback.
57
    FileFileStream,
2671.3.2 by Robert Collins
Start open_file_stream logic.
58
    _file_streams,
1951.1.4 by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py
59
    ssh,
2485.8.16 by Vincent Ladeuil
Create a new, empty, ConnectedTransport class.
60
    ConnectedTransport,
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
61
    )
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
62
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
63
# Disable one particular warning that comes from paramiko in Python2.5; if
64
# this is emitted at the wrong time it tends to cause spurious test failures
65
# or at least noise in the test case::
66
#
67
# [1770/7639 in 86s, 1 known failures, 50 skipped, 2 missing features]
68
# test_permissions.TestSftpPermissions.test_new_files
69
# /var/lib/python-support/python2.5/paramiko/message.py:226: DeprecationWarning: integer argument expected, got float
70
#  self.packet.write(struct.pack('>I', n))
71
warnings.filterwarnings('ignore',
72
        'integer argument expected, got float',
73
        category=DeprecationWarning,
74
        module='paramiko.message')
75
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
76
try:
77
    import paramiko
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
78
except ImportError as e:
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
    raise ParamikoNotPresent(e)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
80
else:
81
    from paramiko.sftp import (SFTP_FLAG_WRITE, SFTP_FLAG_CREATE,
82
                               SFTP_FLAG_EXCL, SFTP_FLAG_TRUNC,
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
83
                               SFTP_OK, CMD_HANDLE, CMD_OPEN)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
84
    from paramiko.sftp_attr import SFTPAttributes
85
    from paramiko.sftp_file import SFTPFile
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
86
1883.1.3 by Stefan (metze) Metzmacher
- fix typo
87
6632.1.4 by Martin
Dark hackery to get around paramiko Python 3 compatibility mistakes
88
# GZ 2017-05-25: Some dark hackery to monkeypatch out issues with paramiko's
89
# Python 3 compatibility code. Replace broken b() and asbytes() code.
90
try:
91
    from paramiko.py3compat import b as _bad
92
    from paramiko.common import asbytes as _bad_asbytes
93
except ImportError:
94
    pass
95
else:
96
    def _b_for_broken_paramiko(s, encoding='utf8'):
97
        """Hacked b() that does not raise TypeError."""
98
        # https://github.com/paramiko/paramiko/issues/967
99
        if not isinstance(s, bytes):
100
            encode = getattr(s, 'encode', None)
101
            if encode is not None:
102
                return encode(encoding)
103
            # Would like to pass buffer objects along, but have to realise.
104
            tobytes = getattr(s, 'tobytes', None)
105
            if tobytes is not None:
106
                return tobytes()
107
        return s
108
109
    def _asbytes_for_broken_paramiko(s):
110
        """Hacked asbytes() that does not raise Exception."""
111
        # https://github.com/paramiko/paramiko/issues/968
112
        if not isinstance(s, bytes):
113
            encode = getattr(s, 'encode', None)
114
            if encode is not None:
115
                return encode('utf8')
116
            asbytes = getattr(s, 'asbytes', None)
117
            if asbytes is not None:
118
                return asbytes()
119
        return s
120
121
    _bad.func_code = _b_for_broken_paramiko.func_code
122
    _bad_asbytes.func_code = _asbytes_for_broken_paramiko.func_code
123
124
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
125
class SFTPLock(object):
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
126
    """This fakes a lock in a remote location.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
127
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
128
    A present lock is indicated just by the existence of a file.  This
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
129
    doesn't work well on all transports and they are only used in
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
130
    deprecated storage formats.
131
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
132
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
133
    __slots__ = ['path', 'lock_path', 'lock_file', 'transport']
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
134
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
135
    def __init__(self, path, transport):
136
        self.lock_file = None
137
        self.path = path
138
        self.lock_path = path + '.write-lock'
139
        self.transport = transport
140
        try:
1530.1.7 by Robert Collins
merge integration.
141
            # RBC 20060103 FIXME should we be using private methods here ?
142
            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.
143
            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
144
        except FileExists:
145
            raise LockError('File %r already locked' % (self.path,))
146
147
    def unlock(self):
148
        if not self.lock_file:
149
            return
150
        self.lock_file.close()
151
        self.lock_file = None
152
        try:
153
            self.transport.delete(self.lock_path)
154
        except (NoSuchFile,):
155
            # What specific errors should we catch here?
156
            pass
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
157
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
158
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
159
class _SFTPReadvHelper(object):
160
    """A class to help with managing the state of a readv request."""
161
162
    # See _get_requests for an explanation.
163
    _max_request_size = 32768
164
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
165
    def __init__(self, original_offsets, relpath, _report_activity):
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
166
        """Create a new readv helper.
167
168
        :param original_offsets: The original requests given by the caller of
169
            readv()
170
        :param relpath: The name of the file (if known)
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
171
        :param _report_activity: A Transport._report_activity bound method,
172
            to be called as data arrives.
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
173
        """
174
        self.original_offsets = list(original_offsets)
175
        self.relpath = relpath
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
176
        self._report_activity = _report_activity
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
177
178
    def _get_requests(self):
179
        """Break up the offsets into individual requests over sftp.
180
181
        The SFTP spec only requires implementers to support 32kB requests. We
182
        could try something larger (openssh supports 64kB), but then we have to
183
        handle requests that fail.
184
        So instead, we just break up our maximum chunks into 32kB chunks, and
185
        asyncronously requests them.
186
        Newer versions of paramiko would do the chunking for us, but we want to
187
        start processing results right away, so we do it ourselves.
188
        """
189
        # TODO: Because we issue async requests, we don't 'fudge' any extra
190
        #       data.  I'm not 100% sure that is the best choice.
191
192
        # The first thing we do, is to collapse the individual requests as much
193
        # as possible, so we don't issues requests <32kB
194
        sorted_offsets = sorted(self.original_offsets)
195
        coalesced = list(ConnectedTransport._coalesce_offsets(sorted_offsets,
196
                                                        limit=0, fudge_factor=0))
197
        requests = []
198
        for c_offset in coalesced:
199
            start = c_offset.start
200
            size = c_offset.length
201
202
            # Break this up into 32kB requests
203
            while size > 0:
204
                next_size = min(size, self._max_request_size)
205
                requests.append((start, next_size))
206
                size -= next_size
207
                start += next_size
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
208
        if 'sftp' in debug.debug_flags:
209
            mutter('SFTP.readv(%s) %s offsets => %s coalesced => %s requests',
210
                self.relpath, len(sorted_offsets), len(coalesced),
211
                len(requests))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
212
        return requests
213
214
    def request_and_yield_offsets(self, fp):
215
        """Request the data from the remote machine, yielding the results.
216
217
        :param fp: A Paramiko SFTPFile object that supports readv.
218
        :return: Yield the data requested by the original readv caller, one by
219
            one.
220
        """
221
        requests = self._get_requests()
222
        offset_iter = iter(self.original_offsets)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
223
        cur_offset, cur_size = next(offset_iter)
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
224
        # paramiko .readv() yields strings that are in the order of the requests
225
        # So we track the current request to know where the next data is
226
        # being returned from.
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
227
        input_start = None
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
228
        last_end = None
229
        buffered_data = []
230
        buffered_len = 0
231
232
        # This is used to buffer chunks which we couldn't process yet
233
        # It is (start, end, data) tuples.
234
        data_chunks = []
235
        # Create an 'unlimited' data stream, so we stop based on requests,
236
        # rather than just because the data stream ended. This lets us detect
237
        # short readv.
238
        data_stream = itertools.chain(fp.readv(requests),
239
                                      itertools.repeat(None))
6631.2.2 by Martin
Run 2to3 itertools fixer and refactor
240
        for (start, length), data in zip(requests, data_stream):
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
241
            if data is None:
242
                if cur_coalesced is not None:
243
                    raise errors.ShortReadvError(self.relpath,
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
244
                        start, length, len(data))
245
            if len(data) != length:
246
                raise errors.ShortReadvError(self.relpath,
247
                    start, length, len(data))
3882.7.9 by Martin Pool
Move the point at which sftp issues transport activity (thanks vila)
248
            self._report_activity(length, 'read')
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
249
            if last_end is None:
250
                # This is the first request, just buffer it
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
251
                buffered_data = [data]
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
252
                buffered_len = length
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
253
                input_start = start
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
254
            elif start == last_end:
255
                # The data we are reading fits neatly on the previous
256
                # buffer, so this is all part of a larger coalesced range.
257
                buffered_data.append(data)
258
                buffered_len += length
259
            else:
260
                # We have an 'interrupt' in the data stream. So we know we are
261
                # at a request boundary.
262
                if buffered_len > 0:
263
                    # We haven't consumed the buffer so far, so put it into
264
                    # data_chunks, and continue.
265
                    buffered = ''.join(buffered_data)
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
266
                    data_chunks.append((input_start, buffered))
267
                input_start = start
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
268
                buffered_data = [data]
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
269
                buffered_len = length
270
            last_end = start + length
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
271
            if input_start == cur_offset and cur_size <= buffered_len:
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
272
                # Simplify the next steps a bit by transforming buffered_data
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
273
                # into a single string. We also have the nice property that
274
                # when there is only one string ''.join([x]) == x, so there is
275
                # no data copying.
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
276
                buffered = ''.join(buffered_data)
3686.1.7 by John Arbash Meinel
Purge the list buffer when we have a simple string buffer.
277
                # Clean out buffered data so that we keep memory
278
                # consumption low
279
                del buffered_data[:]
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
280
                buffered_offset = 0
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
281
                # TODO: We *could* also consider the case where cur_offset is in
282
                #       in the buffered range, even though it doesn't *start*
283
                #       the buffered range. But for packs we pretty much always
284
                #       read in order, so you won't get any extra data in the
285
                #       middle.
286
                while (input_start == cur_offset
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
287
                       and (buffered_offset + cur_size) <= buffered_len):
288
                    # We've buffered enough data to process this request, spit it
289
                    # out
290
                    cur_data = buffered[buffered_offset:buffered_offset + cur_size]
291
                    # move the direct pointer into our buffered data
292
                    buffered_offset += cur_size
293
                    # Move the start-of-buffer pointer
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
294
                    input_start += cur_size
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
295
                    # Yield the requested data
296
                    yield cur_offset, cur_data
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
297
                    cur_offset, cur_size = next(offset_iter)
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
298
                # at this point, we've consumed as much of buffered as we can,
299
                # so break off the portion that we consumed
300
                if buffered_offset == len(buffered_data):
301
                    # No tail to leave behind
302
                    buffered_data = []
303
                    buffered_len = 0
304
                else:
305
                    buffered = buffered[buffered_offset:]
306
                    buffered_data = [buffered]
307
                    buffered_len = len(buffered)
5807.5.1 by John Arbash Meinel
Fix bug #767177. Be more agressive with file.close() calls.
308
        # now that the data stream is done, close the handle
309
        fp.close()
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
310
        if buffered_len:
311
            buffered = ''.join(buffered_data)
3686.1.7 by John Arbash Meinel
Purge the list buffer when we have a simple string buffer.
312
            del buffered_data[:]
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
313
            data_chunks.append((input_start, buffered))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
314
        if data_chunks:
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
315
            if 'sftp' in debug.debug_flags:
316
                mutter('SFTP readv left with %d out-of-order bytes',
6631.3.1 by Martin
Run 2to3 map fixer and refactor after
317
                    sum(len(x[1]) for x in data_chunks))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
318
            # We've processed all the readv data, at this point, anything we
319
            # couldn't process is in data_chunks. This doesn't happen often, so
320
            # this code path isn't optimized
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
321
            # We use an interesting process for data_chunks
322
            # Specifically if we have "bisect_left([(start, len, entries)],
323
            #                                       (qstart,)])
324
            # If start == qstart, then we get the specific node. Otherwise we
325
            # get the previous node
326
            while True:
327
                idx = bisect.bisect_left(data_chunks, (cur_offset,))
3815.2.4 by Martin Pool
merge fix for out-of-order SFTP readv
328
                if idx < len(data_chunks) and data_chunks[idx][0] == cur_offset:
329
                    # The data starts here
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
330
                    data = data_chunks[idx][1][:cur_size]
331
                elif idx > 0:
332
                    # The data is in a portion of a previous page
333
                    idx -= 1
334
                    sub_offset = cur_offset - data_chunks[idx][0]
335
                    data = data_chunks[idx][1]
336
                    data = data[sub_offset:sub_offset + cur_size]
337
                else:
338
                    # We are missing the page where the data should be found,
339
                    # something is wrong
340
                    data = ''
341
                if len(data) != cur_size:
342
                    raise AssertionError('We must have miscalulated.'
343
                        ' We expected %d bytes, but only found %d'
344
                        % (cur_size, len(data)))
345
                yield cur_offset, data
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
346
                cur_offset, cur_size = next(offset_iter)
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
347
348
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
349
class SFTPTransport(ConnectedTransport):
1752.2.40 by Andrew Bennetts
Merge from bzr.dev.
350
    """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
351
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
352
    # TODO: jam 20060717 Conceivably these could be configurable, either
353
    #       by auto-tuning at run-time, or by a configuration (per host??)
354
    #       but the performance curve is pretty flat, so just going with
355
    #       reasonable defaults.
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
356
    _max_readv_combine = 200
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
357
    # Having to round trip to the server means waiting for a response,
358
    # so it is better to download extra bytes.
359
    # 8KiB had good performance for both local and remote network operations
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
360
    _bytes_to_read_before_seek = 8192
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
361
1864.5.20 by John Arbash Meinel
Some small cleanups.
362
    # The sftp spec says that implementations SHOULD allow reads
363
    # to be at least 32K. paramiko.readv() does an async request
364
    # for the chunks. So we need to keep it within a single request
365
    # size for paramiko <= 1.6.1. paramiko 1.6.2 will probably chop
366
    # up the request itself, rather than us having to worry about it
367
    _max_request_size = 32768
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
368
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
369
    def _remote_path(self, relpath):
370
        """Return the path to be passed along the sftp protocol for relpath.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
371
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
372
        :param relpath: is a urlencoded string.
373
        """
6055.2.19 by Jelmer Vernooij
Use clone
374
        remote_path = self._parsed_url.clone(relpath).path
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
375
        # the initial slash should be removed from the path, and treated as a
376
        # homedir relative path (the path begins with a double slash if it is
377
        # absolute).  see draft-ietf-secsh-scp-sftp-ssh-uri-03.txt
378
        # RBC 20060118 we are not using this as its too user hostile. instead
379
        # we are following lftp and using /~/foo to mean '~/foo'
380
        # vila--20070602 and leave absolute paths begin with a single slash.
381
        if remote_path.startswith('/~/'):
382
            remote_path = remote_path[3:]
383
        elif remote_path == '/~':
384
            remote_path = ''
385
        return remote_path
386
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
387
    def _create_connection(self, credentials=None):
388
        """Create a new connection with the provided credentials.
389
390
        :param credentials: The credentials needed to establish the connection.
391
392
        :return: The created connection and its associated credentials.
393
394
        The credentials are only the password as it may have been entered
395
        interactively by the user and may be different from the one provided
396
        in base url at transport creation time.
397
        """
398
        if credentials is None:
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
399
            password = self._parsed_url.password
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
400
        else:
401
            password = credentials
402
403
        vendor = ssh._get_ssh_vendor()
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
404
        user = self._parsed_url.user
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
405
        if user is None:
406
            auth = config.AuthenticationConfig()
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
407
            user = auth.get_user('ssh', self._parsed_url.host,
408
                self._parsed_url.port)
409
        connection = vendor.connect_sftp(self._parsed_url.user, password,
410
            self._parsed_url.host, self._parsed_url.port)
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
411
        return connection, (user, password)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
412
5247.2.12 by Vincent Ladeuil
Ensure that all transports close their underlying connection.
413
    def disconnect(self):
414
        connection = self._get_connection()
415
        if connection is not None:
416
            connection.close()
417
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
418
    def _get_sftp(self):
419
        """Ensures that a connection is established"""
420
        connection = self._get_connection()
421
        if connection is None:
422
            # First connection ever
423
            connection, credentials = self._create_connection()
424
            self._set_connection(connection, credentials)
425
        return connection
426
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
427
    def has(self, relpath):
428
        """
429
        Does the target location exist?
430
        """
431
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
432
            self._get_sftp().stat(self._remote_path(relpath))
4103.3.1 by Martin Pool
More sftp progress hooks
433
            # stat result is about 20 bytes, let's say
434
            self._report_activity(20, 'read')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
435
            return True
436
        except IOError:
437
            return False
438
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
439
    def get(self, relpath):
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
440
        """Get the file at the given relative path.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
441
442
        :param relpath: The relative path to the file
443
        """
444
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
445
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
446
            f = self._get_sftp().file(path, mode='rb')
6615.5.1 by Jelmer Vernooij
Backport debian patch fixing paramiko compatibility
447
            size = f.stat().st_size
6632.1.3 by Martin
Remove old compatibility hack for pre 1.5.5 paramiko
448
            if getattr(f, 'prefetch', None) is not None:
6615.5.1 by Jelmer Vernooij
Backport debian patch fixing paramiko compatibility
449
                f.prefetch(size)
1185.40.1 by Robey Pointer
prefetch files under paramiko 1.5.1 for improved speed
450
            return f
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
451
        except (IOError, paramiko.SSHException) as e:
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
452
            self._translate_io_exception(e, path, ': error retrieving',
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
453
                failure_exc=errors.ReadError)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
454
3882.7.4 by Martin Pool
SFTPTransport also sends activity from get()
455
    def get_bytes(self, relpath):
456
        # reimplement this here so that we can report how many bytes came back
457
        f = self.get(relpath)
458
        try:
459
            bytes = f.read()
460
            self._report_activity(len(bytes), 'read')
461
            return bytes
462
        finally:
463
            f.close()
464
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
465
    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.
466
        """See Transport.readv()"""
467
        # We overload the default readv() because we want to use a file
468
        # that does not have prefetch enabled.
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
469
        # 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.
470
        if not offsets:
471
            return
472
473
        try:
474
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
475
            fp = self._get_sftp().file(path, mode='rb')
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
476
            readv = getattr(fp, 'readv', None)
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
477
            if readv:
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
478
                return self._sftp_readv(fp, offsets, relpath)
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
479
            if 'sftp' in debug.debug_flags:
480
                mutter('seek and read %s offsets', len(offsets))
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
481
            return self._seek_and_read(fp, offsets, relpath)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
482
        except (IOError, paramiko.SSHException) as e:
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.
483
            self._translate_io_exception(e, path, ': error retrieving')
484
2671.3.1 by Robert Collins
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
485
    def recommended_page_size(self):
486
        """See Transport.recommended_page_size().
487
488
        For SFTP we suggest a large page size to reduce the overhead
489
        introduced by latency.
490
        """
491
        return 64 * 1024
492
3882.9.1 by Martin Pool
Fix strange default parameter to _sftp_readv
493
    def _sftp_readv(self, fp, offsets, relpath):
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
494
        """Use the readv() member of fp to do async readv.
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
495
3882.9.1 by Martin Pool
Fix strange default parameter to _sftp_readv
496
        Then read them using paramiko.readv(). paramiko.readv()
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
497
        does not support ranges > 64K, so it caps the request size, and
3882.9.1 by Martin Pool
Fix strange default parameter to _sftp_readv
498
        just reads until it gets all the stuff it wants.
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
499
        """
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
500
        helper = _SFTPReadvHelper(offsets, relpath, self._report_activity)
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
501
        return helper.request_and_yield_offsets(fp)
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
502
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
503
    def put_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
504
        """
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
505
        Copy the file-like object into the location.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
506
507
        :param relpath: Location to put the contents, relative to base.
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
508
        :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.
509
        :param mode: The final mode for the file
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
510
        """
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
511
        final_path = self._remote_path(relpath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
512
        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.
513
514
    def _put(self, abspath, f, mode=None):
515
        """Helper function so both put() and copy_abspaths can reuse the code"""
516
        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
517
                        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.
518
        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.
519
        closed = False
1185.41.6 by Robey Pointer
modified version of john's patch to add atomic put and locking to the sftp transport
520
        try:
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
521
            try:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
522
                fout.set_pipelined(True)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
523
                length = self._pump(f, fout)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
524
            except (IOError, paramiko.SSHException) as e:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
525
                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
526
            # XXX: This doesn't truly help like we would like it to.
527
            #      The problem is that openssh strips sticky bits. So while we
528
            #      can properly set group write permission, we lose the group
529
            #      sticky bit. So it is probably best to stop chmodding, and
530
            #      just tell users that they need to set the umask correctly.
531
            #      The attr.st_mode = mode, in _sftp_open_exclusive
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
532
            #      will handle when the user wants the final mode to be more
533
            #      restrictive. And then we avoid a round trip. Unless
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
534
            #      paramiko decides to expose an async chmod()
535
536
            # This is designed to chmod() right before we close.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
537
            # Because we set_pipelined() earlier, theoretically we might
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
538
            # 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.
539
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
540
                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.
541
            fout.close()
542
            closed = True
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
543
            self._rename_and_overwrite(tmp_abspath, abspath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
544
            return length
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
545
        except Exception as e:
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
546
            # If we fail, try to clean up the temporary file
547
            # before we throw the exception
548
            # 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.
549
            # Write out the traceback, because otherwise
550
            # 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.
551
            import traceback
552
            mutter(traceback.format_exc())
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
553
            try:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
554
                if not closed:
555
                    fout.close()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
556
                self._get_sftp().remove(tmp_abspath)
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
557
            except:
1532 by Robert Collins
Merge in John Meinels integration branch.
558
                # raise the saved except
559
                raise e
560
            # raise the original with its traceback if we can.
561
            raise
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
562
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
563
    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
564
                               create_parent_dir=False,
565
                               dir_mode=None):
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
566
        abspath = self._remote_path(relpath)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
567
568
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
569
        #       set the file mode at create time. If it does, use it.
570
        #       But for now, we just chmod later anyway.
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
571
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
572
        def _open_and_write_file():
573
            """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.
574
            fout = None
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
575
            try:
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
576
                try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
577
                    fout = self._get_sftp().file(abspath, mode='wb')
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
578
                    fout.set_pipelined(True)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
579
                    writer(fout)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
580
                except (paramiko.SSHException, IOError) as e:
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
581
                    self._translate_io_exception(e, abspath,
582
                                                 ': unable to open')
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
583
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
584
                # This is designed to chmod() right before we close.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
585
                # Because we set_pipelined() earlier, theoretically we might
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
586
                # avoid the round trip for fout.close()
587
                if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
588
                    self._get_sftp().chmod(abspath, mode)
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
589
            finally:
590
                if fout is not None:
591
                    fout.close()
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
592
593
        if not create_parent_dir:
594
            _open_and_write_file()
595
            return
596
597
        # Try error handling to create the parent directory if we need to
598
        try:
599
            _open_and_write_file()
600
        except NoSuchFile:
601
            # Try to create the parent directory, and then go back to
602
            # writing the file
603
            parent_dir = os.path.dirname(abspath)
1946.2.15 by John Arbash Meinel
Fix the sftp mkdir mode code
604
            self._mkdir(parent_dir, dir_mode)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
605
            _open_and_write_file()
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
606
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
607
    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
608
                            create_parent_dir=False,
609
                            dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
610
        """Copy the file-like object into the target location.
611
612
        This function is not strictly safe to use. It is only meant to
613
        be used when you already know that the target does not exist.
614
        It is not safe, because it will open and truncate the remote
615
        file. So there may be a time when the file has invalid contents.
616
617
        :param relpath: The remote location to put the contents.
618
        :param f:       File-like object.
619
        :param mode:    Possible access permissions for new file.
620
                        None means do not set remote permissions.
621
        :param create_parent_dir: If we cannot create the target file because
622
                        the parent directory does not exist, go ahead and
623
                        create it, and then try again.
624
        """
625
        def writer(fout):
626
            self._pump(f, fout)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
627
        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
628
                                    create_parent_dir=create_parent_dir,
629
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
630
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
631
    def put_bytes_non_atomic(self, relpath, raw_bytes, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
632
                             create_parent_dir=False,
633
                             dir_mode=None):
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
634
        if not isinstance(raw_bytes, str):
635
            raise TypeError(
636
                'raw_bytes must be a plain string, not %s' % type(raw_bytes))
637
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
638
        def writer(fout):
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
639
            fout.write(raw_bytes)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
640
        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
641
                                    create_parent_dir=create_parent_dir,
642
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
643
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
644
    def iter_files_recursive(self):
645
        """Walk the relative paths of all files in this transport."""
4103.3.1 by Martin Pool
More sftp progress hooks
646
        # progress is handled by list_dir
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
647
        queue = list(self.list_dir('.'))
648
        while queue:
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
649
            relpath = queue.pop(0)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
650
            st = self.stat(relpath)
651
            if stat.S_ISDIR(st.st_mode):
652
                for i, basename in enumerate(self.list_dir(relpath)):
653
                    queue.insert(i, relpath+'/'+basename)
654
            else:
655
                yield relpath
656
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
657
    def _mkdir(self, abspath, mode=None):
658
        if mode is None:
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
659
            local_mode = 0o777
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
660
        else:
661
            local_mode = mode
662
        try:
4103.3.1 by Martin Pool
More sftp progress hooks
663
            self._report_activity(len(abspath), 'write')
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
664
            self._get_sftp().mkdir(abspath, local_mode)
4103.3.1 by Martin Pool
More sftp progress hooks
665
            self._report_activity(1, 'read')
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
666
            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).
667
                # chmod a dir through sftp will erase any sgid bit set
668
                # on the server side.  So, if the bit mode are already
669
                # set, avoid the chmod.  If the mode is not fine but
670
                # the sgid bit is set, report a warning to the user
671
                # with the umask fix.
672
                stat = self._get_sftp().lstat(abspath)
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
673
                mode = mode & 0o777 # can't set special bits anyway
674
                if mode != stat.st_mode & 0o777:
675
                    if stat.st_mode & 0o6000:
3526.4.2 by Christophe Troestler
sftp: More informative warning message for chmod and suid/sgid bits problems.
676
                        warning('About to chmod %s over sftp, which will result'
677
                                ' in its suid or sgid bits being cleared.  If'
678
                                ' you want to preserve those bits, change your '
679
                                ' environment on the server to use umask 0%03o.'
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
680
                                % (abspath, 0o777 - mode))
3526.4.1 by Christophe Troestler
sftp transport: do not chmod a dir when unecessary (fix suid and sgid problems).
681
                    self._get_sftp().chmod(abspath, mode=mode)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
682
        except (paramiko.SSHException, IOError) as e:
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
683
            self._translate_io_exception(e, abspath, ': unable to mkdir',
684
                failure_exc=FileExists)
685
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
686
    def mkdir(self, relpath, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
687
        """Create a directory at the given path."""
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
688
        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.
689
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
690
    def open_write_stream(self, relpath, mode=None):
691
        """See Transport.open_write_stream."""
2671.3.2 by Robert Collins
Start open_file_stream logic.
692
        # initialise the file to zero-length
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
693
        # this is three round trips, but we don't use this
694
        # api more than once per write_group at the moment so
2671.3.2 by Robert Collins
Start open_file_stream logic.
695
        # it is a tolerable overhead. Better would be to truncate
696
        # the file after opening. RBC 20070805
2671.3.3 by Robert Collins
Add mode parameter to Transport.open_file_stream.
697
        self.put_bytes_non_atomic(relpath, "", mode)
2671.3.2 by Robert Collins
Start open_file_stream logic.
698
        abspath = self._remote_path(relpath)
699
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
700
        #       set the file mode at create time. If it does, use it.
701
        #       But for now, we just chmod later anyway.
702
        handle = None
703
        try:
704
            handle = self._get_sftp().file(abspath, mode='wb')
705
            handle.set_pipelined(True)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
706
        except (paramiko.SSHException, IOError) as e:
2671.3.2 by Robert Collins
Start open_file_stream logic.
707
            self._translate_io_exception(e, abspath,
708
                                         ': unable to open')
709
        _file_streams[self.abspath(relpath)] = handle
2671.3.6 by Robert Collins
Review feedback.
710
        return FileFileStream(self, relpath, handle)
2671.3.2 by Robert Collins
Start open_file_stream logic.
711
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
712
    def _translate_io_exception(self, e, path, more_info='',
713
                                failure_exc=PathError):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
714
        """Translate a paramiko or IOError into a friendlier exception.
715
716
        :param e: The original exception
717
        :param path: The path in question when the error is raised
718
        :param more_info: Extra information that can be included,
719
                          such as what was going on
720
        :param failure_exc: Paramiko has the super fun ability to raise completely
721
                           opaque errors that just set "e.args = ('Failure',)" with
722
                           no more information.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
723
                           If this parameter is set, it defines the exception
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
724
                           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.
725
        """
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
726
        # 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.
727
        self._translate_error(e, path, raise_generic=False)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
728
        if getattr(e, 'args', None) is not None:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
729
            if (e.args == ('No such file or directory',) or
730
                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.
731
                raise NoSuchFile(path, str(e) + more_info)
3565.4.1 by Christophe Troestler
[Bug #123475] SFTPTransport._translate_io_exception: better detection
732
            if (e.args == ('mkdir failed',) or
733
                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.
734
                raise FileExists(path, str(e) + more_info)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
735
            # strange but true, for the paramiko server.
736
            if (e.args == ('Failure',)):
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
737
                raise failure_exc(path, str(e) + more_info)
4105.2.2 by Martin Pool
Clarify comment
738
            # Can be something like args = ('Directory not empty:
739
            # '/srv/bazaar.launchpad.net/blah...: '
740
            # [Errno 39] Directory not empty',)
4105.2.1 by Martin Pool
Correctly translate Paramiko ENOTEMPTY to DirectoryNotEmpty
741
            if (e.args[0].startswith('Directory not empty: ')
742
                or getattr(e, 'errno', None) == errno.ENOTEMPTY):
743
                raise errors.DirectoryNotEmpty(path, str(e))
5349.2.2 by Martin Pool
Better exception when sftp server doesn't support symlinks
744
            if e.args == ('Operation unsupported',):
745
                raise errors.TransportNotPossible()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
746
            mutter('Raising exception with args %s', e.args)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
747
        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.
748
            mutter('Raising exception with errno %s', e.errno)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
749
        raise e
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
750
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
751
    def append_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
752
        """
753
        Append the text in the file-like object into the final
754
        location.
755
        """
756
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
757
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
758
            fout = self._get_sftp().file(path, 'ab')
1666.1.6 by Robert Collins
Make knit the default format.
759
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
760
                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.
761
            result = fout.tell()
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
762
            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.
763
            return result
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
764
        except (IOError, paramiko.SSHException) as e:
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
765
            self._translate_io_exception(e, relpath, ': unable to append')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
766
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
767
    def rename(self, rel_from, rel_to):
768
        """Rename without special overwriting"""
769
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
770
            self._get_sftp().rename(self._remote_path(rel_from),
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
771
                              self._remote_path(rel_to))
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
772
        except (IOError, paramiko.SSHException) as e:
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
773
            self._translate_io_exception(e, rel_from,
774
                    ': unable to rename to %r' % (rel_to))
775
776
    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.
777
        """Do a fancy rename on the remote server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
778
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
779
        Using the implementation provided by osutils.
780
        """
781
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
782
            sftp = self._get_sftp()
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
783
            fancy_rename(abs_from, abs_to,
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
784
                         rename_func=sftp.rename,
785
                         unlink_func=sftp.remove)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
786
        except (IOError, paramiko.SSHException) as e:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
787
            self._translate_io_exception(e, abs_from,
788
                                         ': 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.
789
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
790
    def move(self, rel_from, rel_to):
791
        """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
792
        path_from = self._remote_path(rel_from)
793
        path_to = self._remote_path(rel_to)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
794
        self._rename_and_overwrite(path_from, path_to)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
795
796
    def delete(self, relpath):
797
        """Delete the item at relpath"""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
798
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
799
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
800
            self._get_sftp().remove(path)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
801
        except (IOError, paramiko.SSHException) as e:
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
802
            self._translate_io_exception(e, path, ': unable to delete')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
803
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
804
    def external_url(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
805
        """See breezy.transport.Transport.external_url."""
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
806
        # the external path for SFTP is the base
807
        return self.base
808
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
809
    def listable(self):
810
        """Return True if this store supports listing."""
811
        return True
812
813
    def list_dir(self, relpath):
814
        """
815
        Return a list of all files at the given location.
816
        """
817
        # does anything actually use this?
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
818
        # -- Unknown
819
        # This is at least used by copy_tree for remote upgrades.
820
        # -- David Allouche 2006-08-11
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
821
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
822
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
823
            entries = self._get_sftp().listdir(path)
4103.3.1 by Martin Pool
More sftp progress hooks
824
            self._report_activity(sum(map(len, entries)), 'read')
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
825
        except (IOError, paramiko.SSHException) as e:
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
826
            self._translate_io_exception(e, path, ': failed to list_dir')
1959.2.2 by John Arbash Meinel
Apply Andrew Bennetts list_dir fixes
827
        return [urlutils.escape(entry) for entry in entries]
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
828
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
829
    def rmdir(self, relpath):
830
        """See Transport.rmdir."""
831
        path = self._remote_path(relpath)
832
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
833
            return self._get_sftp().rmdir(path)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
834
        except (IOError, paramiko.SSHException) as e:
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
835
            self._translate_io_exception(e, path, ': failed to rmdir')
836
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
837
    def stat(self, relpath):
838
        """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
839
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
840
        try:
5056.1.5 by Neil Santos
Removed separate lstat() and reverted LocalTransport and SFTPTransport's stat() methods to using lstat() internally.
841
            return self._get_sftp().lstat(path)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
842
        except (IOError, paramiko.SSHException) as e:
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
843
            self._translate_io_exception(e, path, ': unable to stat')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
844
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
845
    def readlink(self, relpath):
846
        """See Transport.readlink."""
847
        path = self._remote_path(relpath)
848
        try:
849
            return self._get_sftp().readlink(path)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
850
        except (IOError, paramiko.SSHException) as e:
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
851
            self._translate_io_exception(e, path, ': unable to readlink')
852
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
853
    def symlink(self, source, link_name):
854
        """See Transport.symlink."""
855
        try:
856
            conn = self._get_sftp()
5056.1.5 by Neil Santos
Removed separate lstat() and reverted LocalTransport and SFTPTransport's stat() methods to using lstat() internally.
857
            sftp_retval = conn.symlink(source, link_name)
858
            if SFTP_OK != sftp_retval:
859
                raise TransportError(
860
                    '%r: unable to create symlink to %r' % (link_name, source),
861
                    sftp_retval
862
                )
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
863
        except (IOError, paramiko.SSHException) as e:
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
864
            self._translate_io_exception(e, link_name,
865
                                         ': unable to create symlink to %r' % (source))
866
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
867
    def lock_read(self, relpath):
868
        """
869
        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
870
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
871
        """
872
        # FIXME: there should be something clever i can do here...
873
        class BogusLock(object):
874
            def __init__(self, path):
875
                self.path = path
876
            def unlock(self):
877
                pass
878
        return BogusLock(relpath)
879
880
    def lock_write(self, relpath):
881
        """
882
        Lock the given file for exclusive (write) access.
883
        WARNING: many transports do not support this, so trying avoid using it
884
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
885
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
886
        """
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
887
        # This is a little bit bogus, but basically, we create a file
888
        # which should not already exist, and if it does, we assume
889
        # that there is a lock, and if it doesn't, the we assume
890
        # 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
891
        return SFTPLock(relpath, self)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
892
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
893
    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
894
        """Open a remote path exclusively.
895
896
        SFTP supports O_EXCL (SFTP_FLAG_EXCL), which fails if
897
        the file already exists. However it does not expose this
898
        at the higher level of SFTPClient.open(), so we have to
899
        sneak away with it.
900
901
        WARNING: This breaks the SFTPClient abstraction, so it
902
        could easily break against an updated version of paramiko.
903
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
904
        :param abspath: The remote absolute path where the file should be opened
905
        :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
906
        """
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
907
        # TODO: jam 20060816 Paramiko >= 1.6.2 (probably earlier) supports
908
        #       using the 'x' flag to indicate SFTP_FLAG_EXCL.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
909
        #       However, there is no way to set the permission mode at open
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
910
        #       time using the sftp_client.file() functionality.
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
911
        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
912
        # 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
913
        attr = SFTPAttributes()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
914
        if mode is not None:
915
            attr.st_mode = mode
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
916
        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
917
                | SFTP_FLAG_TRUNC | SFTP_FLAG_EXCL)
918
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
919
            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
920
            if t != CMD_HANDLE:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
921
                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
922
            handle = msg.get_string()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
923
            return SFTPFile(self._get_sftp(), handle, 'wb', -1)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
924
        except (paramiko.SSHException, IOError) as e:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
925
            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.
926
                failure_exc=FileExists)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
927
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
928
    def _can_roundtrip_unix_modebits(self):
929
        if sys.platform == 'win32':
930
            # anyone else?
931
            return False
932
        else:
933
            return True
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
934
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.
935
936
def get_test_permutations():
937
    """Return the permutations to be used in testing."""
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
938
    from ..tests import stub_sftp
4797.11.2 by Vincent Ladeuil
Stop requiring testtools for sftp use.
939
    return [(SFTPTransport, stub_sftp.SFTPAbsoluteServer),
940
            (SFTPTransport, stub_sftp.SFTPHomeDirServer),
941
            (SFTPTransport, stub_sftp.SFTPSiblingAbsoluteServer),
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.
942
            ]